update golangci-lint to v2.3.0

dongjiang1989 · dongjiang1989 · commit 4db9cf8c359c · 2025-08-05T20:02:52.000+08:00
Signed-off-by: dongjiang &lt;dongjiang1989@126.com&gt;

add TODO comment &amp;&amp; change code

Signed-off-by: dongjiang &lt;dongjiang1989@126.com&gt;
diff --git a/.github/workflows/pr-golangci-lint.yaml b/.github/workflows/pr-golangci-lint.yaml
@@ -30,7 +30,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # tag=v8.0.0
         with:
-          version: v2.1.0
+          version: v2.3.0
           working-directory: ${{matrix.working-directory}}
       - name: Lint API
         run: make lint-api
diff --git a/.golangci.yml b/.golangci.yml
@@ -269,6 +269,19 @@ linters:
       - linters:
           - staticcheck
         text: 'SA1019: .*(res|result|i|j)\.Requeue is deprecated: Use `RequeueAfter` instead'
+      # TODO: var-naming: avoid meaningless package names by revive  
+      #   * test/infrastructure/docker/internal/docker/types/
+      #   * bootstrap/kubeadm/types/
+      #   * internal/webhooks/util/
+      #   * util/
+      #   * exp/util/
+      #   * controlplane/kubeadm/internal/etcd/util/
+      #   * cmd/clusterctl/internal/util/
+      #   * bootstrap/util/
+      - linters:
+          - revive
+        text: 'var-naming: avoid meaningless package names'
+        path: test/infrastructure/docker/internal/docker/types/.*\.go$|bootstrap/kubeadm/types/.*\.go$|internal/webhooks/util/.*\.go$|util/.*\.go$|exp/util/.*\.go$|controlplane/kubeadm/internal/etcd/util/.*\.go$|cmd/clusterctl/internal/util/.*\.go$|bootstrap/util/.*\.go$
       - linters:
           - revive
         text: 'exported: exported method .*\.(Reconcile|SetupWithManager|SetupWebhookWithManager) should have comment or be unexported'
diff --git a/bootstrap/kubeadm/types/doc.go b/bootstrap/kubeadm/types/doc.go
@@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package utils contains Kubeadm utility types.
-package utils
+// Package types contains Kubeadm utility types.
+package types
diff --git a/bootstrap/kubeadm/types/utils.go b/bootstrap/kubeadm/types/utils.go
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package utils contains Kubeadm utility types.
-package utils
+// Package types contains Kubeadm utility types.
+package types
 
 import (
 	"github.com/blang/semver/v4"
diff --git a/bootstrap/kubeadm/types/utils_test.go b/bootstrap/kubeadm/types/utils_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package utils
+package types
 
 import (
 	"fmt"
diff --git a/hack/tools/.custom-gcl.yaml b/hack/tools/.custom-gcl.yaml
@@ -1,4 +1,4 @@
-version: v2.1.0
+version: v2.3.0
 name: golangci-lint-kube-api-linter
 destination: ./bin
 plugins:
diff --git a/hack/tools/internal/tilt-prepare/main.go b/hack/tools/internal/tilt-prepare/main.go
@@ -145,7 +145,7 @@ type tiltProviderConfig struct {
 }
 
 func init() {
-	cmd := exec.Command("git", "rev-parse", "--show-toplevel")
+	cmd := exec.Command("git", "rev-parse", "--show-toplevel") //nolint:noctx
 	var stdout, stderr bytes.Buffer
 	cmd.Stdout = &stdout
 	cmd.Stderr = &stderr
diff --git a/hack/tools/release/notes/github.go b/hack/tools/release/notes/github.go
@@ -165,7 +165,7 @@ func (c githubClient) listMergedPRs(after, before time.Time, baseBranches ...str
 }
 
 func (c githubClient) runGHAPICommand(url string, response any) error {
-	cmd := exec.Command("gh", "api", url)
+	cmd := exec.Command("gh", "api", url) //nolint:noctx
 
 	out, err := cmd.CombinedOutput()
 	if err != nil {
diff --git a/internal/test/envtest/environment.go b/internal/test/envtest/environment.go
@@ -417,7 +417,7 @@ func (e *Environment) start(ctx context.Context) {
 		}
 	}()
 	<-e.Elected()
-	e.waitForWebhooks()
+	e.waitForWebhooks(ctx)
 }
 
 // stop stops the test environment.
@@ -428,14 +428,17 @@ func (e *Environment) stop() error {
 }
 
 // waitForWebhooks waits for the webhook server to be available.
-func (e *Environment) waitForWebhooks() {
+func (e *Environment) waitForWebhooks(ctx context.Context) {
 	port := e.env.WebhookInstallOptions.LocalServingPort
 
 	klog.V(2).Infof("Waiting for webhook port %d to be open prior to running tests", port)
 	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(ctx, "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
diff --git a/test/framework/clusterctl/client.go b/test/framework/clusterctl/client.go
@@ -91,11 +91,11 @@ func Init(ctx context.Context, input InitInput) {
 }
 
 // InitWithBinary uses clusterctl binary to run init with the list of providers defined in the local repository.
-func InitWithBinary(_ context.Context, binary string, input InitInput) {
+func InitWithBinary(ctx context.Context, binary string, input InitInput) {
 	args := calculateClusterCtlInitArgs(input, binary)
 	log.Logf("clusterctl %s", strings.Join(args, " "))
 
-	cmd := exec.Command(binary, args...) //nolint:gosec // We don't care about command injection here.
+	cmd := exec.CommandContext(ctx, binary, args...) //nolint:gosec // We don't care about command injection here.
 
 	out, err := cmd.CombinedOutput()
 	_ = os.WriteFile(filepath.Join(input.LogFolder, "clusterctl-init.log"), out, 0644) //nolint:gosec // this is a log file to be shared via prow artifacts
@@ -217,7 +217,7 @@ func UpgradeWithBinary(ctx context.Context, binary string, input UpgradeInput) e
 	args := calculateClusterCtlUpgradeArgs(input)
 	log.Logf("clusterctl %s", strings.Join(args, " "))
 
-	cmd := exec.Command(binary, args...) //nolint:gosec // We don't care about command injection here.
+	cmd := exec.CommandContext(ctx, binary, args...) //nolint:gosec // We don't care about command injection here.
 
 	out, err := cmd.CombinedOutput()
 	_ = os.WriteFile(filepath.Join(input.LogFolder, "clusterctl-upgrade.log"), out, 0644) //nolint:gosec // this is a log file to be shared via prow artifacts
@@ -374,7 +374,7 @@ func ConfigCluster(ctx context.Context, input ConfigClusterInput) []byte {
 // ConfigClusterWithBinary uses clusterctl binary to run config cluster or generate cluster.
 // NOTE: This func detects the clusterctl version and uses config cluster or generate cluster
 // accordingly. We can drop the detection when we don't have to support clusterctl v0.3.x anymore.
-func ConfigClusterWithBinary(_ context.Context, clusterctlBinaryPath string, input ConfigClusterInput) []byte {
+func ConfigClusterWithBinary(ctx context.Context, clusterctlBinaryPath string, input ConfigClusterInput) []byte {
 	version, err := getClusterCtlVersion(clusterctlBinaryPath)
 	Expect(err).ToNot(HaveOccurred())
 	clusterctlSupportsGenerateCluster := version.GTE(semver.MustParse("1.0.0"))
@@ -401,7 +401,7 @@ func ConfigClusterWithBinary(_ context.Context, clusterctlBinaryPath string, inp
 	}
 	log.Logf("clusterctl %s", strings.Join(args, " "))
 
-	cmd := exec.Command(clusterctlBinaryPath, args...) //nolint:gosec // We don't care about command injection here.
+	cmd := exec.CommandContext(ctx, clusterctlBinaryPath, args...) //nolint:gosec // We don't care about command injection here.
 	out, err := cmd.Output()
 	_ = os.WriteFile(filepath.Join(input.LogFolder, fmt.Sprintf("%s-cluster-template.yaml", input.ClusterName)), out, 0644) //nolint:gosec // this is a log file to be shared via prow artifacts
 	var stdErr string
diff --git a/test/framework/docker_logcollector.go b/test/framework/docker_logcollector.go
@@ -154,7 +154,7 @@ func (k DockerLogCollector) collectLogsFromNode(ctx context.Context, outputPath
 				return err
 			}
 
-			return osExec.Command("tar", "--extract", "--file", tempfileName, "--directory", outputDir).Run() //nolint:gosec // We don't care about command injection here.
+			return osExec.CommandContext(ctx, "tar", "--extract", "--file", tempfileName, "--directory", outputDir).Run() //nolint:gosec // We don't care about command injection here.
 		}
 	}
 
diff --git a/test/framework/kubernetesversions/template.go b/test/framework/kubernetesversions/template.go
@@ -125,7 +125,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.Command("kustomize", "build", overlayDir) //nolint:gosec,noctx // We don't care about command injection here.
 	data, err := cmd.CombinedOutput()
 	if err != nil {
 		return "", err
diff --git a/test/framework/suite_helpers.go b/test/framework/suite_helpers.go
@@ -62,7 +62,7 @@ func ResolveArtifactsDirectory(input string) string {
 		return dir
 	}
 
-	findRootCmd := exec.Command("git", "rev-parse", "--show-toplevel")
+	findRootCmd := exec.Command("git", "rev-parse", "--show-toplevel") //nolint:noctx // We don't care about command injection here.
 	out, err := findRootCmd.Output()
 	if err != nil {
 		return "_artifacts"
diff --git a/test/infrastructure/inmemory/pkg/server/api/handler.go b/test/infrastructure/inmemory/pkg/server/api/handler.go
@@ -641,7 +641,7 @@ func (h *apiServerHandler) apiV1PortForward(req *restful.Request, resp *restful.
 // In the case of the in.memory backend, the target endpoint is always on the same server (the controller pod).
 func (h *apiServerHandler) doPortForward(ctx context.Context, address string, stream io.ReadWriteCloser) error {
 	// Get a connection to the target of the port forward operation.
-	dial, err := net.Dial("tcp", address)
+	dial, err := net.Dial("tcp", address) //nolint:noctx
 	if err != nil {
 		return fmt.Errorf("failed to dial %q: %w", address, err)
 	}
diff --git a/test/infrastructure/inmemory/pkg/server/mux.go b/test/infrastructure/inmemory/pkg/server/mux.go
@@ -152,7 +152,7 @@ func NewWorkloadClustersMux(manager inmemoryruntime.Manager, host string, opts .
 	m.debugServer = http.Server{
 		Handler: inmemoryapi.NewDebugHandler(manager, m.log, m),
 	}
-	l, err := net.Listen("tcp", net.JoinHostPort(host, fmt.Sprintf("%d", options.DebugPort)))
+	l, err := net.Listen("tcp", net.JoinHostPort(host, fmt.Sprintf("%d", options.DebugPort))) //nolint:noctx
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to create listener for workload cluster mux")
 	}
@@ -447,7 +447,7 @@ func (m *WorkloadClustersMux) AddAPIServer(wclName, podName string, caCert *x509
 			return nil
 		}
 
-		l, err := net.Listen("tcp", fmt.Sprintf(":%d", wcl.Port()))
+		l, err := net.Listen("tcp", fmt.Sprintf(":%d", wcl.Port())) //nolint:noctx
 		if err != nil {
 			return errors.Wrapf(err, "failed to start WorkloadClusterListener %s, %s", wclName, fmt.Sprintf(":%d", wcl.Port()))
 		}
@@ -468,6 +468,7 @@ func (m *WorkloadClustersMux) AddAPIServer(wclName, podName string, caCert *x509
 	var pollErr error
 	err = wait.PollUntilContextTimeout(context.TODO(), 250*time.Millisecond, 5*time.Second, true, func(context.Context) (done bool, err error) {
 		d := &net.Dialer{Timeout: 50 * time.Millisecond}
+		//nolint:noctx
 		conn, err := tls.DialWithDialer(d, "tcp", wcl.HostPort(), &tls.Config{
 			InsecureSkipVerify: true, //nolint:gosec // config is used to connect to our own port.
 		})

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: v2.1.0`
	`1`	`+version: v2.3.0`
`2`	`2`	`name: golangci-lint-kube-api-linter`
`3`	`3`	`destination: ./bin`
`4`	`4`	`plugins:`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ type tiltProviderConfig struct {`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`func init() {`
`148`		`- cmd := exec.Command("git", "rev-parse", "--show-toplevel")`
	`148`	`+ cmd := exec.Command("git", "rev-parse", "--show-toplevel") //nolint:noctx`
`149`	`149`	`var stdout, stderr bytes.Buffer`
`150`	`150`	`cmd.Stdout = &stdout`
`151`	`151`	`cmd.Stderr = &stderr`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ func (c githubClient) listMergedPRs(after, before time.Time, baseBranches ...str`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`func (c githubClient) runGHAPICommand(url string, response any) error {`
`168`		`- cmd := exec.Command("gh", "api", url)`
	`168`	`+ cmd := exec.Command("gh", "api", url) //nolint:noctx`
`169`	`169`
`170`	`170`	`out, err := cmd.CombinedOutput()`
`171`	`171`	`if err != nil {`