lint; up cli

* golangci 1.60.2 (was 1.60.1); linters: - exportloopref (deprecated) + copyloopvar Signed-off-by: Alex Aizman <[email protected]>
NVIDIA · Aug 21, 2024 · 3500e92 · 3500e92
1 parent c434fb6
commit 3500e92
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 13 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -29,7 +29,7 @@ jobs:
         uses: golangci/golangci-lint-action@v3
         with:
           # NOTE: See `lint-update-ci` target in Makefile.
-          version: v1.60.1
+          version: v1.60.2
           args: --timeout=30m
 
       - name: Lint

diff --git a/.golangci.yml b/.golangci.yml
@@ -4,12 +4,12 @@ linters:
     - asciicheck
     - bodyclose
     - canonicalheader
+    - copyloopvar
     - depguard
     - dogsled
     - dupl
     - durationcheck
     - errcheck
-    - exportloopref
     - fatcontext
     - gci
     - gochecksumtype
@@ -97,7 +97,8 @@ linters-settings:
       - ifElseChain
       - unnamedResult
   gosec:
-    excludes:
+    excludes: ## TODO: revisit
+      - G115
       - G401
       - G402
       - G404

diff --git a/Makefile b/Makefile
@@ -257,7 +257,7 @@ lint-update:
 ## See also: .github/workflows/lint.yml
 lint-update-ci:
 	@rm -f $(GOPATH)/bin/golangci-lint
-	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.60.1
+	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.60.2
 
 lint:
 	@([[ -x "$(command -v golangci-lint)" ]] && echo "Cannot find golangci-lint, run 'make lint-update' to install" && exit 1) || true

diff --git a/ais/test/dsort_test.go b/ais/test/dsort_test.go
@@ -129,7 +129,6 @@ func runDsortTest(t *testing.T, dts dsortTestSpec, f any) {
 	}
 
 	for _, dsorterType := range dts.types {
-		dsorterType := dsorterType // pin
 		t.Run(dsorterType, func(t *testing.T) {
 			if dts.p {
 				t.Parallel()
@@ -149,7 +148,6 @@ func runDsortTest(t *testing.T, dts dsortTestSpec, f any) {
 			} else if len(dts.phases) > 0 {
 				g := f.(func(dsorterType, phase string, t *testing.T))
 				for _, phase := range dts.phases {
-					phase := phase // pin
 					t.Run(phase, func(t *testing.T) {
 						if dts.p {
 							t.Parallel()
@@ -159,15 +157,13 @@ func runDsortTest(t *testing.T, dts dsortTestSpec, f any) {
 				}
 			} else if len(dts.reactions) > 0 {
 				for _, reaction := range dts.reactions {
-					reaction := reaction // pin
 					t.Run(reaction, func(t *testing.T) {
 						if dts.p {
 							t.Parallel()
 						}
 
 						if len(dts.scopes) > 0 {
 							for _, scope := range dts.scopes {
-								scope := scope // pin
 								t.Run(scope, func(t *testing.T) {
 									if dts.p {
 										t.Parallel()
@@ -186,7 +182,6 @@ func runDsortTest(t *testing.T, dts dsortTestSpec, f any) {
 			} else if len(dts.algs) > 0 {
 				g := f.(func(dsorterType, alg string, t *testing.T))
 				for _, alg := range dts.algs {
-					alg := alg // pin
 					t.Run(alg, func(t *testing.T) {
 						if dts.p {
 							t.Parallel()
@@ -1286,7 +1281,6 @@ func TestDsortContent(t *testing.T) {
 			}
 
 			for _, entry := range cases {
-				entry := entry // pin
 				test := fmt.Sprintf("%s-%v", entry.contentKeyType, entry.missingKeys)
 				t.Run(test, func(t *testing.T) {
 					t.Parallel()

diff --git a/cmd/cli/go.mod b/cmd/cli/go.mod
@@ -3,7 +3,7 @@ module github.com/NVIDIA/aistore/cmd/cli
 go 1.22.3
 
 require (
-	github.com/NVIDIA/aistore v1.3.24-0.20240821221104-68b007550bc5
+	github.com/NVIDIA/aistore v1.3.24-0.20240821225139-c434fb653803
 	github.com/fatih/color v1.17.0
 	github.com/json-iterator/go v1.1.12
 	github.com/onsi/ginkgo/v2 v2.20.0

diff --git a/cmd/cli/go.sum b/cmd/cli/go.sum
@@ -1,7 +1,7 @@
 code.cloudfoundry.org/bytefmt v0.0.0-20190710193110-1eb035ffe2b6/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc=
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/NVIDIA/aistore v1.3.24-0.20240821221104-68b007550bc5 h1:LSxBjMuIUVue0RGbWNUUtDAa9tEFI/VlqACNeRkrVjI=
-github.com/NVIDIA/aistore v1.3.24-0.20240821221104-68b007550bc5/go.mod h1:si83S9r29vwIC0f0CE2Mk+25bFiaN6mmVlmuBpP4hHM=
+github.com/NVIDIA/aistore v1.3.24-0.20240821225139-c434fb653803 h1:eRCEK36yW0HZSLD5ZEV7G/m/dSv+POq9YB4byuZXo5Y=
+github.com/NVIDIA/aistore v1.3.24-0.20240821225139-c434fb653803/go.mod h1:si83S9r29vwIC0f0CE2Mk+25bFiaN6mmVlmuBpP4hHM=
 github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8=
 github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
 github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA=