From de7263216fcf89824e5bad1d27c0e36bcf3a0123 Mon Sep 17 00:00:00 2001 From: Harsimran Singh Maan Date: Thu, 22 Aug 2024 12:41:14 -0700 Subject: [PATCH] remove revive linter --- .golangci.json | 1 - e2e/suite/channel_resolve_test.go | 4 ++-- e2e/suite/job_generate_test.go | 4 ++-- e2e/suite/plan_create_test.go | 4 ++-- e2e/suite/plan_resolve_test.go | 4 ++-- e2e/suite/zz_suite_test.go | 4 ++-- pkg/upgrade/container/container_suite_test.go | 4 ++-- pkg/upgrade/container/container_test.go | 4 ++-- pkg/upgrade/job/job_suite_test.go | 4 ++-- pkg/upgrade/upgrade_suite_test.go | 4 ++-- 10 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.golangci.json b/.golangci.json index 626b4c9d..5ba74944 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 1d5b42ae..3519b59c 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 2c1c5eb5..9516cdd2 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 25640bd4..beb59683 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 4035b4e7..8f11e4d3 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 d40ace2c..f02cfac9 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 c9dcf261..9f08f1f0 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 ee1b32bd..8678a34a 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 5e773a92..191229da 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 6193c871..44636971 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) {