Merge pull request #3866 from prashantrewar/apply-latest-lint-rules

🌱Evaludate and Apply Latest Lint Rules and Features
kubernetes-sigs · Apr 20, 2024 · 1bdc798 · 1bdc798
2 parents 8847d19 + 5194900
commit 1bdc798
Show file tree

Hide file tree

Showing 179 changed files with 58 additions and 356 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -26,6 +26,11 @@ linters-settings:
       - name: context-as-argument
       - name: context-keys-type
       - name: dot-imports
+        arguments:
+          # dot import should be ONLY allowed for ginkgo testing packages
+          allowedPackages:
+            - "github.com/onsi/ginkgo/v2"
+            - "github.com/onsi/gomega"
       - name: error-return
       - name: error-strings
       - name: error-naming

diff --git a/docs/book/src/component-config-tutorial/testdata/project/test/e2e/e2e_suite_test.go b/docs/book/src/component-config-tutorial/testdata/project/test/e2e/e2e_suite_test.go
@@ -20,9 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 

diff --git a/docs/book/src/component-config-tutorial/testdata/project/test/e2e/e2e_test.go b/docs/book/src/component-config-tutorial/testdata/project/test/e2e/e2e_test.go
@@ -21,9 +21,7 @@ import (
 	"os/exec"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"tutorial.kubebuilder.io/project/test/utils"

diff --git a/docs/book/src/component-config-tutorial/testdata/project/test/utils/utils.go b/docs/book/src/component-config-tutorial/testdata/project/test/utils/utils.go
@@ -22,7 +22,6 @@ import (
 	"os/exec"
 	"strings"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
 )
 

diff --git a/docs/book/src/cronjob-tutorial/testdata/project/api/v1/cronjob_webhook_test.go b/docs/book/src/cronjob-tutorial/testdata/project/api/v1/cronjob_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 

diff --git a/docs/book/src/cronjob-tutorial/testdata/project/api/v1/webhook_suite_test.go b/docs/book/src/cronjob-tutorial/testdata/project/api/v1/webhook_suite_test.go
@@ -26,12 +26,10 @@ import (
 	"testing"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
-	admissionv1 "k8s.io/api/admission/v1"
 
+	admissionv1 "k8s.io/api/admission/v1"
 	//+kubebuilder:scaffold:imports
 	apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"

diff --git a/...book/src/cronjob-tutorial/testdata/project/internal/controller/cronjob_controller_test.go b/...book/src/cronjob-tutorial/testdata/project/internal/controller/cronjob_controller_test.go
@@ -29,10 +29,8 @@ import (
 	"reflect"
 	"time"
 
-	// nolint:revive
-	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
-	. "github.com/onsi/gomega"
+    . "github.com/onsi/ginkgo/v2"
+    . "github.com/onsi/gomega"
 	batchv1 "k8s.io/api/batch/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/docs/book/src/cronjob-tutorial/testdata/project/internal/controller/suite_test.go b/docs/book/src/cronjob-tutorial/testdata/project/internal/controller/suite_test.go
@@ -34,9 +34,7 @@ import (
 
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"

diff --git a/docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_suite_test.go b/docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_suite_test.go
@@ -20,9 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 

diff --git a/docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_test.go b/docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_test.go
@@ -21,9 +21,7 @@ import (
 	"os/exec"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"tutorial.kubebuilder.io/project/test/utils"

diff --git a/docs/book/src/cronjob-tutorial/testdata/project/test/utils/utils.go b/docs/book/src/cronjob-tutorial/testdata/project/test/utils/utils.go
@@ -22,7 +22,6 @@ import (
 	"os/exec"
 	"strings"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
 )
 

diff --git a/...ook/src/getting-started/testdata/project/internal/controller/memcached_controller_test.go b/...ook/src/getting-started/testdata/project/internal/controller/memcached_controller_test.go
@@ -23,9 +23,7 @@ import (
 	"time"
 
 	//nolint:golint
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"

diff --git a/docs/book/src/getting-started/testdata/project/internal/controller/suite_test.go b/docs/book/src/getting-started/testdata/project/internal/controller/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"

diff --git a/docs/book/src/getting-started/testdata/project/test/e2e/e2e_suite_test.go b/docs/book/src/getting-started/testdata/project/test/e2e/e2e_suite_test.go
@@ -20,9 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 

diff --git a/docs/book/src/getting-started/testdata/project/test/e2e/e2e_test.go b/docs/book/src/getting-started/testdata/project/test/e2e/e2e_test.go
@@ -21,9 +21,7 @@ import (
 	"os/exec"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"example.com/memcached/test/utils"

diff --git a/docs/book/src/getting-started/testdata/project/test/utils/utils.go b/docs/book/src/getting-started/testdata/project/test/utils/utils.go
@@ -22,7 +22,6 @@ import (
 	"os/exec"
 	"strings"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
 )
 

diff --git a/docs/book/src/multiversion-tutorial/testdata/project/api/v1/cronjob_webhook_test.go b/docs/book/src/multiversion-tutorial/testdata/project/api/v1/cronjob_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 

diff --git a/docs/book/src/multiversion-tutorial/testdata/project/api/v1/webhook_suite_test.go b/docs/book/src/multiversion-tutorial/testdata/project/api/v1/webhook_suite_test.go
@@ -26,9 +26,7 @@ import (
 	"testing"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	admissionv1 "k8s.io/api/admission/v1"

diff --git a/docs/book/src/multiversion-tutorial/testdata/project/api/v2/webhook_suite_test.go b/docs/book/src/multiversion-tutorial/testdata/project/api/v2/webhook_suite_test.go
@@ -26,9 +26,7 @@ import (
 	"testing"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	admissionv1 "k8s.io/api/admission/v1"

diff --git a/docs/book/src/multiversion-tutorial/testdata/project/internal/controller/suite_test.go b/docs/book/src/multiversion-tutorial/testdata/project/internal/controller/suite_test.go
@@ -25,9 +25,7 @@ import (
 
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"

diff --git a/docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_suite_test.go b/docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_suite_test.go
@@ -20,9 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 

diff --git a/docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go b/docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go
@@ -21,9 +21,7 @@ import (
 	"os/exec"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"tutorial.kubebuilder.io/project/test/utils"

diff --git a/docs/book/src/multiversion-tutorial/testdata/project/test/utils/utils.go b/docs/book/src/multiversion-tutorial/testdata/project/test/utils/utils.go
@@ -22,7 +22,6 @@ import (
 	"os/exec"
 	"strings"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
 )
 

diff --git a/hack/docs/internal/cronjob-tutorial/writing_tests_controller.go b/hack/docs/internal/cronjob-tutorial/writing_tests_controller.go
@@ -47,10 +47,8 @@ import (
 	"reflect"
 	"time"
 
-	// nolint:revive
-	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
-	. "github.com/onsi/gomega"
+    . "github.com/onsi/ginkgo/v2"
+    . "github.com/onsi/gomega"
 	batchv1 "k8s.io/api/batch/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/pkg/cli/cli_test.go b/pkg/cli/cli_test.go
@@ -22,9 +22,7 @@ import (
 	"os"
 	"strings"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"

diff --git a/pkg/cli/completion_test.go b/pkg/cli/completion_test.go
@@ -17,9 +17,7 @@ limitations under the License.
 package cli
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 

diff --git a/pkg/cli/options_test.go b/pkg/cli/options_test.go
@@ -23,9 +23,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"

diff --git a/pkg/cli/resource_test.go b/pkg/cli/resource_test.go
@@ -17,9 +17,7 @@ limitations under the License.
 package cli
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/model/resource"

diff --git a/pkg/cli/suite_test.go b/pkg/cli/suite_test.go
@@ -19,9 +19,7 @@ package cli
 import (
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/config"

diff --git a/pkg/cli/version_test.go b/pkg/cli/version_test.go
@@ -17,9 +17,7 @@ limitations under the License.
 package cli
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 

diff --git a/pkg/config/errors_test.go b/pkg/config/errors_test.go
@@ -19,9 +19,7 @@ package config
 import (
 	"fmt"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/model/resource"

diff --git a/pkg/config/registry_test.go b/pkg/config/registry_test.go
@@ -17,9 +17,7 @@ limitations under the License.
 package config
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 

diff --git a/pkg/config/store/errors_test.go b/pkg/config/store/errors_test.go
@@ -20,9 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 

diff --git a/pkg/config/store/yaml/store_test.go b/pkg/config/store/yaml/store_test.go
@@ -21,9 +21,7 @@ import (
 	"os"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"github.com/spf13/afero"
 

diff --git a/pkg/config/suite_test.go b/pkg/config/suite_test.go
@@ -19,9 +19,7 @@ package config
 import (
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 

diff --git a/pkg/config/v2/config_test.go b/pkg/config/v2/config_test.go
@@ -20,9 +20,7 @@ package v2
 import (
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/model/resource"

diff --git a/pkg/config/v3/config_test.go b/pkg/config/v3/config_test.go
@@ -21,9 +21,7 @@ import (
 	"sort"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/config"

diff --git a/pkg/config/version_test.go b/pkg/config/version_test.go
@@ -19,9 +19,7 @@ package config
 import (
 	"sort"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/model/stage"

diff --git a/pkg/internal/validation/dns_test.go b/pkg/internal/validation/dns_test.go
@@ -21,9 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 

diff --git a/pkg/machinery/errors_test.go b/pkg/machinery/errors_test.go
@@ -20,9 +20,7 @@ import (
 	"errors"
 	"path/filepath"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )