From 532f546b0533b0b701d43482a5a9c3db04080b3d Mon Sep 17 00:00:00 2001 From: anishbista60 Date: Wed, 21 Aug 2024 18:12:19 +0530 Subject: [PATCH] Removed linter : (gci) Signed-off-by: anishbista60 --- .golangci.yml | 1 - pkg/errorchecker/errorchecker_test.go | 4 ++-- pkg/field/field_test.go | 4 ++-- pkg/filter/filter_test.go | 3 ++- pkg/filter/unstructured_test.go | 3 ++- pkg/kopia/errors/utils_test.go | 1 + pkg/ksprig/fipsonly_sprig_test.go | 4 ++-- pkg/poll/poll_test.go | 1 + pkg/secrets/repositoryserver/aws_secrets_test.go | 4 +++- pkg/secrets/repositoryserver/azure_secrets_test.go | 4 +++- pkg/secrets/repositoryserver/gcp_secrets_test.go | 4 +++- pkg/secrets/repositoryserver/s3compliant_secrets_test.go | 4 +++- 12 files changed, 24 insertions(+), 13 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 02f9462685..e7b01f204b 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -45,7 +45,6 @@ issues: - lll - dupl - nestif - - gci - stylecheck - text: "`ctx` is unused" # Context might not be in use in places, but for consistency, we pass it. diff --git a/pkg/errorchecker/errorchecker_test.go b/pkg/errorchecker/errorchecker_test.go index 7194723fc4..3f043a19c9 100644 --- a/pkg/errorchecker/errorchecker_test.go +++ b/pkg/errorchecker/errorchecker_test.go @@ -3,10 +3,10 @@ package errorchecker import ( "testing" - . "gopkg.in/check.v1" - "github.com/kanisterio/errkit" "github.com/pkg/errors" + + . "gopkg.in/check.v1" ) // Hook up gocheck into the "go test" runner. diff --git a/pkg/field/field_test.go b/pkg/field/field_test.go index b8ff3bece2..48daf8419b 100644 --- a/pkg/field/field_test.go +++ b/pkg/field/field_test.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - . "gopkg.in/check.v1" - "github.com/kanisterio/kanister/pkg/field" + + . "gopkg.in/check.v1" ) type FieldSuite struct{} diff --git a/pkg/filter/filter_test.go b/pkg/filter/filter_test.go index 2c76020431..9c554fc76e 100644 --- a/pkg/filter/filter_test.go +++ b/pkg/filter/filter_test.go @@ -17,10 +17,11 @@ package filter import ( "testing" - . "gopkg.in/check.v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" + + . "gopkg.in/check.v1" ) // Hook up gocheck into the "go test" runner. diff --git a/pkg/filter/unstructured_test.go b/pkg/filter/unstructured_test.go index e114bdccf5..f6f7804b83 100644 --- a/pkg/filter/unstructured_test.go +++ b/pkg/filter/unstructured_test.go @@ -15,8 +15,9 @@ package filter import ( - . "gopkg.in/check.v1" "k8s.io/apimachinery/pkg/runtime/schema" + + . "gopkg.in/check.v1" ) type UnstructuredSuite struct { diff --git a/pkg/kopia/errors/utils_test.go b/pkg/kopia/errors/utils_test.go index 164d3d79da..a08b0d087d 100644 --- a/pkg/kopia/errors/utils_test.go +++ b/pkg/kopia/errors/utils_test.go @@ -19,6 +19,7 @@ import ( "github.com/kanisterio/errkit" "github.com/pkg/errors" + . "gopkg.in/check.v1" ) diff --git a/pkg/ksprig/fipsonly_sprig_test.go b/pkg/ksprig/fipsonly_sprig_test.go index 2de1e33905..756bb1bac8 100644 --- a/pkg/ksprig/fipsonly_sprig_test.go +++ b/pkg/ksprig/fipsonly_sprig_test.go @@ -20,9 +20,9 @@ import ( "testing" "text/template" - . "gopkg.in/check.v1" - "github.com/kanisterio/kanister/pkg/ksprig" + + . "gopkg.in/check.v1" ) type FipsOnlySprigSuite struct{} diff --git a/pkg/poll/poll_test.go b/pkg/poll/poll_test.go index 4a4983e570..3eac3b908d 100644 --- a/pkg/poll/poll_test.go +++ b/pkg/poll/poll_test.go @@ -23,6 +23,7 @@ import ( "time" "github.com/jpillora/backoff" + . "gopkg.in/check.v1" ) diff --git a/pkg/secrets/repositoryserver/aws_secrets_test.go b/pkg/secrets/repositoryserver/aws_secrets_test.go index 8cb1e9cc56..6584ba4eeb 100644 --- a/pkg/secrets/repositoryserver/aws_secrets_test.go +++ b/pkg/secrets/repositoryserver/aws_secrets_test.go @@ -16,11 +16,13 @@ package repositoryserver import ( "github.com/pkg/errors" - . "gopkg.in/check.v1" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" secerrors "github.com/kanisterio/kanister/pkg/secrets/errors" + + . "gopkg.in/check.v1" ) type AWSSecretCredsSuite struct{} diff --git a/pkg/secrets/repositoryserver/azure_secrets_test.go b/pkg/secrets/repositoryserver/azure_secrets_test.go index 985b06db4d..8965f85930 100644 --- a/pkg/secrets/repositoryserver/azure_secrets_test.go +++ b/pkg/secrets/repositoryserver/azure_secrets_test.go @@ -16,11 +16,13 @@ package repositoryserver import ( "github.com/pkg/errors" - . "gopkg.in/check.v1" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" secerrors "github.com/kanisterio/kanister/pkg/secrets/errors" + + . "gopkg.in/check.v1" ) type AzureSecretCredsSuite struct{} diff --git a/pkg/secrets/repositoryserver/gcp_secrets_test.go b/pkg/secrets/repositoryserver/gcp_secrets_test.go index 01dbe80f6d..030c82724e 100644 --- a/pkg/secrets/repositoryserver/gcp_secrets_test.go +++ b/pkg/secrets/repositoryserver/gcp_secrets_test.go @@ -16,11 +16,13 @@ package repositoryserver import ( "github.com/pkg/errors" - . "gopkg.in/check.v1" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" secerrors "github.com/kanisterio/kanister/pkg/secrets/errors" + + . "gopkg.in/check.v1" ) type GCPSecretCredsSuite struct{} diff --git a/pkg/secrets/repositoryserver/s3compliant_secrets_test.go b/pkg/secrets/repositoryserver/s3compliant_secrets_test.go index 29b14450d3..d3b436acee 100644 --- a/pkg/secrets/repositoryserver/s3compliant_secrets_test.go +++ b/pkg/secrets/repositoryserver/s3compliant_secrets_test.go @@ -16,11 +16,13 @@ package repositoryserver import ( "github.com/pkg/errors" - . "gopkg.in/check.v1" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" secerrors "github.com/kanisterio/kanister/pkg/secrets/errors" + + . "gopkg.in/check.v1" ) type S3CompliantSecretTestSuite struct{}