diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index f410e66373..1677780cdc 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -50,7 +50,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5.0.0 with: - go-version: '1.21' + go-version: '1.23' - uses: actions/checkout@v4 - name: Setup k3s env: diff --git a/.github/workflows/gh-pages.yaml b/.github/workflows/gh-pages.yaml index ffd8b736d0..09eff318dc 100644 --- a/.github/workflows/gh-pages.yaml +++ b/.github/workflows/gh-pages.yaml @@ -26,7 +26,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5.0.0 with: - go-version: '1.21' + go-version: '1.23' - name: build run: | pip install mkdocs mkdocs_material diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 8cd5e4d106..4f05e876cd 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -11,7 +11,7 @@ on: - "master" env: # Golang version to use across CI steps - GOLANG_VERSION: '1.21' + GOLANG_VERSION: '1.23' concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -35,22 +35,22 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up Go - uses: actions/setup-go@v5.0.0 + uses: actions/setup-go@v5.4.0 with: go-version: ${{ env.GOLANG_VERSION }} - name: Checkout code uses: actions/checkout@v4 - name: Run golangci-lint - uses: golangci/golangci-lint-action@v4 + uses: golangci/golangci-lint-action@v8 with: - version: v1.57.2 + version: v2.1.6 args: --timeout 6m build: name: Build runs-on: ubuntu-latest steps: - name: Set up Go - uses: actions/setup-go@v5.0.0 + uses: actions/setup-go@v5.4.0 with: go-version: ${{ env.GOLANG_VERSION }} id: go @@ -102,7 +102,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - name: Setup Golang - uses: actions/setup-go@v5.0.0 + uses: actions/setup-go@v5.4.0 with: go-version: ${{ env.GOLANG_VERSION }} # k8s codegen generates files into GOPATH location instead of the GitHub git checkout location diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 594773459e..03a03767b3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -127,7 +127,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@v4 with: - go-version: 1.21 + go-version: 1.23 - name: Generate release artifacts run: | diff --git a/.golangci.yml b/.golangci.yml index c59d635e9c..1d60108df1 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,20 +1,41 @@ +version: "2" run: - deadline: 1m - skip-files: - - ".*\\.pb\\.go" - skip-dirs: - - pkg/client modules-download-mode: readonly -linter-settings: - goimports: - local-prefixes: github.com/argoproj/argo-rollouts + timeout: 10m linters: + default: none enable: - - vet - - gofmt - - goimports - - unused + - govet - ineffassign - - unconvert - misspell - disable-all: true + - unconvert + - unused + exclusions: + generated: lax + presets: + - comments + - common-false-positives + - legacy + - std-error-handling + paths: + - .*\.pb\.go + - pkg/client + - third_party$ + - builtin$ + - examples$ +formatters: + enable: + - gofmt + - goimports + settings: + goimports: + local-prefixes: + - github.com/argoproj/argo-rollouts + exclusions: + generated: lax + paths: + - .*\.pb\.go + - pkg/client + - third_party$ + - builtin$ + - examples$ diff --git a/Dockerfile b/Dockerfile index 4998a43454..3b17bd4f42 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # Initial stage which pulls prepares build dependencies and CLI tooling we need for our final image # Also used as the image in CI jobs so needs all dependencies #################################################################################################### -FROM --platform=$BUILDPLATFORM golang:1.21 as builder +FROM --platform=$BUILDPLATFORM golang:1.23 as builder RUN apt-get update && apt-get install -y \ wget \ @@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Install golangci-lint -RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.57.2 && \ +RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.1.6 && \ golangci-lint linters COPY .golangci.yml ${GOPATH}/src/dummy/.golangci.yml @@ -40,7 +40,7 @@ RUN NODE_ENV='production' yarn build #################################################################################################### # Rollout Controller Build stage which performs the actual build of argo-rollouts binaries #################################################################################################### -FROM --platform=$BUILDPLATFORM golang:1.21 as argo-rollouts-build +FROM --platform=$BUILDPLATFORM golang:1.23 as argo-rollouts-build WORKDIR /go/src/github.com/argoproj/argo-rollouts diff --git a/VERSION b/VERSION index db0829caf9..b0f76a5a03 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v1.7.2-CR-29629 +v1.7.2-OSS-697 diff --git a/analysis/controller.go b/analysis/controller.go index 1afa6ab556..1f519ef723 100644 --- a/analysis/controller.go +++ b/analysis/controller.go @@ -5,12 +5,13 @@ import ( "sync" "time" - "github.com/argoproj/argo-rollouts/metric" - jobProvider "github.com/argoproj/argo-rollouts/metricproviders/job" "github.com/aws/smithy-go/ptr" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "github.com/argoproj/argo-rollouts/metric" + jobProvider "github.com/argoproj/argo-rollouts/metricproviders/job" + unstructuredutil "github.com/argoproj/argo-rollouts/utils/unstructured" log "github.com/sirupsen/logrus" diff --git a/cmd/kubectl-argo-rollouts/main.go b/cmd/kubectl-argo-rollouts/main.go index b7d9a02d0a..f81b506ead 100644 --- a/cmd/kubectl-argo-rollouts/main.go +++ b/cmd/kubectl-argo-rollouts/main.go @@ -3,7 +3,6 @@ package main import ( "os" - logutil "github.com/argoproj/argo-rollouts/utils/log" log "github.com/sirupsen/logrus" "k8s.io/cli-runtime/pkg/genericclioptions" _ "k8s.io/client-go/plugin/pkg/client/auth/azure" @@ -11,6 +10,8 @@ import ( _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" "k8s.io/klog/v2" + logutil "github.com/argoproj/argo-rollouts/utils/log" + "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/cmd" "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/options" ) diff --git a/cmd/rollouts-controller/main.go b/cmd/rollouts-controller/main.go index c8deab3ea0..a6808d4ba0 100644 --- a/cmd/rollouts-controller/main.go +++ b/cmd/rollouts-controller/main.go @@ -6,8 +6,6 @@ import ( "strings" "time" - "github.com/argoproj/argo-rollouts/metricproviders" - "github.com/argoproj/argo-rollouts/utils/record" "github.com/argoproj/pkg/kubeclientmetrics" smiclientset "github.com/servicemeshinterface/smi-sdk-go/pkg/gen/client/split/clientset/versioned" log "github.com/sirupsen/logrus" @@ -23,6 +21,9 @@ import ( _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" "k8s.io/client-go/tools/clientcmd" + "github.com/argoproj/argo-rollouts/metricproviders" + "github.com/argoproj/argo-rollouts/utils/record" + "github.com/argoproj/argo-rollouts/controller" "github.com/argoproj/argo-rollouts/controller/metrics" jobprovider "github.com/argoproj/argo-rollouts/metricproviders/job" diff --git a/controller/controller.go b/controller/controller.go index 229df6a5f6..9f3638a139 100644 --- a/controller/controller.go +++ b/controller/controller.go @@ -13,9 +13,10 @@ import ( istioutil "github.com/argoproj/argo-rollouts/utils/istio" - rolloutsConfig "github.com/argoproj/argo-rollouts/utils/config" goPlugin "github.com/hashicorp/go-plugin" + rolloutsConfig "github.com/argoproj/argo-rollouts/utils/config" + "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/dynamic/dynamicinformer" diff --git a/controller/metrics/experiment_test.go b/controller/metrics/experiment_test.go index 5694fc9830..9362dab4f7 100644 --- a/controller/metrics/experiment_test.go +++ b/controller/metrics/experiment_test.go @@ -10,9 +10,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" ) const ( diff --git a/controller/metrics/metrics_test.go b/controller/metrics/metrics_test.go index ced10b2442..43a52230f9 100644 --- a/controller/metrics/metrics_test.go +++ b/controller/metrics/metrics_test.go @@ -9,11 +9,12 @@ import ( "testing" "time" - "github.com/argoproj/argo-rollouts/utils/defaults" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/cache" + "github.com/argoproj/argo-rollouts/utils/defaults" + "github.com/argoproj/argo-rollouts/pkg/client/clientset/versioned/fake" informerfactory "github.com/argoproj/argo-rollouts/pkg/client/informers/externalversions" logutil "github.com/argoproj/argo-rollouts/utils/log" diff --git a/controller/metrics/prommetrics.go b/controller/metrics/prommetrics.go index c0d3b89f62..e2e5aaaac3 100644 --- a/controller/metrics/prommetrics.go +++ b/controller/metrics/prommetrics.go @@ -1,8 +1,9 @@ package metrics import ( - "github.com/argoproj/argo-rollouts/utils/version" "github.com/prometheus/client_golang/prometheus" + + "github.com/argoproj/argo-rollouts/utils/version" ) // Follow Prometheus naming practices diff --git a/controller/metrics/rollout_test.go b/controller/metrics/rollout_test.go index 17f86b011f..9cb0013822 100644 --- a/controller/metrics/rollout_test.go +++ b/controller/metrics/rollout_test.go @@ -10,10 +10,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" - "github.com/argoproj/argo-rollouts/utils/conditions" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" + "github.com/argoproj/argo-rollouts/utils/conditions" ) const ( diff --git a/experiments/service.go b/experiments/service.go index afab417679..aaac3d3fee 100644 --- a/experiments/service.go +++ b/experiments/service.go @@ -6,12 +6,13 @@ import ( "k8s.io/apimachinery/pkg/api/errors" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" - logutil "github.com/argoproj/argo-rollouts/utils/log" log "github.com/sirupsen/logrus" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" + logutil "github.com/argoproj/argo-rollouts/utils/log" ) var experimentKind = v1alpha1.SchemeGroupVersion.WithKind("Experiment") diff --git a/go.mod b/go.mod index b6ffc6c678..463067f117 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/argoproj/argo-rollouts -go 1.21 - -toolchain go1.21.8 +go 1.23.0 require ( github.com/antonmedv/expr v1.15.5 @@ -100,7 +98,7 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chai2010/gettext-go v1.0.2 // indirect github.com/chainguard-dev/git-urls v1.0.2 // indirect - github.com/cloudflare/circl v1.3.3 // indirect + github.com/cloudflare/circl v1.6.1 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -202,14 +200,14 @@ require ( go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.19.0 // indirect - golang.org/x/crypto v0.31.0 // indirect + golang.org/x/crypto v0.36.0 // indirect golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.33.0 // indirect - golang.org/x/sync v0.10.0 // indirect - golang.org/x/sys v0.28.0 // indirect - golang.org/x/term v0.27.0 // indirect - golang.org/x/text v0.21.0 // indirect + golang.org/x/net v0.38.0 // indirect + golang.org/x/sync v0.12.0 // indirect + golang.org/x/sys v0.31.0 // indirect + golang.org/x/term v0.30.0 // indirect + golang.org/x/text v0.23.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gomodules.xyz/envconfig v1.3.1-0.20190308184047-426f31af0d45 // indirect diff --git a/go.sum b/go.sum index d8bb12b5d4..d388721a69 100644 --- a/go.sum +++ b/go.sum @@ -735,8 +735,9 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I= -github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs= github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= +github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0= +github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -1484,8 +1485,8 @@ golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= +golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1627,8 +1628,8 @@ golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= +golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1681,8 +1682,8 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw= +golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1790,8 +1791,8 @@ golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= +golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -1811,8 +1812,8 @@ golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= -golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y= +golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1833,8 +1834,8 @@ golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/ingress/ingress_test.go b/ingress/ingress_test.go index be588dd51a..0336c0e3f3 100644 --- a/ingress/ingress_test.go +++ b/ingress/ingress_test.go @@ -18,12 +18,13 @@ import ( k8sfake "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/util/workqueue" + "k8s.io/client-go/tools/cache" + "github.com/argoproj/argo-rollouts/controller/metrics" "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" "github.com/argoproj/argo-rollouts/pkg/client/clientset/versioned/fake" informers "github.com/argoproj/argo-rollouts/pkg/client/informers/externalversions" ingressutil "github.com/argoproj/argo-rollouts/utils/ingress" - "k8s.io/client-go/tools/cache" ) const stableService string = "test-stable-service" diff --git a/metricproviders/datadog/datadogV1_test.go b/metricproviders/datadog/datadogV1_test.go index af58d47617..6338795fad 100644 --- a/metricproviders/datadog/datadogV1_test.go +++ b/metricproviders/datadog/datadogV1_test.go @@ -8,7 +8,6 @@ import ( "strconv" "testing" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" @@ -16,6 +15,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" k8sfake "k8s.io/client-go/kubernetes/fake" kubetesting "k8s.io/client-go/testing" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" ) func TestRunSuite(t *testing.T) { diff --git a/metricproviders/datadog/datadogV2_test.go b/metricproviders/datadog/datadogV2_test.go index b8319423f3..595a08e653 100644 --- a/metricproviders/datadog/datadogV2_test.go +++ b/metricproviders/datadog/datadogV2_test.go @@ -8,7 +8,6 @@ import ( "os" "testing" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" @@ -16,6 +15,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" k8sfake "k8s.io/client-go/kubernetes/fake" kubetesting "k8s.io/client-go/testing" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" ) func newQueryDefaultProvider() v1alpha1.MetricProvider { diff --git a/metricproviders/datadog/datadog_test.go b/metricproviders/datadog/datadog_test.go index ed81977296..a1e8d4b9de 100644 --- a/metricproviders/datadog/datadog_test.go +++ b/metricproviders/datadog/datadog_test.go @@ -7,10 +7,11 @@ import ( "os" "testing" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" "github.com/stretchr/testify/assert" apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/client-go/kubernetes/scheme" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" ) func TestDatadogSpecDefaults(t *testing.T) { diff --git a/metricproviders/graphite/api_test.go b/metricproviders/graphite/api_test.go index 74f0ef1176..8fba5c4374 100644 --- a/metricproviders/graphite/api_test.go +++ b/metricproviders/graphite/api_test.go @@ -8,9 +8,10 @@ import ( "testing" "time" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" ) func testGraphiteMetric(addr string) v1alpha1.Metric { diff --git a/metricproviders/influxdb/influxdb.go b/metricproviders/influxdb/influxdb.go index 4266d2e2f6..9bd38598b5 100644 --- a/metricproviders/influxdb/influxdb.go +++ b/metricproviders/influxdb/influxdb.go @@ -6,14 +6,15 @@ import ( "fmt" "time" - "github.com/argoproj/argo-rollouts/utils/defaults" - "github.com/argoproj/argo-rollouts/utils/evaluate" influxdb2 "github.com/influxdata/influxdb-client-go/v2" influxapi "github.com/influxdata/influxdb-client-go/v2/api" log "github.com/sirupsen/logrus" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" + "github.com/argoproj/argo-rollouts/utils/defaults" + "github.com/argoproj/argo-rollouts/utils/evaluate" + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" metricutil "github.com/argoproj/argo-rollouts/utils/metric" ) diff --git a/metricproviders/influxdb/influxdb_test.go b/metricproviders/influxdb/influxdb_test.go index 028d66aed4..0ba80f4be8 100644 --- a/metricproviders/influxdb/influxdb_test.go +++ b/metricproviders/influxdb/influxdb_test.go @@ -7,7 +7,6 @@ import ( "strings" "testing" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" influxdb2 "github.com/influxdata/influxdb-client-go/v2/api" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" @@ -16,6 +15,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" k8sfake "k8s.io/client-go/kubernetes/fake" kubetesting "k8s.io/client-go/testing" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" ) func newAnalysisRun() *v1alpha1.AnalysisRun { diff --git a/metricproviders/metricproviders.go b/metricproviders/metricproviders.go index 916fc85aa2..c8953c598d 100644 --- a/metricproviders/metricproviders.go +++ b/metricproviders/metricproviders.go @@ -4,11 +4,12 @@ import ( "fmt" "os" + "k8s.io/client-go/rest" + "k8s.io/client-go/tools/clientcmd" + "github.com/argoproj/argo-rollouts/metric" "github.com/argoproj/argo-rollouts/metricproviders/influxdb" "github.com/argoproj/argo-rollouts/metricproviders/skywalking" - "k8s.io/client-go/rest" - "k8s.io/client-go/tools/clientcmd" "github.com/argoproj/argo-rollouts/metricproviders/cloudwatch" "github.com/argoproj/argo-rollouts/metricproviders/datadog" diff --git a/metricproviders/plugin/client/client.go b/metricproviders/plugin/client/client.go index 9fc82ed244..e1caacf0ea 100644 --- a/metricproviders/plugin/client/client.go +++ b/metricproviders/plugin/client/client.go @@ -5,10 +5,11 @@ import ( "os/exec" "sync" + goPlugin "github.com/hashicorp/go-plugin" + "github.com/argoproj/argo-rollouts/metricproviders/plugin/rpc" "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" "github.com/argoproj/argo-rollouts/utils/plugin" - goPlugin "github.com/hashicorp/go-plugin" ) type metricPlugin struct { diff --git a/metricproviders/plugin/rpc/rpc.go b/metricproviders/plugin/rpc/rpc.go index a709693976..d4331c7096 100644 --- a/metricproviders/plugin/rpc/rpc.go +++ b/metricproviders/plugin/rpc/rpc.go @@ -7,9 +7,10 @@ import ( "github.com/argoproj/argo-rollouts/utils/plugin/types" + "github.com/hashicorp/go-plugin" + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" metricutil "github.com/argoproj/argo-rollouts/utils/metric" - "github.com/hashicorp/go-plugin" ) type RunArgs struct { diff --git a/metricproviders/plugin/rpc/rpc_test.go b/metricproviders/plugin/rpc/rpc_test.go index ad351149c3..fbcb6b37c1 100644 --- a/metricproviders/plugin/rpc/rpc_test.go +++ b/metricproviders/plugin/rpc/rpc_test.go @@ -7,9 +7,10 @@ import ( "github.com/argoproj/argo-rollouts/utils/plugin/types" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" goPlugin "github.com/hashicorp/go-plugin" "github.com/tj/assert" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" ) var testHandshake = goPlugin.HandshakeConfig{ diff --git a/metricproviders/plugin/rpc/rpc_test_implementation.go b/metricproviders/plugin/rpc/rpc_test_implementation.go index 2dd18d6434..5ff6380f28 100644 --- a/metricproviders/plugin/rpc/rpc_test_implementation.go +++ b/metricproviders/plugin/rpc/rpc_test_implementation.go @@ -6,10 +6,11 @@ import ( "github.com/argoproj/argo-rollouts/utils/plugin/types" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" metricutil "github.com/argoproj/argo-rollouts/utils/metric" timeutil "github.com/argoproj/argo-rollouts/utils/time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) type testRpcPlugin struct{} diff --git a/metricproviders/prometheus/headers_round_tripper_test.go b/metricproviders/prometheus/headers_round_tripper_test.go index a9983747a1..1725e050da 100644 --- a/metricproviders/prometheus/headers_round_tripper_test.go +++ b/metricproviders/prometheus/headers_round_tripper_test.go @@ -8,9 +8,10 @@ import ( "net/url" "testing" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" "github.com/prometheus/client_golang/api" "github.com/stretchr/testify/assert" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" ) type testHttpHeaderRoundTripper struct { diff --git a/metricproviders/prometheus/prometheus_test.go b/metricproviders/prometheus/prometheus_test.go index f54d6d6c61..3a9250bb97 100644 --- a/metricproviders/prometheus/prometheus_test.go +++ b/metricproviders/prometheus/prometheus_test.go @@ -10,12 +10,13 @@ import ( "testing" "time" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" v1 "github.com/prometheus/client_golang/api/prometheus/v1" "github.com/prometheus/common/model" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" ) const ( diff --git a/metricproviders/wavefront/wavefront_test.go b/metricproviders/wavefront/wavefront_test.go index af8bd53e7f..49f86448e2 100644 --- a/metricproviders/wavefront/wavefront_test.go +++ b/metricproviders/wavefront/wavefront_test.go @@ -4,7 +4,6 @@ import ( "fmt" "testing" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" log "github.com/sirupsen/logrus" wavefrontapi "github.com/spaceapegames/go-wavefront" "github.com/stretchr/testify/assert" @@ -13,6 +12,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" k8sfake "k8s.io/client-go/kubernetes/fake" kubetesting "k8s.io/client-go/testing" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" ) func newAnalysisRun() *v1alpha1.AnalysisRun { diff --git a/metricproviders/webmetric/webmetric_test.go b/metricproviders/webmetric/webmetric_test.go index 1f8556a0eb..69e867d6fc 100644 --- a/metricproviders/webmetric/webmetric_test.go +++ b/metricproviders/webmetric/webmetric_test.go @@ -10,9 +10,10 @@ import ( "strings" "testing" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" ) const ( diff --git a/pkg/kubectl-argo-rollouts/cmd/cmd.go b/pkg/kubectl-argo-rollouts/cmd/cmd.go index 372f8c434d..24610550cd 100644 --- a/pkg/kubectl-argo-rollouts/cmd/cmd.go +++ b/pkg/kubectl-argo-rollouts/cmd/cmd.go @@ -1,6 +1,8 @@ package cmd import ( + notificationcmd "github.com/argoproj/notifications-engine/pkg/cmd" + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/cmd/abort" "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/cmd/completion" @@ -20,7 +22,6 @@ import ( "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/cmd/version" "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/options" "github.com/argoproj/argo-rollouts/utils/record" - notificationcmd "github.com/argoproj/notifications-engine/pkg/cmd" "github.com/spf13/cobra" ) diff --git a/pkg/kubectl-argo-rollouts/cmd/completion/completion.go b/pkg/kubectl-argo-rollouts/cmd/completion/completion.go index bc045f07b8..4f51ee45fe 100644 --- a/pkg/kubectl-argo-rollouts/cmd/completion/completion.go +++ b/pkg/kubectl-argo-rollouts/cmd/completion/completion.go @@ -1,8 +1,9 @@ package completion import ( - "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/options" "github.com/spf13/cobra" + + "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/options" ) func NewCmdCompletion(o *options.ArgoRolloutsOptions) *cobra.Command { diff --git a/pkg/kubectl-argo-rollouts/cmd/completion/completion_test.go b/pkg/kubectl-argo-rollouts/cmd/completion/completion_test.go index 64bd376c40..7e62fd603d 100644 --- a/pkg/kubectl-argo-rollouts/cmd/completion/completion_test.go +++ b/pkg/kubectl-argo-rollouts/cmd/completion/completion_test.go @@ -4,8 +4,9 @@ import ( "bytes" "testing" - options "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/options/fake" "github.com/tj/assert" + + options "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/options/fake" ) func TestShellNotFound(t *testing.T) { diff --git a/pkg/kubectl-argo-rollouts/cmd/create/create_test.go b/pkg/kubectl-argo-rollouts/cmd/create/create_test.go index b4cf5bb16e..e920067a30 100644 --- a/pkg/kubectl-argo-rollouts/cmd/create/create_test.go +++ b/pkg/kubectl-argo-rollouts/cmd/create/create_test.go @@ -11,9 +11,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" core "k8s.io/client-go/testing" + dynamicfake "k8s.io/client-go/dynamic/fake" + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" options "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/options/fake" - dynamicfake "k8s.io/client-go/dynamic/fake" ) func TestCreateRollout(t *testing.T) { diff --git a/pkg/kubectl-argo-rollouts/cmd/dashboard/dashboard.go b/pkg/kubectl-argo-rollouts/cmd/dashboard/dashboard.go index f0c720df72..8ee706a9fe 100644 --- a/pkg/kubectl-argo-rollouts/cmd/dashboard/dashboard.go +++ b/pkg/kubectl-argo-rollouts/cmd/dashboard/dashboard.go @@ -3,9 +3,10 @@ package dashboard import ( "context" + "github.com/spf13/cobra" + "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/options" "github.com/argoproj/argo-rollouts/server" - "github.com/spf13/cobra" ) func NewCmdDashboard(o *options.ArgoRolloutsOptions) *cobra.Command { diff --git a/pkg/kubectl-argo-rollouts/cmd/lint/lint.go b/pkg/kubectl-argo-rollouts/cmd/lint/lint.go index 810abf2c8e..4de4c1a11c 100644 --- a/pkg/kubectl-argo-rollouts/cmd/lint/lint.go +++ b/pkg/kubectl-argo-rollouts/cmd/lint/lint.go @@ -6,11 +6,6 @@ import ( "io" "os" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/validation" - "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/options" - ingressutil "github.com/argoproj/argo-rollouts/utils/ingress" "github.com/spf13/cobra" goyaml "gopkg.in/yaml.v2" v1 "k8s.io/api/core/v1" @@ -19,6 +14,12 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/util/validation/field" "sigs.k8s.io/yaml" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts" + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/validation" + "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/options" + ingressutil "github.com/argoproj/argo-rollouts/utils/ingress" ) type LintOptions struct { diff --git a/pkg/kubectl-argo-rollouts/cmd/lint/lint_test.go b/pkg/kubectl-argo-rollouts/cmd/lint/lint_test.go index e9b66fd2ed..4d15f9d38a 100644 --- a/pkg/kubectl-argo-rollouts/cmd/lint/lint_test.go +++ b/pkg/kubectl-argo-rollouts/cmd/lint/lint_test.go @@ -4,8 +4,9 @@ import ( "bytes" "testing" - options "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/options/fake" "github.com/stretchr/testify/assert" + + options "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/options/fake" ) func TestLintValidRollout(t *testing.T) { diff --git a/pkg/kubectl-argo-rollouts/cmd/status/status.go b/pkg/kubectl-argo-rollouts/cmd/status/status.go index 79d7272d88..99cfb462b4 100644 --- a/pkg/kubectl-argo-rollouts/cmd/status/status.go +++ b/pkg/kubectl-argo-rollouts/cmd/status/status.go @@ -5,12 +5,13 @@ import ( "fmt" "time" + "github.com/spf13/cobra" + "github.com/argoproj/argo-rollouts/pkg/apiclient/rollout" "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/cmd/signals" "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/options" completionutil "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/util/completion" "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/viewcontroller" - "github.com/spf13/cobra" ) const ( diff --git a/pkg/kubectl-argo-rollouts/cmd/status/status_test.go b/pkg/kubectl-argo-rollouts/cmd/status/status_test.go index ddbee9b24e..20e4b91078 100644 --- a/pkg/kubectl-argo-rollouts/cmd/status/status_test.go +++ b/pkg/kubectl-argo-rollouts/cmd/status/status_test.go @@ -4,9 +4,10 @@ import ( "bytes" "testing" + "github.com/stretchr/testify/assert" + "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/info/testdata" options "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/options/fake" - "github.com/stretchr/testify/assert" ) const noWatch = "--watch=false" diff --git a/pkg/kubectl-argo-rollouts/cmd/undo/undo.go b/pkg/kubectl-argo-rollouts/cmd/undo/undo.go index d3a78d15f2..61a3220cea 100644 --- a/pkg/kubectl-argo-rollouts/cmd/undo/undo.go +++ b/pkg/kubectl-argo-rollouts/cmd/undo/undo.go @@ -15,14 +15,15 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" - "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/options" - completionutil "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/util/completion" - routils "github.com/argoproj/argo-rollouts/utils/unstructured" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" appsclient "k8s.io/client-go/kubernetes/typed/apps/v1" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" + "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/options" + completionutil "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/util/completion" + routils "github.com/argoproj/argo-rollouts/utils/unstructured" ) const ( diff --git a/pkg/kubectl-argo-rollouts/cmd/undo/undo_test.go b/pkg/kubectl-argo-rollouts/cmd/undo/undo_test.go index da9099d5de..1eeff66014 100644 --- a/pkg/kubectl-argo-rollouts/cmd/undo/undo_test.go +++ b/pkg/kubectl-argo-rollouts/cmd/undo/undo_test.go @@ -7,7 +7,6 @@ import ( "fmt" "testing" - "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/info/testdata" "github.com/stretchr/testify/assert" v1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -16,6 +15,8 @@ import ( dynamicfake "k8s.io/client-go/dynamic/fake" kubetesting "k8s.io/client-go/testing" + "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/info/testdata" + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" options "github.com/argoproj/argo-rollouts/pkg/kubectl-argo-rollouts/options/fake" ) diff --git a/pkg/kubectl-argo-rollouts/info/pod_info.go b/pkg/kubectl-argo-rollouts/info/pod_info.go index 463657d70d..88ce420de0 100644 --- a/pkg/kubectl-argo-rollouts/info/pod_info.go +++ b/pkg/kubectl-argo-rollouts/info/pod_info.go @@ -5,11 +5,12 @@ import ( "sort" "strings" - "github.com/argoproj/argo-rollouts/pkg/apiclient/rollout" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" k8snode "k8s.io/kubernetes/pkg/util/node" + + "github.com/argoproj/argo-rollouts/pkg/apiclient/rollout" ) func addPodInfos(rsInfos []*rollout.ReplicaSetInfo, allPods []*corev1.Pod) []*rollout.ReplicaSetInfo { diff --git a/pkg/kubectl-argo-rollouts/viewcontroller/viewcontroller_test.go b/pkg/kubectl-argo-rollouts/viewcontroller/viewcontroller_test.go index 7e1dd9c30e..21976b5581 100644 --- a/pkg/kubectl-argo-rollouts/viewcontroller/viewcontroller_test.go +++ b/pkg/kubectl-argo-rollouts/viewcontroller/viewcontroller_test.go @@ -6,13 +6,14 @@ import ( "testing" "time" - "github.com/argoproj/argo-rollouts/pkg/apiclient/rollout" - rolloutsfake "github.com/argoproj/argo-rollouts/pkg/client/clientset/versioned/fake" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" k8sfake "k8s.io/client-go/kubernetes/fake" + "github.com/argoproj/argo-rollouts/pkg/apiclient/rollout" + rolloutsfake "github.com/argoproj/argo-rollouts/pkg/client/clientset/versioned/fake" + v1alpha1 "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" ) diff --git a/rollout/controller.go b/rollout/controller.go index 2c419a7237..bc2311bf37 100644 --- a/rollout/controller.go +++ b/rollout/controller.go @@ -12,11 +12,10 @@ import ( "time" "github.com/argoproj/argo-rollouts/utils/annotations" - "github.com/argoproj/argo-rollouts/utils/diff" + "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts" smiclientset "github.com/servicemeshinterface/smi-sdk-go/pkg/gen/client/split/clientset/versioned" log "github.com/sirupsen/logrus" appsv1 "k8s.io/api/apps/v1" @@ -42,6 +41,8 @@ import ( "k8s.io/kubernetes/pkg/controller" "k8s.io/utils/pointer" + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts" + "github.com/argoproj/argo-rollouts/controller/metrics" register "github.com/argoproj/argo-rollouts/pkg/apis/rollouts" "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" diff --git a/rollout/scale_utils_test.go b/rollout/scale_utils_test.go index 0127cfab69..6749761821 100644 --- a/rollout/scale_utils_test.go +++ b/rollout/scale_utils_test.go @@ -5,16 +5,17 @@ import ( "fmt" "testing" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" - "github.com/argoproj/argo-rollouts/pkg/client/clientset/versioned/fake" - logutil "github.com/argoproj/argo-rollouts/utils/log" - "github.com/argoproj/argo-rollouts/utils/record" "github.com/stretchr/testify/assert" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" k8sfake "k8s.io/client-go/kubernetes/fake" k8stesting "k8s.io/client-go/testing" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" + "github.com/argoproj/argo-rollouts/pkg/client/clientset/versioned/fake" + logutil "github.com/argoproj/argo-rollouts/utils/log" + "github.com/argoproj/argo-rollouts/utils/record" ) type DeploymentActions interface { diff --git a/rollout/service.go b/rollout/service.go index bd4a3b8d1e..6c0c4d7a26 100644 --- a/rollout/service.go +++ b/rollout/service.go @@ -4,6 +4,12 @@ import ( "context" "fmt" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + patchtypes "k8s.io/apimachinery/pkg/types" + "k8s.io/utils/pointer" + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" "github.com/argoproj/argo-rollouts/rollout/trafficrouting" "github.com/argoproj/argo-rollouts/utils/annotations" @@ -15,11 +21,6 @@ import ( replicasetutil "github.com/argoproj/argo-rollouts/utils/replicaset" rolloututils "github.com/argoproj/argo-rollouts/utils/rollout" serviceutil "github.com/argoproj/argo-rollouts/utils/service" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - patchtypes "k8s.io/apimachinery/pkg/types" - "k8s.io/utils/pointer" ) const ( diff --git a/rollout/trafficrouting/alb/alb.go b/rollout/trafficrouting/alb/alb.go index 0a053857d6..a95585c40f 100644 --- a/rollout/trafficrouting/alb/alb.go +++ b/rollout/trafficrouting/alb/alb.go @@ -15,6 +15,8 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/utils/pointer" + elbv2types "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" "github.com/argoproj/argo-rollouts/rollout/trafficrouting" "github.com/argoproj/argo-rollouts/utils/aws" @@ -24,7 +26,6 @@ import ( jsonutil "github.com/argoproj/argo-rollouts/utils/json" logutil "github.com/argoproj/argo-rollouts/utils/log" "github.com/argoproj/argo-rollouts/utils/record" - elbv2types "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" ) const ( diff --git a/rollout/trafficrouting/apisix/apisix.go b/rollout/trafficrouting/apisix/apisix.go index 6269cc698e..fe121140b8 100644 --- a/rollout/trafficrouting/apisix/apisix.go +++ b/rollout/trafficrouting/apisix/apisix.go @@ -5,13 +5,14 @@ import ( "fmt" "time" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" - "github.com/argoproj/argo-rollouts/utils/record" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" + "github.com/argoproj/argo-rollouts/utils/record" ) var controllerKind = v1alpha1.SchemeGroupVersion.WithKind("Rollout") diff --git a/rollout/trafficrouting/apisix/apisix_test.go b/rollout/trafficrouting/apisix/apisix_test.go index 3749e64d6d..0abde5e9db 100644 --- a/rollout/trafficrouting/apisix/apisix_test.go +++ b/rollout/trafficrouting/apisix/apisix_test.go @@ -5,12 +5,13 @@ import ( "fmt" "testing" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" - "github.com/argoproj/argo-rollouts/rollout/trafficrouting/apisix/mocks" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/serializer/yaml" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" + "github.com/argoproj/argo-rollouts/rollout/trafficrouting/apisix/mocks" ) const SetHeaderRouteName = "set-header" diff --git a/rollout/trafficrouting/apisix/mocks/apisix.go b/rollout/trafficrouting/apisix/mocks/apisix.go index 2bba83c499..6c7a69e104 100644 --- a/rollout/trafficrouting/apisix/mocks/apisix.go +++ b/rollout/trafficrouting/apisix/mocks/apisix.go @@ -7,7 +7,6 @@ import ( k8serrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" - argoRecord "github.com/argoproj/argo-rollouts/utils/record" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" @@ -15,6 +14,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/dynamic" "k8s.io/client-go/tools/record" + + argoRecord "github.com/argoproj/argo-rollouts/utils/record" ) type FakeDynamicClient struct { diff --git a/rollout/trafficrouting/appmesh/resource_client.go b/rollout/trafficrouting/appmesh/resource_client.go index 4dbc4bd8cc..653dd4c76f 100644 --- a/rollout/trafficrouting/appmesh/resource_client.go +++ b/rollout/trafficrouting/appmesh/resource_client.go @@ -4,10 +4,11 @@ import ( "context" "errors" - appmeshutil "github.com/argoproj/argo-rollouts/utils/appmesh" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/client-go/dynamic" + + appmeshutil "github.com/argoproj/argo-rollouts/utils/appmesh" ) type ResourceClient struct { diff --git a/rollout/trafficrouting/istio/istio_types.go b/rollout/trafficrouting/istio/istio_types.go index 9544efc49e..aa58aff6ec 100644 --- a/rollout/trafficrouting/istio/istio_types.go +++ b/rollout/trafficrouting/istio/istio_types.go @@ -1,8 +1,9 @@ package istio import ( - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" ) // VirtualService is an Istio VirtualService containing only the fields which we care about diff --git a/rollout/trafficrouting/plugin/client/client.go b/rollout/trafficrouting/plugin/client/client.go index a9a8b0b713..3687d45ebe 100644 --- a/rollout/trafficrouting/plugin/client/client.go +++ b/rollout/trafficrouting/plugin/client/client.go @@ -5,9 +5,10 @@ import ( "os/exec" "sync" + goPlugin "github.com/hashicorp/go-plugin" + "github.com/argoproj/argo-rollouts/rollout/trafficrouting/plugin/rpc" "github.com/argoproj/argo-rollouts/utils/plugin" - goPlugin "github.com/hashicorp/go-plugin" ) type trafficPlugin struct { diff --git a/rollout/trafficrouting/plugin/plugin.go b/rollout/trafficrouting/plugin/plugin.go index 7ded9ad2f1..e9ca2bc09f 100644 --- a/rollout/trafficrouting/plugin/plugin.go +++ b/rollout/trafficrouting/plugin/plugin.go @@ -3,11 +3,12 @@ package plugin import ( "fmt" + "k8s.io/client-go/kubernetes" + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" "github.com/argoproj/argo-rollouts/rollout/trafficrouting/plugin/client" "github.com/argoproj/argo-rollouts/rollout/trafficrouting/plugin/rpc" "github.com/argoproj/argo-rollouts/utils/record" - "k8s.io/client-go/kubernetes" ) type ReconcilerConfig struct { diff --git a/rollout/trafficrouting/plugin/rpc/rpc.go b/rollout/trafficrouting/plugin/rpc/rpc.go index 297ff9d21b..e1429b6fbc 100644 --- a/rollout/trafficrouting/plugin/rpc/rpc.go +++ b/rollout/trafficrouting/plugin/rpc/rpc.go @@ -5,10 +5,11 @@ import ( "fmt" "net/rpc" - "github.com/argoproj/argo-rollouts/utils/plugin/types" + "github.com/hashicorp/go-plugin" "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" - "github.com/hashicorp/go-plugin" + + "github.com/argoproj/argo-rollouts/utils/plugin/types" ) type UpdateHashArgs struct { diff --git a/rollout/trafficrouting/plugin/rpc/rpc_test.go b/rollout/trafficrouting/plugin/rpc/rpc_test.go index 5ca189e186..3de031a689 100644 --- a/rollout/trafficrouting/plugin/rpc/rpc_test.go +++ b/rollout/trafficrouting/plugin/rpc/rpc_test.go @@ -7,9 +7,10 @@ import ( "github.com/argoproj/argo-rollouts/utils/plugin/types" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" goPlugin "github.com/hashicorp/go-plugin" "github.com/tj/assert" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" ) var testHandshake = goPlugin.HandshakeConfig{ diff --git a/rollout/trafficrouting/service_helper_test.go b/rollout/trafficrouting/service_helper_test.go index cc0634eb6f..acb63673a4 100644 --- a/rollout/trafficrouting/service_helper_test.go +++ b/rollout/trafficrouting/service_helper_test.go @@ -3,9 +3,10 @@ package trafficrouting import ( "testing" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" ) const PING_SVC = "ping-service" diff --git a/rollout/trafficrouting/traefik/mocks/traefik.go b/rollout/trafficrouting/traefik/mocks/traefik.go index b0cd361809..e53295c1b2 100644 --- a/rollout/trafficrouting/traefik/mocks/traefik.go +++ b/rollout/trafficrouting/traefik/mocks/traefik.go @@ -6,7 +6,6 @@ import ( "github.com/pkg/errors" "k8s.io/apimachinery/pkg/runtime" - argoRecord "github.com/argoproj/argo-rollouts/utils/record" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" @@ -14,6 +13,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/dynamic" "k8s.io/client-go/tools/record" + + argoRecord "github.com/argoproj/argo-rollouts/utils/record" ) type FakeDynamicClient struct{} diff --git a/rollout/trafficrouting/traefik/traefik_test.go b/rollout/trafficrouting/traefik/traefik_test.go index 0b5b0c9701..2fccaf9a9f 100644 --- a/rollout/trafficrouting/traefik/traefik_test.go +++ b/rollout/trafficrouting/traefik/traefik_test.go @@ -3,12 +3,13 @@ package traefik import ( "testing" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" - "github.com/argoproj/argo-rollouts/rollout/trafficrouting/traefik/mocks" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/serializer/yaml" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" + "github.com/argoproj/argo-rollouts/rollout/trafficrouting/traefik/mocks" ) const traefikService = ` diff --git a/service/service_test.go b/service/service_test.go index 35722443ac..d8233a567e 100644 --- a/service/service_test.go +++ b/service/service_test.go @@ -16,11 +16,12 @@ import ( k8stesting "k8s.io/client-go/testing" "k8s.io/client-go/util/workqueue" + "k8s.io/client-go/tools/cache" + "github.com/argoproj/argo-rollouts/controller/metrics" "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" "github.com/argoproj/argo-rollouts/pkg/client/clientset/versioned/fake" informers "github.com/argoproj/argo-rollouts/pkg/client/informers/externalversions" - "k8s.io/client-go/tools/cache" ) func newService(name string, port int, selector map[string]string) *corev1.Service { diff --git a/test/cmd/metrics-plugin-sample/internal/plugin/plugin.go b/test/cmd/metrics-plugin-sample/internal/plugin/plugin.go index 69d3763469..9cf3db3381 100644 --- a/test/cmd/metrics-plugin-sample/internal/plugin/plugin.go +++ b/test/cmd/metrics-plugin-sample/internal/plugin/plugin.go @@ -13,15 +13,16 @@ import ( "github.com/argoproj/argo-rollouts/utils/plugin/types" + "github.com/prometheus/client_golang/api" + v1 "github.com/prometheus/client_golang/api/prometheus/v1" + "github.com/prometheus/common/model" + log "github.com/sirupsen/logrus" + "github.com/argoproj/argo-rollouts/metricproviders/plugin" "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" "github.com/argoproj/argo-rollouts/utils/evaluate" metricutil "github.com/argoproj/argo-rollouts/utils/metric" timeutil "github.com/argoproj/argo-rollouts/utils/time" - "github.com/prometheus/client_golang/api" - v1 "github.com/prometheus/client_golang/api/prometheus/v1" - "github.com/prometheus/common/model" - log "github.com/sirupsen/logrus" ) const EnvVarArgoRolloutsPrometheusAddress string = "ARGO_ROLLOUTS_PROMETHEUS_ADDRESS" diff --git a/test/cmd/metrics-plugin-sample/main.go b/test/cmd/metrics-plugin-sample/main.go index fdd01e6ba3..e84b40f36d 100644 --- a/test/cmd/metrics-plugin-sample/main.go +++ b/test/cmd/metrics-plugin-sample/main.go @@ -1,10 +1,11 @@ package main import ( - "github.com/argoproj/argo-rollouts/metricproviders/plugin/rpc" - "github.com/argoproj/argo-rollouts/test/cmd/metrics-plugin-sample/internal/plugin" goPlugin "github.com/hashicorp/go-plugin" log "github.com/sirupsen/logrus" + + "github.com/argoproj/argo-rollouts/metricproviders/plugin/rpc" + "github.com/argoproj/argo-rollouts/test/cmd/metrics-plugin-sample/internal/plugin" ) // handshakeConfigs are used to just do a basic handshake between diff --git a/test/cmd/trafficrouter-plugin-sample/internal/plugin/plugin.go b/test/cmd/trafficrouter-plugin-sample/internal/plugin/plugin.go index 0d18c5d069..c4fd9c8c07 100644 --- a/test/cmd/trafficrouter-plugin-sample/internal/plugin/plugin.go +++ b/test/cmd/trafficrouter-plugin-sample/internal/plugin/plugin.go @@ -8,11 +8,6 @@ import ( "strings" "time" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" - "github.com/argoproj/argo-rollouts/rollout/trafficrouting/plugin/rpc" - "github.com/argoproj/argo-rollouts/utils/defaults" - ingressutil "github.com/argoproj/argo-rollouts/utils/ingress" - pluginTypes "github.com/argoproj/argo-rollouts/utils/plugin/types" "github.com/sirupsen/logrus" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" networkingv1 "k8s.io/api/networking/v1" @@ -23,6 +18,12 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/clientcmd" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" + "github.com/argoproj/argo-rollouts/rollout/trafficrouting/plugin/rpc" + "github.com/argoproj/argo-rollouts/utils/defaults" + ingressutil "github.com/argoproj/argo-rollouts/utils/ingress" + pluginTypes "github.com/argoproj/argo-rollouts/utils/plugin/types" ) var _ rpc.TrafficRouterPlugin = &RpcPlugin{} diff --git a/test/cmd/trafficrouter-plugin-sample/main.go b/test/cmd/trafficrouter-plugin-sample/main.go index 05122fbe0f..79743e6b3e 100644 --- a/test/cmd/trafficrouter-plugin-sample/main.go +++ b/test/cmd/trafficrouter-plugin-sample/main.go @@ -3,10 +3,11 @@ package main import ( "strings" - rolloutsPlugin "github.com/argoproj/argo-rollouts/rollout/trafficrouting/plugin/rpc" - "github.com/argoproj/argo-rollouts/test/cmd/trafficrouter-plugin-sample/internal/plugin" goPlugin "github.com/hashicorp/go-plugin" log "github.com/sirupsen/logrus" + + rolloutsPlugin "github.com/argoproj/argo-rollouts/rollout/trafficrouting/plugin/rpc" + "github.com/argoproj/argo-rollouts/test/cmd/trafficrouter-plugin-sample/internal/plugin" ) // handshakeConfigs are used to just do a basic handshake between diff --git a/test/fixtures/then.go b/test/fixtures/then.go index 8183cc2adc..0cefc735c9 100644 --- a/test/fixtures/then.go +++ b/test/fixtures/then.go @@ -13,12 +13,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" + "github.com/stretchr/testify/assert" + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" rov1 "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" "github.com/argoproj/argo-rollouts/utils/defaults" replicasetutil "github.com/argoproj/argo-rollouts/utils/replicaset" rolloututil "github.com/argoproj/argo-rollouts/utils/rollout" - "github.com/stretchr/testify/assert" ) type Then struct { diff --git a/utils/analysis/factory_test.go b/utils/analysis/factory_test.go index d3fe7dfec1..245723cc06 100644 --- a/utils/analysis/factory_test.go +++ b/utils/analysis/factory_test.go @@ -4,8 +4,6 @@ import ( "fmt" "testing" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" - "github.com/argoproj/argo-rollouts/utils/annotations" "github.com/stretchr/testify/assert" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -13,6 +11,9 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/utils/pointer" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" + "github.com/argoproj/argo-rollouts/utils/annotations" ) func TestBuildArgumentsForRolloutAnalysisRun(t *testing.T) { diff --git a/utils/analysis/helpers.go b/utils/analysis/helpers.go index 42ded67315..142b6daeb1 100644 --- a/utils/analysis/helpers.go +++ b/utils/analysis/helpers.go @@ -7,7 +7,6 @@ import ( "fmt" "regexp" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" log "github.com/sirupsen/logrus" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -15,6 +14,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" patchtypes "k8s.io/apimachinery/pkg/types" + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" + argoprojclient "github.com/argoproj/argo-rollouts/pkg/client/clientset/versioned/typed/rollouts/v1alpha1" ) diff --git a/utils/apisix/apisix.go b/utils/apisix/apisix.go index 3f5984e022..010aaf60ba 100644 --- a/utils/apisix/apisix.go +++ b/utils/apisix/apisix.go @@ -4,10 +4,11 @@ import ( "context" "strings" - "github.com/argoproj/argo-rollouts/utils/defaults" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/dynamic" + + "github.com/argoproj/argo-rollouts/utils/defaults" ) const apisixRoutes = "apisixroutes" diff --git a/utils/appmesh/appmesh.go b/utils/appmesh/appmesh.go index 83e77572ff..19c9d2133b 100644 --- a/utils/appmesh/appmesh.go +++ b/utils/appmesh/appmesh.go @@ -3,10 +3,11 @@ package appmesh import ( "context" - "github.com/argoproj/argo-rollouts/utils/defaults" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/dynamic" + + "github.com/argoproj/argo-rollouts/utils/defaults" ) const AppMeshCRDGroup = "appmesh.k8s.aws" diff --git a/utils/aws/aws.go b/utils/aws/aws.go index 42b4907836..42685302fd 100644 --- a/utils/aws/aws.go +++ b/utils/aws/aws.go @@ -8,7 +8,6 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" - "github.com/argoproj/argo-rollouts/utils/defaults" "github.com/aws/aws-sdk-go-v2/config" elbv2 "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2" elbv2types "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" @@ -18,6 +17,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/client-go/dynamic" + + "github.com/argoproj/argo-rollouts/utils/defaults" ) // AWSLoadBalancerV2TagKeyResourceID is the tag applied to an AWS resource by the AWS Load Balancer diff --git a/utils/config/config.go b/utils/config/config.go index 7989374e8e..71f9d3c62b 100644 --- a/utils/config/config.go +++ b/utils/config/config.go @@ -9,11 +9,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "github.com/argoproj/argo-rollouts/utils/defaults" - "github.com/argoproj/argo-rollouts/utils/plugin/types" v1 "k8s.io/api/core/v1" k8errors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/yaml" + + "github.com/argoproj/argo-rollouts/utils/defaults" + "github.com/argoproj/argo-rollouts/utils/plugin/types" ) // Config is the in memory representation of the configmap with some additional fields/functions for ease of use. diff --git a/utils/controller/controller_test.go b/utils/controller/controller_test.go index 3761d05ba5..39f3c134b5 100644 --- a/utils/controller/controller_test.go +++ b/utils/controller/controller_test.go @@ -23,13 +23,14 @@ import ( kubetesting "k8s.io/client-go/testing" "k8s.io/client-go/util/workqueue" + "k8s.io/client-go/tools/cache" + "github.com/argoproj/argo-rollouts/controller/metrics" register "github.com/argoproj/argo-rollouts/pkg/apis/rollouts" "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" "github.com/argoproj/argo-rollouts/pkg/client/clientset/versioned/fake" informers "github.com/argoproj/argo-rollouts/pkg/client/informers/externalversions" "github.com/argoproj/argo-rollouts/utils/log" - "k8s.io/client-go/tools/cache" ) func TestProcessNextWorkItemHandlePanic(t *testing.T) { diff --git a/utils/istio/istio_test.go b/utils/istio/istio_test.go index a4e5f5fe46..8e0d20d6d7 100644 --- a/utils/istio/istio_test.go +++ b/utils/istio/istio_test.go @@ -6,11 +6,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" - "github.com/argoproj/argo-rollouts/utils/defaults" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/runtime" dynamicfake "k8s.io/client-go/dynamic/fake" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" + "github.com/argoproj/argo-rollouts/utils/defaults" ) func NewFakeDynamicClient(objects ...runtime.Object) *dynamicfake.FakeDynamicClient { diff --git a/utils/plugin/downloader_test.go b/utils/plugin/downloader_test.go index ab14be3385..49848e2c35 100644 --- a/utils/plugin/downloader_test.go +++ b/utils/plugin/downloader_test.go @@ -10,11 +10,12 @@ import ( "github.com/argoproj/argo-rollouts/utils/config" - "github.com/argoproj/argo-rollouts/utils/defaults" "github.com/tj/assert" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" + + "github.com/argoproj/argo-rollouts/utils/defaults" ) type MockFileDownloader struct { diff --git a/utils/plugin/plugin_test.go b/utils/plugin/plugin_test.go index 7226d2d312..4cd061fc20 100644 --- a/utils/plugin/plugin_test.go +++ b/utils/plugin/plugin_test.go @@ -4,13 +4,14 @@ import ( "path/filepath" "testing" - "github.com/argoproj/argo-rollouts/utils/defaults" - "github.com/argoproj/argo-rollouts/utils/config" + "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" + + "github.com/argoproj/argo-rollouts/utils/defaults" ) func TestGetPluginInfo(t *testing.T) { diff --git a/utils/record/record.go b/utils/record/record.go index 96be7c8582..8180981213 100644 --- a/utils/record/record.go +++ b/utils/record/record.go @@ -12,8 +12,6 @@ import ( "sync" "time" - argoinformers "github.com/argoproj/argo-rollouts/pkg/client/informers/externalversions/rollouts/v1alpha1" - timeutil "github.com/argoproj/argo-rollouts/utils/time" "github.com/argoproj/notifications-engine/pkg/api" "github.com/argoproj/notifications-engine/pkg/services" "github.com/argoproj/notifications-engine/pkg/subscriptions" @@ -33,6 +31,9 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/kubectl/pkg/scheme" + argoinformers "github.com/argoproj/argo-rollouts/pkg/client/informers/externalversions/rollouts/v1alpha1" + timeutil "github.com/argoproj/argo-rollouts/utils/time" + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" rolloutscheme "github.com/argoproj/argo-rollouts/pkg/client/clientset/versioned/scheme" "github.com/argoproj/argo-rollouts/utils/annotations" diff --git a/utils/record/record_test.go b/utils/record/record_test.go index dfea598eae..213fc456b1 100644 --- a/utils/record/record_test.go +++ b/utils/record/record_test.go @@ -9,12 +9,6 @@ import ( "testing" "time" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" - argofake "github.com/argoproj/argo-rollouts/pkg/client/clientset/versioned/fake" - argoinformersfactory "github.com/argoproj/argo-rollouts/pkg/client/informers/externalversions" - argoinformers "github.com/argoproj/argo-rollouts/pkg/client/informers/externalversions/rollouts/v1alpha1" - "github.com/argoproj/argo-rollouts/utils/defaults" - timeutil "github.com/argoproj/argo-rollouts/utils/time" "github.com/argoproj/notifications-engine/pkg/api" notificationapi "github.com/argoproj/notifications-engine/pkg/api" "github.com/argoproj/notifications-engine/pkg/mocks" @@ -33,6 +27,13 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" + argofake "github.com/argoproj/argo-rollouts/pkg/client/clientset/versioned/fake" + argoinformersfactory "github.com/argoproj/argo-rollouts/pkg/client/informers/externalversions" + argoinformers "github.com/argoproj/argo-rollouts/pkg/client/informers/externalversions/rollouts/v1alpha1" + "github.com/argoproj/argo-rollouts/utils/defaults" + timeutil "github.com/argoproj/argo-rollouts/utils/time" ) var ( diff --git a/utils/rollout/rolloututil_test.go b/utils/rollout/rolloututil_test.go index d88f080f64..452600aa00 100644 --- a/utils/rollout/rolloututil_test.go +++ b/utils/rollout/rolloututil_test.go @@ -5,12 +5,13 @@ import ( "testing" "time" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" - "github.com/argoproj/argo-rollouts/utils/annotations" "github.com/tj/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/pointer" + + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" + "github.com/argoproj/argo-rollouts/utils/annotations" ) func newCanaryRollout() *v1alpha1.Rollout { diff --git a/utils/template/template_test.go b/utils/template/template_test.go index 8f493bcd58..84580c9c8a 100644 --- a/utils/template/template_test.go +++ b/utils/template/template_test.go @@ -5,11 +5,12 @@ import ( "testing" "time" - "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/pointer" + "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" + "github.com/stretchr/testify/assert" )