fix: bumps golangci-lint to work with go 1.24+

Author: faiq

.github/workflows/pr-golangci-lint.yaml

@@ -4,8 +4,8 @@ on:
   pull_request:
     types: [opened, edited, synchronize, reopened]
 
-# Remove all permissions from GITHUB_TOKEN except metadata.
-permissions: {}
+permissions:
+  contents: read # Required for actions/checkout
 
 jobs:
   golangci:
@@ -28,7 +28,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@0a35821d5c230e903fcfe077583637dea1b27b47 # tag=v9.0.0
         with:
-          version: v2.1.0
+          version: v2.5.0
           working-directory: ${{matrix.working-directory}}
       - name: Lint API
         run: make lint-api

.golangci.yml

@@ -297,6 +297,26 @@ linters:
         path: .*(api|types|test)\/.*\/.*conversion.*\.go$
         # This rule warns when initialism, variable or package naming conventions are not followed.
         text: "var-naming: don't use underscores in Go names"
+      - linters:
+          - revive
+        path: 'exp/utils/*'
+        text: 'var-naming: avoid meaningless package names'
+      - linters:
+          - revive
+        path: 'cmd/clusterawsadm/cmd/ami/common'
+        text: 'var-naming: avoid meaningless package names'
+      - linters:
+          - revive
+        path: 'cmd/clusterawsadm/cmd/util'
+        text: 'var-naming: avoid meaningless package names'
+      - linters:
+          - revive
+        path: 'pkg/utils'
+        text: 'var-naming: avoid meaningless package names'
+      - linters:
+          - revive
+        path: 'pkg/cloud/services/common/'
+        text: 'var-naming: avoid meaningless package names'
       - linters:
           - unparam
         text: always receives

hack/tools/.custom-gcl.yaml

@@ -1,4 +1,4 @@
-version: v2.1.0
+version: v2.4.0
 name: golangci-lint-kube-api-linter
 destination: ./bin
 plugins:

test/e2e/shared/aws.go

@@ -764,7 +764,7 @@ func ensureTestImageUploaded(ctx context.Context, e2eCtx *E2EContext) error {
 		return err
 	}
 
-	cmd := exec.Command("docker", "inspect", "--format='{{index .Id}}'", "gcr.io/k8s-staging-cluster-api/capa-manager:e2e")
+	cmd := exec.CommandContext(ctx, "docker", "inspect", "--format='{{index .Id}}'", "gcr.io/k8s-staging-cluster-api/capa-manager:e2e")
 	var stdOut bytes.Buffer
 	cmd.Stdout = &stdOut
 	err := cmd.Run()
@@ -775,7 +775,7 @@ func ensureTestImageUploaded(ctx context.Context, e2eCtx *E2EContext) error {
 	imageSha := strings.ReplaceAll(strings.TrimSuffix(stdOut.String(), "\n"), "'", "")
 
 	ecrImageName := repoName + ":e2e"
-	cmd = exec.Command("docker", "tag", imageSha, ecrImageName) //nolint:gosec
+	cmd = exec.CommandContext(ctx, "docker", "tag", imageSha, ecrImageName) //nolint:gosec
 	err = cmd.Run()
 	if err != nil {
 		return err
@@ -794,13 +794,13 @@ func ensureTestImageUploaded(ctx context.Context, e2eCtx *E2EContext) error {
 		return errors.New("failed to decode ECR authentication token")
 	}
 
-	cmd = exec.Command("docker", "login", "--username", strList[0], "--password", strList[1], "public.ecr.aws") //nolint:gosec
+	cmd = exec.CommandContext(ctx, "docker", "login", "--username", strList[0], "--password", strList[1], "public.ecr.aws") //nolint:gosec
 	err = cmd.Run()
 	if err != nil {
 		return err
 	}
 
-	cmd = exec.Command("docker", "push", ecrImageName)
+	cmd = exec.CommandContext(ctx, "docker", "push", ecrImageName)
 	err = cmd.Run()
 	if err != nil {
 		return err

test/e2e/shared/suite.go

@@ -89,7 +89,7 @@ func Node1BeforeSuite(e2eCtx *E2EContext) []byte {
 		templateDir := path.Join(e2eCtx.Settings.ArtifactFolder, "templates")
 		newTemplatePath := templateDir + "/" + ciTemplateForUpgradeName
 
-		err = exec.Command("cp", ciTemplateForUpgradePath, newTemplatePath).Run() //nolint:gosec
+		err = exec.CommandContext(context.TODO(), "cp", ciTemplateForUpgradePath, newTemplatePath).Run() //nolint:gosec
 		Expect(err).NotTo(HaveOccurred())
 
 		clusterctlCITemplateForUpgrade := clusterctl.Files{

test/helpers/envtest.go

@@ -271,7 +271,8 @@ func (t *TestEnvironment) WaitForWebhooks() {
 	timeout := 1 * time.Second
 	for {
 		time.Sleep(1 * time.Second)
-		conn, err := net.DialTimeout("tcp", net.JoinHostPort("127.0.0.1", strconv.Itoa(port)), timeout)
+		dialer := &net.Dialer{Timeout: timeout}
+		conn, err := dialer.DialContext(context.Background(), "tcp", net.JoinHostPort("127.0.0.1", strconv.Itoa(port)))
 		if err != nil {
 			klog.V(2).Infof("Webhook port is not ready, will retry in %v: %s", timeout, err)
 			continue

test/helpers/kubernetesversions/template.go

@@ -22,6 +22,7 @@ package kubernetesversions
 
 import (
 	"bytes"
+	"context"
 	_ "embed"
 	"errors"
 	"fmt"
@@ -128,7 +129,7 @@ func GenerateCIArtifactsInjectedTemplateForDebian(input GenerateCIArtifactsInjec
 	if err := os.WriteFile(path.Join(overlayDir, "platform-kustomization.yaml"), input.PlatformKustomization, 0o600); err != nil {
 		return "", err
 	}
-	cmd := exec.Command("kustomize", "build", overlayDir) //nolint:gosec // We don't care about command injection here.
+	cmd := exec.CommandContext(context.TODO(), "kustomize", "build", overlayDir) //nolint:gosec // We don't care about command injection here.
 	data, err := cmd.CombinedOutput()
 	if err != nil {
 		return "", err

versions.mk

@@ -18,6 +18,6 @@ CERT_MANAGER_VERSION := v1.17.2
 CAPI_VERSION := v1.11.1
 KPROMO_VERSION := v4.0.5
 YQ_VERSION := v4.25.2
-GOLANGCI_LINT_VERSION := v2.1.0
+GOLANGCI_LINT_VERSION := v2.5.0
 RELEASE_NOTES_VERSION := v0.16.5
 GORELEASER_VERSION := v1.24.0