Bump up golangci-lint to v1.52.2

ktock · estesp · commit 969f8feb2e09 · 2023-12-01T10:52:17.000-05:00
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com> (cherry picked from commit 6e2c915)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,7 +47,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.51.1
+          version: v1.52.2
           skip-cache: true
           args: --timeout=8m
 
diff --git a/.golangci.yml b/.golangci.yml
@@ -28,6 +28,24 @@ issues:
     - path: 'archive[\\/]tarheader[\\/]'
       # conversion is necessary on Linux, unnecessary on macOS
       text: "unnecessary conversion"
+    - linters:
+        - revive
+      text: "if-return"
+    - linters:
+        - revive
+      text: "empty-block"
+    - linters:
+        - revive
+      text: "superfluous-else"
+    - linters:
+        - revive
+      text: "unused-parameter"
+    - linters:
+        - revive
+      text: "unreachable-code"
+    - linters:
+        - revive
+      text: "redefines-builtin-id"
 
 linters-settings:
   gosec:
diff --git a/pkg/cri/server/image_pull.go b/pkg/cri/server/image_pull.go
@@ -317,7 +317,8 @@ func (c *criService) getTLSConfig(registryTLSConfig criconfig.TLSConfig) (*tls.C
 		if len(cert.Certificate) != 0 {
 			tlsConfig.Certificates = []tls.Certificate{cert}
 		}
-		tlsConfig.BuildNameToCertificate() //nolint:staticcheck // TODO(thaJeztah): verify if we should ignore the deprecation; see https://github.com/containerd/containerd/pull/7349/files#r990644833
+		// TODO(thaJeztah): verify if we should ignore the deprecation; see https://github.com/containerd/containerd/pull/7349/files#r990644833
+		tlsConfig.BuildNameToCertificate() //nolint:staticcheck
 	}
 
 	if registryTLSConfig.CAFile != "" {
diff --git a/remotes/docker/config/hosts.go b/remotes/docker/config/hosts.go
@@ -365,7 +365,6 @@ func parseHostsFile(baseDir string, b []byte) ([]hostConfig, error) {
 
 	// HACK: we want to keep toml parsing structures private in this package, however go-toml ignores private embedded types.
 	// so we remap it to a public type within the func body, so technically it's public, but not possible to import elsewhere.
-	//nolint:unused
 	type HostFileConfig = hostFileConfig
 
 	c := struct {
diff --git a/script/setup/install-dev-tools b/script/setup/install-dev-tools
@@ -22,7 +22,7 @@ set -eu -o pipefail
 # install `protobuild` and other commands
 go install github.com/stevvooe/protobuild@v0.1.0
 go install github.com/cpuguy83/go-md2man/v2@v2.0.1
-go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.50.1
+go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.2
 
 # the following packages need to exist in $GOPATH so we can't use
 # go modules-aware mode of `go get` for these includes used during

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,8 @@ func (c criService) getTLSConfig(registryTLSConfig criconfig.TLSConfig) (tls.C`
`317`	`317`	`if len(cert.Certificate) != 0 {`
`318`	`318`	`tlsConfig.Certificates = []tls.Certificate{cert}`
`319`	`319`	`}`
`320`		`- tlsConfig.BuildNameToCertificate() //nolint:staticcheck // TODO(thaJeztah): verify if we should ignore the deprecation; see https://github.com/containerd/containerd/pull/7349/files#r990644833`
	`320`	`+ // TODO(thaJeztah): verify if we should ignore the deprecation; see https://github.com/containerd/containerd/pull/7349/files#r990644833`
	`321`	`+ tlsConfig.BuildNameToCertificate() //nolint:staticcheck`
`321`	`322`	`}`
`322`	`323`
`323`	`324`	`if registryTLSConfig.CAFile != "" {`