diff --git a/.golangci.json b/.golangci.json index 626b4c9d4777e36d28875b677861bd3f51379b2b..5ba74944423cfe8c0648b3f876c1c23a18675746 100644 --- a/.golangci.json +++ b/.golangci.json @@ -3,7 +3,6 @@ "disable-all": true, "enable": [ "govet", - "revive", "goimports", "misspell", "ineffassign", diff --git a/e2e/suite/channel_resolve_test.go b/e2e/suite/channel_resolve_test.go index 1d5b42ae9a09982d0ac4794797ee4ccf3d398bcc..3519b59c3787f9bab6d82ad5312d52a89f3d7d2b 100644 --- a/e2e/suite/channel_resolve_test.go +++ b/e2e/suite/channel_resolve_test.go @@ -5,8 +5,8 @@ import ( "net/http" "net/http/httptest" - . "github.com/onsi/ginkgo/v2" //nolint:revive - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/rancher/system-upgrade-controller/e2e/framework" upgradeapiv1 "github.com/rancher/system-upgrade-controller/pkg/apis/upgrade.cattle.io/v1" upgradeplan "github.com/rancher/system-upgrade-controller/pkg/upgrade/plan" diff --git a/e2e/suite/job_generate_test.go b/e2e/suite/job_generate_test.go index 2c1c5eb5b0759fa5c171e4e19fded50afd1ed01a..9516cdd27bd4a0330396877b2db0f88a1c82f581 100644 --- a/e2e/suite/job_generate_test.go +++ b/e2e/suite/job_generate_test.go @@ -6,8 +6,8 @@ import ( "io" "time" - . "github.com/onsi/ginkgo/v2" //nolint:revive - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" batchv1 "k8s.io/api/batch/v1" v1 "k8s.io/api/core/v1" "k8s.io/utils/ptr" diff --git a/e2e/suite/plan_create_test.go b/e2e/suite/plan_create_test.go index 25640bd4f4f93223d4fc26a1da253a0e3a176fe8..beb596830b53ab0cd1bedffabd809be773d059f7 100644 --- a/e2e/suite/plan_create_test.go +++ b/e2e/suite/plan_create_test.go @@ -1,8 +1,8 @@ package suite_test import ( - . "github.com/onsi/ginkgo/v2" //nolint:revive - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/rancher/system-upgrade-controller/e2e/framework" upgradeapiv1 "github.com/rancher/system-upgrade-controller/pkg/apis/upgrade.cattle.io/v1" ) diff --git a/e2e/suite/plan_resolve_test.go b/e2e/suite/plan_resolve_test.go index 4035b4e7dca7a2a86cd3b56324d8f3465b7b734d..8f11e4d3cfcc1323883ba41e8fa786f12f5a544b 100644 --- a/e2e/suite/plan_resolve_test.go +++ b/e2e/suite/plan_resolve_test.go @@ -6,8 +6,8 @@ import ( "path" "time" - . "github.com/onsi/ginkgo/v2" //nolint:revive - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/rancher/system-upgrade-controller/e2e/framework" upgradeapiv1 "github.com/rancher/system-upgrade-controller/pkg/apis/upgrade.cattle.io/v1" ) diff --git a/e2e/suite/zz_suite_test.go b/e2e/suite/zz_suite_test.go index d40ace2c516cea2c004f53fe680d061b24d1437a..f02cfac9681fbe938ec63c892e5aa2e890b5f166 100644 --- a/e2e/suite/zz_suite_test.go +++ b/e2e/suite/zz_suite_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - . "github.com/onsi/ginkgo/v2" //nolint:revive - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/sirupsen/logrus" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework/config" diff --git a/pkg/upgrade/container/container_suite_test.go b/pkg/upgrade/container/container_suite_test.go index c9dcf2617b71ee3492e19b13e2af2ac327db35bf..9f08f1f0574194a8851970e5fd28ed555d756efb 100644 --- a/pkg/upgrade/container/container_suite_test.go +++ b/pkg/upgrade/container/container_suite_test.go @@ -3,8 +3,8 @@ package container_test import ( "testing" - . "github.com/onsi/ginkgo/v2" //nolint:revive - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" ) func TestContainer(t *testing.T) { diff --git a/pkg/upgrade/container/container_test.go b/pkg/upgrade/container/container_test.go index ee1b32bdf5dd94e4dc34d342a1eff8ec1a3ae74a..8678a34a9a4f2e76869da9a9808afa8478da5361 100644 --- a/pkg/upgrade/container/container_test.go +++ b/pkg/upgrade/container/container_test.go @@ -1,8 +1,8 @@ package container_test import ( - . "github.com/onsi/ginkgo/v2" //nolint:revive - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" upgradeapiv1 "github.com/rancher/system-upgrade-controller/pkg/apis/upgrade.cattle.io/v1" "github.com/rancher/system-upgrade-controller/pkg/upgrade/container" corev1 "k8s.io/api/core/v1" diff --git a/pkg/upgrade/job/job_suite_test.go b/pkg/upgrade/job/job_suite_test.go index 5e773a929927cc1c31fb9aa9e02925a4c789cb64..191229da61417dfd74853d03e14ad61b8fcd9ecf 100644 --- a/pkg/upgrade/job/job_suite_test.go +++ b/pkg/upgrade/job/job_suite_test.go @@ -3,8 +3,8 @@ package job_test import ( "testing" - . "github.com/onsi/ginkgo/v2" //nolint:revive - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" upgradev1 "github.com/rancher/system-upgrade-controller/pkg/apis/upgrade.cattle.io/v1" sucjob "github.com/rancher/system-upgrade-controller/pkg/upgrade/job" corev1 "k8s.io/api/core/v1" diff --git a/pkg/upgrade/upgrade_suite_test.go b/pkg/upgrade/upgrade_suite_test.go index 6193c8715fcab1a327fb57f6debb49e4c3c6d5ef..44636971642d7fb3f7b82bfd653cd34e667e600e 100644 --- a/pkg/upgrade/upgrade_suite_test.go +++ b/pkg/upgrade/upgrade_suite_test.go @@ -3,8 +3,8 @@ package upgrade_test import ( "testing" - . "github.com/onsi/ginkgo/v2" //nolint:revive - . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" ) func TestUpgrade(t *testing.T) {