Skip to content

Commit

Permalink
remove revive linter
Browse files Browse the repository at this point in the history
  • Loading branch information
harsimranmaan authored and brandond committed Aug 27, 2024
1 parent 9d6c6a9 commit de72632
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 19 deletions.
1 change: 0 additions & 1 deletion .golangci.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"disable-all": true,
"enable": [
"govet",
"revive",
"goimports",
"misspell",
"ineffassign",
Expand Down
4 changes: 2 additions & 2 deletions e2e/suite/channel_resolve_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions e2e/suite/job_generate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions e2e/suite/plan_create_test.go
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions e2e/suite/plan_resolve_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions e2e/suite/zz_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/upgrade/container/container_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/upgrade/container/container_test.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/upgrade/job/job_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/upgrade/upgrade_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit de72632

Please sign in to comment.