From 1b0b977675905d6e5b6d487f94e447ad47634de3 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Thu, 27 May 2021 14:06:10 +0300 Subject: [PATCH] renamed `argoproj/argocd-autopilot` to `argoproj-labs/argocd-autopilot` (#67) --- Dockerfile | 8 ++++---- cmd/commands/app.go | 12 ++++++------ cmd/commands/app_test.go | 13 +++++++------ cmd/commands/common.go | 10 +++++----- cmd/commands/common_test.go | 8 ++++---- cmd/commands/project.go | 14 +++++++------- cmd/commands/project_test.go | 14 +++++++------- cmd/commands/repo.go | 16 ++++++++-------- cmd/commands/repo_test.go | 12 ++++++------ cmd/commands/root.go | 5 +++-- cmd/commands/version.go | 2 +- cmd/main.go | 7 ++++--- go.mod | 2 +- hack/build.sh | 12 ++++++------ hack/cmd-docs/main.go | 2 +- pkg/application/application.go | 10 +++++----- pkg/application/application_test.go | 9 +++++---- pkg/application/mocks/application.go | 2 +- pkg/argocd/argocd.go | 4 ++-- pkg/fs/fs.go | 2 +- pkg/fs/fs_test.go | 4 ++-- pkg/git/mocks/provider.go | 2 +- pkg/git/mocks/repository.go | 2 +- pkg/git/provider_github.go | 3 ++- pkg/git/provider_github_test.go | 3 ++- pkg/git/repository.go | 6 +++--- pkg/git/repository_test.go | 6 +++--- pkg/kube/kube.go | 4 ++-- pkg/kube/mocks/kube.go | 2 +- pkg/util/util.go | 11 ++++++----- 30 files changed, 107 insertions(+), 100 deletions(-) diff --git a/Dockerfile b/Dockerfile index 820ee4db..2c89180f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM golang:1.16.3-alpine3.13 as base -WORKDIR /go/src/github.com/argoproj/argocd-autopilot +WORKDIR /go/src/github.com/argoproj-labs/argocd-autopilot RUN apk -U add --no-cache git ca-certificates && update-ca-certificates @@ -23,7 +23,7 @@ RUN go mod verify ### Compile FROM golang:1.16.3-alpine3.13 as autopilot-build -WORKDIR /go/src/github.com/argoproj/argocd-autopilot +WORKDIR /go/src/github.com/argoproj-labs/argocd-autopilot RUN apk -U add --no-cache git make @@ -40,7 +40,7 @@ RUN make local DEV_MODE=false ### Run FROM alpine:3.13 as autopilot -WORKDIR /go/src/github.com/argoproj/argocd-autopilot +WORKDIR /go/src/github.com/argoproj-labs/argocd-autopilot RUN apk -U add --no-cache git @@ -48,7 +48,7 @@ RUN apk -U add --no-cache git COPY --from=base /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=base /etc/passwd /etc/passwd COPY --from=base /etc/group /etc/group -COPY --chown=autopilot:autopilot --from=autopilot-build /go/src/github.com/argoproj/argocd-autopilot/dist/* /usr/local/bin/argocd-autopilot +COPY --chown=autopilot:autopilot --from=autopilot-build /go/src/github.com/argoproj-labs/argocd-autopilot/dist/* /usr/local/bin/argocd-autopilot USER autopilot:autopilot diff --git a/cmd/commands/app.go b/cmd/commands/app.go index 9b57f360..0e83ae69 100644 --- a/cmd/commands/app.go +++ b/cmd/commands/app.go @@ -8,12 +8,12 @@ import ( "os" "text/tabwriter" - "github.com/argoproj/argocd-autopilot/pkg/application" - "github.com/argoproj/argocd-autopilot/pkg/fs" - "github.com/argoproj/argocd-autopilot/pkg/git" - "github.com/argoproj/argocd-autopilot/pkg/log" - "github.com/argoproj/argocd-autopilot/pkg/store" - "github.com/argoproj/argocd-autopilot/pkg/util" + "github.com/argoproj-labs/argocd-autopilot/pkg/application" + "github.com/argoproj-labs/argocd-autopilot/pkg/fs" + "github.com/argoproj-labs/argocd-autopilot/pkg/git" + "github.com/argoproj-labs/argocd-autopilot/pkg/log" + "github.com/argoproj-labs/argocd-autopilot/pkg/store" + "github.com/argoproj-labs/argocd-autopilot/pkg/util" argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" "github.com/go-git/go-billy/v5/memfs" diff --git a/cmd/commands/app_test.go b/cmd/commands/app_test.go index 6dda1a3d..166ba36e 100644 --- a/cmd/commands/app_test.go +++ b/cmd/commands/app_test.go @@ -8,13 +8,14 @@ import ( "strings" "testing" + "github.com/argoproj-labs/argocd-autopilot/pkg/application" + "github.com/argoproj-labs/argocd-autopilot/pkg/fs" + fsmocks "github.com/argoproj-labs/argocd-autopilot/pkg/fs/mocks" + "github.com/argoproj-labs/argocd-autopilot/pkg/git" + gitmocks "github.com/argoproj-labs/argocd-autopilot/pkg/git/mocks" + "github.com/argoproj-labs/argocd-autopilot/pkg/store" + argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" - "github.com/argoproj/argocd-autopilot/pkg/application" - "github.com/argoproj/argocd-autopilot/pkg/fs" - fsmocks "github.com/argoproj/argocd-autopilot/pkg/fs/mocks" - "github.com/argoproj/argocd-autopilot/pkg/git" - gitmocks "github.com/argoproj/argocd-autopilot/pkg/git/mocks" - "github.com/argoproj/argocd-autopilot/pkg/store" "github.com/go-git/go-billy/v5/memfs" billyUtils "github.com/go-git/go-billy/v5/util" "github.com/stretchr/testify/assert" diff --git a/cmd/commands/common.go b/cmd/commands/common.go index b1810fbe..66a468a8 100644 --- a/cmd/commands/common.go +++ b/cmd/commands/common.go @@ -5,11 +5,11 @@ import ( "fmt" "os" - "github.com/argoproj/argocd-autopilot/pkg/fs" - "github.com/argoproj/argocd-autopilot/pkg/git" - "github.com/argoproj/argocd-autopilot/pkg/log" - "github.com/argoproj/argocd-autopilot/pkg/store" - "github.com/argoproj/argocd-autopilot/pkg/util" + "github.com/argoproj-labs/argocd-autopilot/pkg/fs" + "github.com/argoproj-labs/argocd-autopilot/pkg/git" + "github.com/argoproj-labs/argocd-autopilot/pkg/log" + "github.com/argoproj-labs/argocd-autopilot/pkg/store" + "github.com/argoproj-labs/argocd-autopilot/pkg/util" "github.com/go-git/go-billy/v5/memfs" "github.com/spf13/cobra" diff --git a/cmd/commands/common_test.go b/cmd/commands/common_test.go index dafcd3fc..c25426ec 100644 --- a/cmd/commands/common_test.go +++ b/cmd/commands/common_test.go @@ -6,10 +6,10 @@ import ( "reflect" "testing" - "github.com/argoproj/argocd-autopilot/pkg/fs" - fsmocks "github.com/argoproj/argocd-autopilot/pkg/fs/mocks" - "github.com/argoproj/argocd-autopilot/pkg/git" - gitmocks "github.com/argoproj/argocd-autopilot/pkg/git/mocks" + "github.com/argoproj-labs/argocd-autopilot/pkg/fs" + fsmocks "github.com/argoproj-labs/argocd-autopilot/pkg/fs/mocks" + "github.com/argoproj-labs/argocd-autopilot/pkg/git" + gitmocks "github.com/argoproj-labs/argocd-autopilot/pkg/git/mocks" "github.com/stretchr/testify/assert" ) diff --git a/cmd/commands/project.go b/cmd/commands/project.go index 8d02cba7..ebfc637e 100644 --- a/cmd/commands/project.go +++ b/cmd/commands/project.go @@ -8,13 +8,13 @@ import ( "path/filepath" "text/tabwriter" - "github.com/argoproj/argocd-autopilot/pkg/application" - "github.com/argoproj/argocd-autopilot/pkg/argocd" - "github.com/argoproj/argocd-autopilot/pkg/fs" - "github.com/argoproj/argocd-autopilot/pkg/git" - "github.com/argoproj/argocd-autopilot/pkg/log" - "github.com/argoproj/argocd-autopilot/pkg/store" - "github.com/argoproj/argocd-autopilot/pkg/util" + "github.com/argoproj-labs/argocd-autopilot/pkg/application" + "github.com/argoproj-labs/argocd-autopilot/pkg/argocd" + "github.com/argoproj-labs/argocd-autopilot/pkg/fs" + "github.com/argoproj-labs/argocd-autopilot/pkg/git" + "github.com/argoproj-labs/argocd-autopilot/pkg/log" + "github.com/argoproj-labs/argocd-autopilot/pkg/store" + "github.com/argoproj-labs/argocd-autopilot/pkg/util" appset "github.com/argoproj-labs/applicationset/api/v1alpha1" appsetv1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" diff --git a/cmd/commands/project_test.go b/cmd/commands/project_test.go index 7a4d4396..baf8545e 100644 --- a/cmd/commands/project_test.go +++ b/cmd/commands/project_test.go @@ -11,15 +11,15 @@ import ( "strings" "testing" + "github.com/argoproj-labs/argocd-autopilot/pkg/fs" + fsmocks "github.com/argoproj-labs/argocd-autopilot/pkg/fs/mocks" + "github.com/argoproj-labs/argocd-autopilot/pkg/git" + gitmocks "github.com/argoproj-labs/argocd-autopilot/pkg/git/mocks" + "github.com/argoproj-labs/argocd-autopilot/pkg/store" + "github.com/argoproj-labs/argocd-autopilot/pkg/util" + appset "github.com/argoproj-labs/applicationset/api/v1alpha1" argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" - "github.com/argoproj/argocd-autopilot/pkg/fs" - fsmocks "github.com/argoproj/argocd-autopilot/pkg/fs/mocks" - "github.com/argoproj/argocd-autopilot/pkg/git" - gitmocks "github.com/argoproj/argocd-autopilot/pkg/git/mocks" - "github.com/argoproj/argocd-autopilot/pkg/store" - "github.com/argoproj/argocd-autopilot/pkg/util" - "github.com/go-git/go-billy/v5/memfs" billyUtils "github.com/go-git/go-billy/v5/util" "github.com/stretchr/testify/assert" diff --git a/cmd/commands/repo.go b/cmd/commands/repo.go index ab4d5806..0810db0c 100644 --- a/cmd/commands/repo.go +++ b/cmd/commands/repo.go @@ -9,14 +9,14 @@ import ( "strings" "time" - "github.com/argoproj/argocd-autopilot/pkg/application" - "github.com/argoproj/argocd-autopilot/pkg/argocd" - "github.com/argoproj/argocd-autopilot/pkg/fs" - "github.com/argoproj/argocd-autopilot/pkg/git" - "github.com/argoproj/argocd-autopilot/pkg/kube" - "github.com/argoproj/argocd-autopilot/pkg/log" - "github.com/argoproj/argocd-autopilot/pkg/store" - "github.com/argoproj/argocd-autopilot/pkg/util" + "github.com/argoproj-labs/argocd-autopilot/pkg/application" + "github.com/argoproj-labs/argocd-autopilot/pkg/argocd" + "github.com/argoproj-labs/argocd-autopilot/pkg/fs" + "github.com/argoproj-labs/argocd-autopilot/pkg/git" + "github.com/argoproj-labs/argocd-autopilot/pkg/kube" + "github.com/argoproj-labs/argocd-autopilot/pkg/log" + "github.com/argoproj-labs/argocd-autopilot/pkg/store" + "github.com/argoproj-labs/argocd-autopilot/pkg/util" argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" argocdsettings "github.com/argoproj/argo-cd/v2/util/settings" diff --git a/cmd/commands/repo_test.go b/cmd/commands/repo_test.go index 8b2bc2fd..e298bce7 100644 --- a/cmd/commands/repo_test.go +++ b/cmd/commands/repo_test.go @@ -6,12 +6,12 @@ import ( "path/filepath" "testing" - "github.com/argoproj/argocd-autopilot/pkg/argocd" - "github.com/argoproj/argocd-autopilot/pkg/fs" - "github.com/argoproj/argocd-autopilot/pkg/git" - gitmocks "github.com/argoproj/argocd-autopilot/pkg/git/mocks" - kubemocks "github.com/argoproj/argocd-autopilot/pkg/kube/mocks" - "github.com/argoproj/argocd-autopilot/pkg/store" + "github.com/argoproj-labs/argocd-autopilot/pkg/argocd" + "github.com/argoproj-labs/argocd-autopilot/pkg/fs" + "github.com/argoproj-labs/argocd-autopilot/pkg/git" + gitmocks "github.com/argoproj-labs/argocd-autopilot/pkg/git/mocks" + kubemocks "github.com/argoproj-labs/argocd-autopilot/pkg/kube/mocks" + "github.com/argoproj-labs/argocd-autopilot/pkg/store" argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" "github.com/ghodss/yaml" diff --git a/cmd/commands/root.go b/cmd/commands/root.go index 2fcc63cf..33a2d9a4 100644 --- a/cmd/commands/root.go +++ b/cmd/commands/root.go @@ -1,8 +1,9 @@ package commands import ( - "github.com/argoproj/argocd-autopilot/pkg/store" - "github.com/argoproj/argocd-autopilot/pkg/util" + "github.com/argoproj-labs/argocd-autopilot/pkg/store" + "github.com/argoproj-labs/argocd-autopilot/pkg/util" + "github.com/spf13/cobra" "github.com/spf13/pflag" "github.com/spf13/viper" diff --git a/cmd/commands/version.go b/cmd/commands/version.go index 986efe7c..274504c9 100644 --- a/cmd/commands/version.go +++ b/cmd/commands/version.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/argoproj/argocd-autopilot/pkg/store" + "github.com/argoproj-labs/argocd-autopilot/pkg/store" ) func NewVersionCommand() *cobra.Command { diff --git a/cmd/main.go b/cmd/main.go index de24bcea..60c69649 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -4,9 +4,10 @@ import ( "context" "syscall" - "github.com/argoproj/argocd-autopilot/cmd/commands" - "github.com/argoproj/argocd-autopilot/pkg/log" - "github.com/argoproj/argocd-autopilot/pkg/util" + "github.com/argoproj-labs/argocd-autopilot/cmd/commands" + "github.com/argoproj-labs/argocd-autopilot/pkg/log" + "github.com/argoproj-labs/argocd-autopilot/pkg/util" + "github.com/sirupsen/logrus" _ "k8s.io/client-go/plugin/pkg/client/auth" // used for authentication with cloud providers ) diff --git a/go.mod b/go.mod index b545344f..7c4c1c19 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/argoproj/argocd-autopilot +module github.com/argoproj-labs/argocd-autopilot go 1.16 diff --git a/hack/build.sh b/hack/build.sh index 584d2216..6082d0d1 100755 --- a/hack/build.sh +++ b/hack/build.sh @@ -9,10 +9,10 @@ fi ${PACKR_CMD} build -ldflags=" \ -extldflags '-static' \ - -X 'github.com/argoproj/argocd-autopilot/pkg/store.binaryName=${BINARY_NAME}' \ - -X 'github.com/argoproj/argocd-autopilot/pkg/store.version=${VERSION}' \ - -X 'github.com/argoproj/argocd-autopilot/pkg/store.buildDate=${BUILD_DATE}' \ - -X 'github.com/argoproj/argocd-autopilot/pkg/store.gitCommit=${GIT_COMMIT}' \ - -X 'github.com/argoproj/argocd-autopilot/pkg/store.installationManifestsURL=${INSTALLATION_MANIFESTS_URL}' \ - -X 'github.com/argoproj/argocd-autopilot/pkg/store.installationManifestsNamespacedURL=${INSTALLATION_MANIFESTS_NAMESPACED_URL}'" \ + -X 'github.com/argoproj-labs/argocd-autopilot/pkg/store.binaryName=${BINARY_NAME}' \ + -X 'github.com/argoproj-labs/argocd-autopilot/pkg/store.version=${VERSION}' \ + -X 'github.com/argoproj-labs/argocd-autopilot/pkg/store.buildDate=${BUILD_DATE}' \ + -X 'github.com/argoproj-labs/argocd-autopilot/pkg/store.gitCommit=${GIT_COMMIT}' \ + -X 'github.com/argoproj-labs/argocd-autopilot/pkg/store.installationManifestsURL=${INSTALLATION_MANIFESTS_URL}' \ + -X 'github.com/argoproj-labs/argocd-autopilot/pkg/store.installationManifestsNamespacedURL=${INSTALLATION_MANIFESTS_NAMESPACED_URL}'" \ -v -o ${OUT_FILE} ${MAIN} \ No newline at end of file diff --git a/hack/cmd-docs/main.go b/hack/cmd-docs/main.go index a4aab339..afb63e6d 100644 --- a/hack/cmd-docs/main.go +++ b/hack/cmd-docs/main.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra/doc" - "github.com/argoproj/argocd-autopilot/cmd/commands" + "github.com/argoproj-labs/argocd-autopilot/cmd/commands" ) const ( diff --git a/pkg/application/application.go b/pkg/application/application.go index f33c3eba..090b3567 100644 --- a/pkg/application/application.go +++ b/pkg/application/application.go @@ -9,11 +9,11 @@ import ( "path/filepath" "reflect" - "github.com/argoproj/argocd-autopilot/pkg/fs" - "github.com/argoproj/argocd-autopilot/pkg/kube" - "github.com/argoproj/argocd-autopilot/pkg/log" - "github.com/argoproj/argocd-autopilot/pkg/store" - "github.com/argoproj/argocd-autopilot/pkg/util" + "github.com/argoproj-labs/argocd-autopilot/pkg/fs" + "github.com/argoproj-labs/argocd-autopilot/pkg/kube" + "github.com/argoproj-labs/argocd-autopilot/pkg/log" + "github.com/argoproj-labs/argocd-autopilot/pkg/store" + "github.com/argoproj-labs/argocd-autopilot/pkg/util" "github.com/ghodss/yaml" billyUtils "github.com/go-git/go-billy/v5/util" diff --git a/pkg/application/application_test.go b/pkg/application/application_test.go index 53e3f4a2..b0afc657 100644 --- a/pkg/application/application_test.go +++ b/pkg/application/application_test.go @@ -7,10 +7,11 @@ import ( "reflect" "testing" - "github.com/argoproj/argocd-autopilot/pkg/fs" - fsmocks "github.com/argoproj/argocd-autopilot/pkg/fs/mocks" - "github.com/argoproj/argocd-autopilot/pkg/kube" - "github.com/argoproj/argocd-autopilot/pkg/store" + "github.com/argoproj-labs/argocd-autopilot/pkg/fs" + fsmocks "github.com/argoproj-labs/argocd-autopilot/pkg/fs/mocks" + "github.com/argoproj-labs/argocd-autopilot/pkg/kube" + "github.com/argoproj-labs/argocd-autopilot/pkg/store" + "github.com/go-git/go-billy/v5/memfs" billyUtils "github.com/go-git/go-billy/v5/util" "github.com/stretchr/testify/assert" diff --git a/pkg/application/mocks/application.go b/pkg/application/mocks/application.go index 889c4373..f3f91785 100644 --- a/pkg/application/mocks/application.go +++ b/pkg/application/mocks/application.go @@ -3,7 +3,7 @@ package mocks import ( - fs "github.com/argoproj/argocd-autopilot/pkg/fs" + fs "github.com/argoproj-labs/argocd-autopilot/pkg/fs" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/argocd/argocd.go b/pkg/argocd/argocd.go index 966d2f5b..489b2c76 100644 --- a/pkg/argocd/argocd.go +++ b/pkg/argocd/argocd.go @@ -3,10 +3,10 @@ package argocd import ( "context" - "github.com/argoproj/argocd-autopilot/pkg/util" + "github.com/argoproj-labs/argocd-autopilot/pkg/util" // used to solve this issue: https://github.com/argoproj/argo-cd/issues/2907 - _ "github.com/argoproj/argocd-autopilot/util/assets" + _ "github.com/argoproj-labs/argocd-autopilot/util/assets" "github.com/argoproj/argo-cd/v2/cmd/argocd/commands" "github.com/spf13/cobra" diff --git a/pkg/fs/fs.go b/pkg/fs/fs.go index 76dc3ea5..1d1251a3 100644 --- a/pkg/fs/fs.go +++ b/pkg/fs/fs.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "os" - "github.com/argoproj/argocd-autopilot/pkg/util" + "github.com/argoproj-labs/argocd-autopilot/pkg/util" "github.com/ghodss/yaml" "github.com/go-git/go-billy/v5" diff --git a/pkg/fs/fs_test.go b/pkg/fs/fs_test.go index 2dab7207..0f22cefb 100644 --- a/pkg/fs/fs_test.go +++ b/pkg/fs/fs_test.go @@ -6,8 +6,8 @@ import ( "reflect" "testing" - "github.com/argoproj/argocd-autopilot/pkg/fs/mocks" - "github.com/argoproj/argocd-autopilot/pkg/util" + "github.com/argoproj-labs/argocd-autopilot/pkg/fs/mocks" + "github.com/argoproj-labs/argocd-autopilot/pkg/util" "github.com/ghodss/yaml" "github.com/go-git/go-billy/v5" diff --git a/pkg/git/mocks/provider.go b/pkg/git/mocks/provider.go index 06f852bb..231a4133 100644 --- a/pkg/git/mocks/provider.go +++ b/pkg/git/mocks/provider.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - git "github.com/argoproj/argocd-autopilot/pkg/git" + git "github.com/argoproj-labs/argocd-autopilot/pkg/git" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/git/mocks/repository.go b/pkg/git/mocks/repository.go index 4530997e..41382c7d 100644 --- a/pkg/git/mocks/repository.go +++ b/pkg/git/mocks/repository.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - git "github.com/argoproj/argocd-autopilot/pkg/git" + git "github.com/argoproj-labs/argocd-autopilot/pkg/git" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/git/provider_github.go b/pkg/git/provider_github.go index ac001edd..0c738f2b 100644 --- a/pkg/git/provider_github.go +++ b/pkg/git/provider_github.go @@ -5,7 +5,8 @@ import ( "fmt" "net/http" - g "github.com/argoproj/argocd-autopilot/pkg/git/github" + g "github.com/argoproj-labs/argocd-autopilot/pkg/git/github" + gh "github.com/google/go-github/v34/github" ) diff --git a/pkg/git/provider_github_test.go b/pkg/git/provider_github_test.go index 56bf006e..03b145e5 100644 --- a/pkg/git/provider_github_test.go +++ b/pkg/git/provider_github_test.go @@ -6,7 +6,8 @@ import ( "net/http" "testing" - "github.com/argoproj/argocd-autopilot/pkg/git/github/mocks" + "github.com/argoproj-labs/argocd-autopilot/pkg/git/github/mocks" + gh "github.com/google/go-github/v34/github" "github.com/stretchr/testify/assert" ) diff --git a/pkg/git/repository.go b/pkg/git/repository.go index 6956a894..ffba959a 100644 --- a/pkg/git/repository.go +++ b/pkg/git/repository.go @@ -5,9 +5,9 @@ import ( "errors" "os" - "github.com/argoproj/argocd-autopilot/pkg/fs" - "github.com/argoproj/argocd-autopilot/pkg/git/gogit" - "github.com/argoproj/argocd-autopilot/pkg/log" + "github.com/argoproj-labs/argocd-autopilot/pkg/fs" + "github.com/argoproj-labs/argocd-autopilot/pkg/git/gogit" + "github.com/argoproj-labs/argocd-autopilot/pkg/log" billy "github.com/go-git/go-billy/v5" gg "github.com/go-git/go-git/v5" diff --git a/pkg/git/repository_test.go b/pkg/git/repository_test.go index 993ed148..1c0fc16c 100644 --- a/pkg/git/repository_test.go +++ b/pkg/git/repository_test.go @@ -7,9 +7,9 @@ import ( "reflect" "testing" - "github.com/argoproj/argocd-autopilot/pkg/fs" - "github.com/argoproj/argocd-autopilot/pkg/git/gogit" - "github.com/argoproj/argocd-autopilot/pkg/git/gogit/mocks" + "github.com/argoproj-labs/argocd-autopilot/pkg/fs" + "github.com/argoproj-labs/argocd-autopilot/pkg/git/gogit" + "github.com/argoproj-labs/argocd-autopilot/pkg/git/gogit/mocks" billy "github.com/go-git/go-billy/v5" "github.com/go-git/go-billy/v5/memfs" diff --git a/pkg/kube/kube.go b/pkg/kube/kube.go index 1eb3608d..aca4080e 100644 --- a/pkg/kube/kube.go +++ b/pkg/kube/kube.go @@ -5,8 +5,8 @@ import ( "os" "time" - "github.com/argoproj/argocd-autopilot/pkg/log" - "github.com/argoproj/argocd-autopilot/pkg/util" + "github.com/argoproj-labs/argocd-autopilot/pkg/log" + "github.com/argoproj-labs/argocd-autopilot/pkg/util" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/pkg/kube/mocks/kube.go b/pkg/kube/mocks/kube.go index 3e0574fc..511008bf 100644 --- a/pkg/kube/mocks/kube.go +++ b/pkg/kube/mocks/kube.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - kube "github.com/argoproj/argocd-autopilot/pkg/kube" + kube "github.com/argoproj-labs/argocd-autopilot/pkg/kube" kubernetes "k8s.io/client-go/kubernetes" mock "github.com/stretchr/testify/mock" diff --git a/pkg/util/util.go b/pkg/util/util.go index 77d35a8e..4f074a96 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -8,8 +8,9 @@ import ( "strings" "time" - "github.com/argoproj/argocd-autopilot/pkg/log" - "github.com/argoproj/argocd-autopilot/pkg/store" + "github.com/argoproj-labs/argocd-autopilot/pkg/log" + "github.com/argoproj-labs/argocd-autopilot/pkg/store" + "github.com/briandowns/spinner" "github.com/spf13/cobra" "github.com/spf13/pflag" @@ -135,12 +136,12 @@ func JoinManifests(manifests ...[]byte) []byte { return []byte(strings.Join(res, yamlSeperator)) } -func SplitManifests(manifests []byte) [][]byte { +func SplitManifests(manifests []byte) [][]byte { str := string(manifests) stringManifests := strings.Split(str, yamlSeperator) - res := make([][]byte, 0, len(stringManifests)) + res := make([][]byte, 0, len(stringManifests)) for _, m := range stringManifests { - res = append(res, []byte(m)) + res = append(res, []byte(m)) } return res }