update go imports (#20)

* Replace nektos/act imports with actions-oss/act-cli

* Update go.mod to reference new repo

* Fix goimports "not properly formatted" complaints.

Replacing the imports left some out of alphabetical order.
This commit is contained in:
Steven Edwards
2025-01-27 12:11:12 -05:00
committed by GitHub
parent 1d135cf8d1
commit 70c9e21c85
58 changed files with 113 additions and 113 deletions

View File

@@ -3,8 +3,8 @@ package cmd
import (
"os"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/model"
)
func drawGraph(plan *model.Plan) error {

View File

@@ -5,7 +5,7 @@ import (
"strconv"
"strings"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/model"
)
func printList(plan *model.Plan) error {

View File

@@ -23,12 +23,12 @@ import (
"github.com/spf13/cobra/doc"
"gopkg.in/yaml.v3"
"github.com/nektos/act/pkg/artifactcache"
"github.com/nektos/act/pkg/artifacts"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/container"
"github.com/nektos/act/pkg/model"
"github.com/nektos/act/pkg/runner"
"github.com/actions-oss/act-cli/pkg/artifactcache"
"github.com/actions-oss/act-cli/pkg/artifacts"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/container"
"github.com/actions-oss/act-cli/pkg/model"
"github.com/actions-oss/act-cli/pkg/runner"
)
// Execute is the entry point to running the CLI
@@ -663,7 +663,7 @@ func defaultImageSurvey(actrc string) error {
var answer string
confirmation := &survey.Select{
Message: "Please choose the default image you want to use with act:\n - Large size image: ca. 17GB download + 53.1GB storage, you will need 75GB of free disk space, snapshots of GitHub Hosted Runners without snap and pulled docker images\n - Medium size image: ~500MB, includes only necessary tools to bootstrap actions and aims to be compatible with most actions\n - Micro size image: <200MB, contains only NodeJS required to bootstrap actions, doesn't work with all actions\n\nDefault image and other options can be changed manually in " + configLocations()[0] + " (please refer to https://github.com/nektos/act#configuration for additional information about file structure)",
Help: "If you want to know why act asks you that, please go to https://github.com/nektos/act/issues/107",
Help: "If you want to know why act asks you that, please go to https://github.com/actions-oss/act-cli/issues/107",
Default: "Medium",
Options: []string{"Large", "Medium", "Micro"},
}

2
go.mod
View File

@@ -1,4 +1,4 @@
module github.com/nektos/act
module github.com/actions-oss/act-cli
go 1.23

View File

@@ -7,7 +7,7 @@ import (
"os/signal"
"syscall"
"github.com/nektos/act/cmd"
"github.com/actions-oss/act-cli/cmd"
)
//go:embed VERSION

View File

@@ -20,7 +20,7 @@ import (
"github.com/timshannon/bolthold"
"go.etcd.io/bbolt"
"github.com/nektos/act/pkg/common"
"github.com/actions-oss/act-cli/pkg/common"
)
const (

View File

@@ -15,7 +15,7 @@ import (
"github.com/julienschmidt/httprouter"
"github.com/nektos/act/pkg/common"
"github.com/actions-oss/act-cli/pkg/common"
)
type FileContainerResourceURL struct {

View File

@@ -17,8 +17,8 @@ import (
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/nektos/act/pkg/model"
"github.com/nektos/act/pkg/runner"
"github.com/actions-oss/act-cli/pkg/model"
"github.com/actions-oss/act-cli/pkg/runner"
)
type writableMapFile struct {

View File

@@ -19,7 +19,7 @@ import (
"github.com/mattn/go-isatty"
log "github.com/sirupsen/logrus"
"github.com/nektos/act/pkg/common"
"github.com/actions-oss/act-cli/pkg/common"
)
var (

View File

@@ -13,7 +13,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/nektos/act/pkg/common"
"github.com/actions-oss/act-cli/pkg/common"
)
func TestFindGitSlug(t *testing.T) {
@@ -26,12 +26,12 @@ func TestFindGitSlug(t *testing.T) {
}{
{"https://git-codecommit.us-east-1.amazonaws.com/v1/repos/my-repo-name", "CodeCommit", "my-repo-name"},
{"ssh://git-codecommit.us-west-2.amazonaws.com/v1/repos/my-repo", "CodeCommit", "my-repo"},
{"git@github.com:nektos/act.git", "GitHub", "nektos/act"},
{"git@github.com:nektos/act", "GitHub", "nektos/act"},
{"https://github.com/nektos/act.git", "GitHub", "nektos/act"},
{"http://github.com/nektos/act.git", "GitHub", "nektos/act"},
{"https://github.com/nektos/act", "GitHub", "nektos/act"},
{"http://github.com/nektos/act", "GitHub", "nektos/act"},
{"git@github.com:actions-oss/act-cli.git", "GitHub", "actions-oss/act-cli"},
{"git@github.com:actions-oss/act-cli", "GitHub", "actions-oss/act-cli"},
{"https://github.com/actions-oss/act-cli.git", "GitHub", "actions-oss/act-cli"},
{"http://github.com/actions-oss/act-cli.git", "GitHub", "actions-oss/act-cli"},
{"https://github.com/actions-oss/act-cli", "GitHub", "actions-oss/act-cli"},
{"http://github.com/actions-oss/act-cli", "GitHub", "actions-oss/act-cli"},
{"git+ssh://git@github.com/owner/repo.git", "GitHub", "owner/repo"},
{"http://myotherrepo.com/act.git", "", "http://myotherrepo.com/act.git"},
}

View File

@@ -4,8 +4,8 @@ import (
"context"
"io"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/docker/go-connections/nat"
"github.com/nektos/act/pkg/common"
)
// NewContainerInput the input for the New function

View File

@@ -6,10 +6,10 @@ import (
"context"
"strings"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/docker/cli/cli/config"
"github.com/docker/cli/cli/config/credentials"
"github.com/docker/docker/api/types/registry"
"github.com/nektos/act/pkg/common"
)
func LoadDockerAuthConfig(ctx context.Context, image string) (registry.AuthConfig, error) {

View File

@@ -16,7 +16,7 @@ import (
"github.com/moby/patternmatcher"
"github.com/moby/patternmatcher/ignorefile"
"github.com/nektos/act/pkg/common"
"github.com/actions-oss/act-cli/pkg/common"
)
// NewDockerBuildExecutor function to create a run executor for the container

View File

@@ -5,8 +5,8 @@ package container
import (
"context"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/docker/docker/api/types/network"
"github.com/nektos/act/pkg/common"
)
func NewDockerNetworkCreateExecutor(name string) common.Executor {

View File

@@ -13,7 +13,7 @@ import (
"github.com/docker/docker/api/types/image"
"github.com/docker/docker/api/types/registry"
"github.com/nektos/act/pkg/common"
"github.com/actions-oss/act-cli/pkg/common"
)
// NewDockerPullExecutor function to create a run executor for the container

View File

@@ -35,8 +35,8 @@ import (
"github.com/spf13/pflag"
"golang.org/x/term"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/filecollector"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/filecollector"
)
// NewContainer creates a reference to a container
@@ -605,7 +605,7 @@ func (cr *containerReference) exec(cmd []string, env map[string]string, user, wo
case 0:
return nil
case 127:
return fmt.Errorf("exitcode '%d': command not found, please refer to https://github.com/nektos/act/issues/107 for more information", inspectResp.ExitCode)
return fmt.Errorf("exitcode '%d': command not found, please refer to https://github.com/actions-oss/act-cli/issues/107 for more information", inspectResp.ExitCode)
default:
return fmt.Errorf("exitcode '%d': failure", inspectResp.ExitCode)
}

View File

@@ -7,7 +7,7 @@ import (
"runtime"
"github.com/docker/docker/api/types/system"
"github.com/nektos/act/pkg/common"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/pkg/errors"
)

View File

@@ -5,9 +5,9 @@ package container
import (
"context"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/volume"
"github.com/nektos/act/pkg/common"
)
func NewDockerVolumeRemoveExecutor(volumeName string, force bool) common.Executor {

View File

@@ -20,9 +20,9 @@ import (
"github.com/go-git/go-git/v5/plumbing/format/gitignore"
"golang.org/x/term"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/filecollector"
"github.com/nektos/act/pkg/lookpath"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/filecollector"
"github.com/actions-oss/act-cli/pkg/lookpath"
)
type HostEnvironment struct {

View File

@@ -8,7 +8,7 @@ import (
"io"
"strings"
"github.com/nektos/act/pkg/common"
"github.com/actions-oss/act-cli/pkg/common"
)
func parseEnvFile(e Container, srcPath string, env *map[string]string) common.Executor {

View File

@@ -15,7 +15,7 @@ import (
"github.com/go-git/go-git/v5/plumbing/format/gitignore"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/model"
"github.com/rhysd/actionlint"
)

View File

@@ -4,7 +4,7 @@ import (
"path/filepath"
"testing"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/model"
"github.com/stretchr/testify/assert"
)

View File

@@ -7,7 +7,7 @@ import (
"reflect"
"strings"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/model"
"github.com/rhysd/actionlint"
)

View File

@@ -4,7 +4,7 @@ import (
"math"
"testing"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/model"
"github.com/stretchr/testify/assert"
)

View File

@@ -5,7 +5,7 @@ import (
"io"
"strings"
"github.com/nektos/act/pkg/schema"
"github.com/actions-oss/act-cli/pkg/schema"
"gopkg.in/yaml.v3"
)

View File

@@ -5,8 +5,8 @@ import (
"fmt"
"strings"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/common/git"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/common/git"
)
type GithubContext struct {

View File

@@ -8,8 +8,8 @@ import (
"strconv"
"strings"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/schema"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/schema"
log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v3"
)

View File

@@ -16,9 +16,9 @@ import (
"github.com/kballard/go-shellquote"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/container"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/container"
"github.com/actions-oss/act-cli/pkg/model"
)
type actionStep interface {

View File

@@ -13,13 +13,13 @@ import (
"strings"
"time"
"github.com/actions-oss/act-cli/pkg/common"
git "github.com/go-git/go-git/v5"
config "github.com/go-git/go-git/v5/config"
"github.com/go-git/go-git/v5/plumbing"
"github.com/go-git/go-git/v5/plumbing/object"
"github.com/go-git/go-git/v5/plumbing/transport"
"github.com/go-git/go-git/v5/plumbing/transport/http"
"github.com/nektos/act/pkg/common"
)
type ActionCache interface {

View File

@@ -5,9 +5,9 @@ import (
"io"
"path"
"github.com/actions-oss/act-cli/pkg/common"
git "github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing"
"github.com/nektos/act/pkg/common"
)
type GoGitActionCacheOfflineMode struct {

View File

@@ -6,8 +6,8 @@ import (
"regexp"
"strings"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/model"
)
func evaluateCompositeInputAndEnv(ctx context.Context, parent *RunContext, step actionStep) map[string]string {

View File

@@ -7,7 +7,7 @@ import (
"strings"
"testing"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)

View File

@@ -5,7 +5,7 @@ import (
"regexp"
"strings"
"github.com/nektos/act/pkg/common"
"github.com/actions-oss/act-cli/pkg/common"
)
var commandPatternGA *regexp.Regexp

View File

@@ -10,8 +10,8 @@ import (
"github.com/sirupsen/logrus/hooks/test"
"github.com/stretchr/testify/assert"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/model"
)
func TestSetEnv(t *testing.T) {

View File

@@ -4,8 +4,8 @@ import (
"context"
"io"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/container"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/container"
"github.com/stretchr/testify/mock"
)

View File

@@ -12,10 +12,10 @@ import (
_ "embed"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/container"
"github.com/nektos/act/pkg/exprparser"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/container"
"github.com/actions-oss/act-cli/pkg/exprparser"
"github.com/actions-oss/act-cli/pkg/model"
"gopkg.in/yaml.v3"
)

View File

@@ -8,8 +8,8 @@ import (
"sort"
"testing"
"github.com/nektos/act/pkg/exprparser"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/exprparser"
"github.com/actions-oss/act-cli/pkg/model"
assert "github.com/stretchr/testify/assert"
yaml "gopkg.in/yaml.v3"
)

View File

@@ -5,8 +5,8 @@ import (
"fmt"
"time"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/model"
)
type jobInfo interface {

View File

@@ -6,9 +6,9 @@ import (
"io"
"testing"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/container"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/container"
"github.com/actions-oss/act-cli/pkg/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)

View File

@@ -12,8 +12,8 @@ import (
"path/filepath"
"strings"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/filecollector"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/filecollector"
)
type LocalRepositoryCache struct {

View File

@@ -9,7 +9,7 @@ import (
"strings"
"sync"
"github.com/nektos/act/pkg/common"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/sirupsen/logrus"
"golang.org/x/term"

View File

@@ -7,8 +7,8 @@ import (
"path"
"regexp"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/model"
)
func newLocalReusableWorkflowExecutor(rc *RunContext) common.Executor {

View File

@@ -20,11 +20,11 @@ import (
"strings"
"time"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/container"
"github.com/actions-oss/act-cli/pkg/exprparser"
"github.com/actions-oss/act-cli/pkg/model"
"github.com/docker/go-connections/nat"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/container"
"github.com/nektos/act/pkg/exprparser"
"github.com/nektos/act/pkg/model"
"github.com/opencontainers/selinux/go-selinux"
)

View File

@@ -10,9 +10,9 @@ import (
"strings"
"testing"
"github.com/actions-oss/act-cli/pkg/exprparser"
"github.com/actions-oss/act-cli/pkg/model"
"github.com/golang-jwt/jwt/v5"
"github.com/nektos/act/pkg/exprparser"
"github.com/nektos/act/pkg/model"
log "github.com/sirupsen/logrus"
assert "github.com/stretchr/testify/assert"

View File

@@ -7,9 +7,9 @@ import (
"os"
"runtime"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/model"
docker_container "github.com/docker/docker/api/types/container"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
log "github.com/sirupsen/logrus"
)

View File

@@ -17,8 +17,8 @@ import (
assert "github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/model"
)
var (

View File

@@ -8,10 +8,10 @@ import (
"strings"
"time"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/container"
"github.com/nektos/act/pkg/exprparser"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/container"
"github.com/actions-oss/act-cli/pkg/exprparser"
"github.com/actions-oss/act-cli/pkg/model"
)
type step interface {

View File

@@ -11,8 +11,8 @@ import (
"path"
"path/filepath"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/model"
)
type stepActionLocal struct {

View File

@@ -8,8 +8,8 @@ import (
"strings"
"testing"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"gopkg.in/yaml.v3"

View File

@@ -11,8 +11,8 @@ import (
"regexp"
"strings"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/model"
)
type stepActionRemote struct {

View File

@@ -12,8 +12,8 @@ import (
"github.com/stretchr/testify/mock"
"gopkg.in/yaml.v3"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/model"
)
type stepActionRemoteMocks struct {

View File

@@ -5,10 +5,10 @@ import (
"fmt"
"strings"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/container"
"github.com/actions-oss/act-cli/pkg/model"
"github.com/kballard/go-shellquote"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/container"
"github.com/nektos/act/pkg/model"
)
type stepDocker struct {

View File

@@ -6,8 +6,8 @@ import (
"io"
"testing"
"github.com/nektos/act/pkg/container"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/container"
"github.com/actions-oss/act-cli/pkg/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)

View File

@@ -3,7 +3,7 @@ package runner
import (
"fmt"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/model"
)
type stepFactory interface {

View File

@@ -3,7 +3,7 @@ package runner
import (
"testing"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/model"
"github.com/stretchr/testify/assert"
)

View File

@@ -8,10 +8,10 @@ import (
"github.com/kballard/go-shellquote"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/container"
"github.com/nektos/act/pkg/lookpath"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/container"
"github.com/actions-oss/act-cli/pkg/lookpath"
"github.com/actions-oss/act-cli/pkg/model"
)
type stepRun struct {

View File

@@ -9,8 +9,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/nektos/act/pkg/container"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/container"
"github.com/actions-oss/act-cli/pkg/model"
)
func TestStepRun(t *testing.T) {

View File

@@ -4,8 +4,8 @@ import (
"context"
"testing"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/model"
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"