✨ Upgrade golangci from 1.54 to 1.57 (#3846)

* Upgrade golangci from 1.54 to 1.57 * Fix lint issues after upgrade by: a) Ensure that in all places we are ignoring the exception equally ```go // nolint:revive . "github.com/onsi/ginkgo/v2" // nolint:revive . "github.com/onsi/gomega" ``` b) Ensure that we use `_` for args not explicit called in the funcs. Example ```go PreRunE: func(_ *cobra.Command, _ []string) error { ```
kubernetes-sigs · Apr 6, 2024 · a7f6e03 · a7f6e03
1 parent 6bcd440
commit a7f6e03
Show file tree

Hide file tree

Showing 194 changed files with 366 additions and 78 deletions.
diff --git a/.github/workflows/lint-sample.yml b/.github/workflows/lint-sample.yml
@@ -40,14 +40,14 @@ jobs:
       - name: Run linter
         uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.54
+          version: v1.57
           working-directory: testdata/project-v4-with-deploy-image
           args: --config .golangci.yml ./...
           skip-cache: true  # first lint action will handle
       - name: Run linter
         uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.54
+          version: v1.57
           working-directory: testdata/project-v4-multigroup-with-deploy-image
           args: --config .golangci.yml ./...
           skip-cache: true  # first lint action will handle
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Run linter
         uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.54
+          version: v1.57
 
   yamllint:
     runs-on: ubuntu-latest

diff --git a/Makefile b/Makefile
@@ -104,7 +104,7 @@ GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
 golangci-lint:
 	@[ -f $(GOLANGCI_LINT) ] || { \
 	set -e ;\
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT)) v1.54.2 ;\
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT)) v1.57.2 ;\
 	}
 
 .PHONY: apidiff

diff --git a/docs/book/src/component-config-tutorial/testdata/project/Makefile b/docs/book/src/component-config-tutorial/testdata/project/Makefile
@@ -161,7 +161,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION)
 KUSTOMIZE_VERSION ?= v5.3.0
 CONTROLLER_TOOLS_VERSION ?= v0.14.0
 ENVTEST_VERSION ?= release-0.17
-GOLANGCI_LINT_VERSION ?= v1.54.2
+GOLANGCI_LINT_VERSION ?= v1.57.2
 
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.

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,7 +20,9 @@ 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,7 +21,9 @@ 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,6 +22,7 @@ import (
 	"os/exec"
 	"strings"
 
+	// nolint:revive
 	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
 )
 

diff --git a/docs/book/src/cronjob-tutorial/testdata/project/Makefile b/docs/book/src/cronjob-tutorial/testdata/project/Makefile
@@ -161,7 +161,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION)
 KUSTOMIZE_VERSION ?= v5.3.0
 CONTROLLER_TOOLS_VERSION ?= v0.14.0
 ENVTEST_VERSION ?= release-0.17
-GOLANGCI_LINT_VERSION ?= v1.54.2
+GOLANGCI_LINT_VERSION ?= v1.57.2
 
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.

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,6 +17,7 @@ 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,10 +26,12 @@ import (
 	"testing"
 	"time"
 
+	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
+	// nolint:revive
 	. "github.com/onsi/gomega"
-
 	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,7 +29,9 @@ import (
 	"reflect"
 	"time"
 
+	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
+	// nolint:revive
 	. "github.com/onsi/gomega"
 	batchv1 "k8s.io/api/batch/v1"
 	v1 "k8s.io/api/core/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,7 +34,9 @@ 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,7 +20,9 @@ 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,7 +21,9 @@ 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,6 +22,7 @@ import (
 	"os/exec"
 	"strings"
 
+	// nolint:revive
 	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
 )
 

diff --git a/docs/book/src/getting-started/testdata/project/Makefile b/docs/book/src/getting-started/testdata/project/Makefile
@@ -161,7 +161,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION)
 KUSTOMIZE_VERSION ?= v5.3.0
 CONTROLLER_TOOLS_VERSION ?= v0.14.0
 ENVTEST_VERSION ?= release-0.17
-GOLANGCI_LINT_VERSION ?= v1.54.2
+GOLANGCI_LINT_VERSION ?= v1.57.2
 
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.

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,7 +23,9 @@ 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,7 +22,9 @@ 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,7 +20,9 @@ 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,7 +21,9 @@ 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,6 +22,7 @@ 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,6 +17,7 @@ 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,7 +26,9 @@ 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,7 +26,9 @@ 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,7 +25,9 @@ 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,7 +20,9 @@ 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,7 +21,9 @@ 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,6 +22,7 @@ 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,7 +47,9 @@ import (
 	"reflect"
 	"time"
 
+	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
+	// nolint:revive
 	. "github.com/onsi/gomega"
 	batchv1 "k8s.io/api/batch/v1"
 	v1 "k8s.io/api/core/v1"

diff --git a/pkg/cli/alpha/generate.go b/pkg/cli/alpha/generate.go
@@ -32,10 +32,10 @@ using the current version of KubeBuilder binary available.
 $ kubebuilder alpha generate --input-dir="./test" --output-dir="./my-output"
 Then we will re-scaffold the project by Kubebuilder in the directory specified by 'output-dir'.
 		`,
-		PreRunE: func(cmd *cobra.Command, _ []string) error {
+		PreRunE: func(_ *cobra.Command, _ []string) error {
 			return opts.Validate()
 		},
-		Run: func(cmd *cobra.Command, args []string) {
+		Run: func(_ *cobra.Command, _ []string) {
 			if err := opts.Rescaffold(); err != nil {
 				log.Fatalf("Failed to rescaffold %s", err)
 			}

diff --git a/pkg/cli/cli_test.go b/pkg/cli/cli_test.go
@@ -22,7 +22,9 @@ 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.go b/pkg/cli/completion.go
@@ -36,7 +36,7 @@ Linux:
 MacOS:
   $ %[1]s completion bash > /usr/local/etc/bash_completion.d/%[1]s
 `, c.commandName),
-		RunE: func(cmd *cobra.Command, cmdArgs []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			return cmd.Root().GenBashCompletion(os.Stdout)
 		},
 	}
@@ -55,7 +55,7 @@ $ %[1]s completion zsh > "${fpath[1]}/_%[1]s"
 
 # You will need to start a new shell for this setup to take effect.
 `, c.commandName),
-		RunE: func(cmd *cobra.Command, cmdArgs []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			return cmd.Root().GenZshCompletion(os.Stdout)
 		},
 	}
@@ -71,7 +71,7 @@ $ %[1]s completion fish | source
 # To load completions for each session, execute once:
 $ %[1]s completion fish > ~/.config/fish/completions/%[1]s.fish
 `, c.commandName),
-		RunE: func(cmd *cobra.Command, cmdArgs []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			return cmd.Root().GenFishCompletion(os.Stdout, true)
 		},
 	}
@@ -81,7 +81,7 @@ func (CLI) newPowerShellCmd() *cobra.Command {
 	return &cobra.Command{
 		Use:   "powershell",
 		Short: "Load powershell completions",
-		RunE: func(cmd *cobra.Command, cmdArgs []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			return cmd.Root().GenPowerShellCompletion(os.Stdout)
 		},
 	}

diff --git a/pkg/cli/completion_test.go b/pkg/cli/completion_test.go
@@ -17,7 +17,9 @@ 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/init.go b/pkg/cli/init.go
@@ -39,7 +39,7 @@ func (c CLI) newInitCmd() *cobra.Command {
 For further help about a specific plugin, set --plugins.
 `,
 		Example: c.getInitHelpExamples(),
-		Run:     func(cmd *cobra.Command, args []string) {},
+		Run:     func(_ *cobra.Command, _ []string) {},
 	}
 
 	// Register --project-version on the dynamically created command

diff --git a/pkg/cli/options_test.go b/pkg/cli/options_test.go
@@ -23,7 +23,9 @@ 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"
@@ -383,7 +385,7 @@ var _ = Describe("Discover external plugins", func() {
 
 			It("should fail if pluginsroot is empty", func() {
 				errPluginsRoot := errors.New("could not retrieve plugins root")
-				retrievePluginsRoot = func(host string) (string, error) {
+				retrievePluginsRoot = func(_ string) (string, error) {
 					return "", errPluginsRoot
 				}
 
@@ -394,7 +396,7 @@ var _ = Describe("Discover external plugins", func() {
 			})
 
 			It("should skip parsing of directories if plugins root is not a directory", func() {
-				retrievePluginsRoot = func(host string) (string, error) {
+				retrievePluginsRoot = func(_ string) (string, error) {
 					return "externalplugin.sh", nil
 				}
 

diff --git a/pkg/cli/resource_test.go b/pkg/cli/resource_test.go
@@ -17,7 +17,9 @@ 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"