update golangcilint and remove copyloopvar (#1585)

lingrino · Oct 28, 2024 · 7454a27 · 7454a27
1 parent 2222e3c
commit 7454a27
Show file tree

Hide file tree

Showing 44 changed files with 1 addition and 86 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,11 +1,11 @@
 linters:
   enable:
     - bodyclose
+    - copyloopvar
     - dogsled
     - dupl
     - errcheck
     - errorlint
-    - exportloopref
     - forcetypeassert
     - funlen
     - gochecknoglobals

diff --git a/api/client_test.go b/api/client_test.go
@@ -96,7 +96,6 @@ func TestNewClient(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -142,7 +141,6 @@ func TestSwapPaths(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.giveSrc, func(t *testing.T) {
 			t.Parallel()
 
@@ -182,7 +180,6 @@ func TestOutputPath(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.givePath, func(t *testing.T) {
 			t.Parallel()
 
@@ -225,7 +222,6 @@ func TestOutputPaths(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.giveRoot, func(t *testing.T) {
 			t.Parallel()
 
@@ -266,7 +262,6 @@ func TestInputPath(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.giveRoot, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/api/error_test.go b/api/error_test.go
@@ -92,7 +92,6 @@ func TestNewWrapErr(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -123,7 +122,6 @@ func TestCtxErr(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/api/folder_copy_test.go b/api/folder_copy_test.go
@@ -41,11 +41,9 @@ func TestFolderCopy(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(testName(tt.giveSrc, tt.giveDst), func(t *testing.T) {
 			t.Parallel()
 			for _, prefixPair := range seededPrefixProduct(t) {
-				prefixPair := prefixPair
 				t.Run(testName(prefixPair[0], prefixPair[1]), func(t *testing.T) {
 					t.Parallel()
 

diff --git a/api/folder_delete_meta_test.go b/api/folder_delete_meta_test.go
@@ -58,11 +58,9 @@ func TestFolderDeleteMeta(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(testName(tt.give), func(t *testing.T) {
 			t.Parallel()
 			for _, prefix := range seededPrefixes(t, tt.give) {
-				prefix := prefix
 				if strings.HasPrefix(prefix, "kv1") {
 					t.Run(testName(prefix), func(t *testing.T) {
 						t.Parallel()

diff --git a/api/folder_delete_test.go b/api/folder_delete_test.go
@@ -51,11 +51,9 @@ func TestFolderDelete(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(testName(tt.give), func(t *testing.T) {
 			t.Parallel()
 			for _, prefix := range seededPrefixes(t, tt.give) {
-				prefix := prefix
 				t.Run(testName(prefix), func(t *testing.T) {
 					t.Parallel()
 

diff --git a/api/folder_destroy_test.go b/api/folder_destroy_test.go
@@ -57,11 +57,9 @@ func TestFolderDestroy(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(testName(tt.give), func(t *testing.T) {
 			t.Parallel()
 			for _, prefix := range seededPrefixes(t, tt.give) {
-				prefix := prefix
 				if strings.HasPrefix(prefix, "kv1") {
 					t.Run(testName(prefix), func(t *testing.T) {
 						t.Parallel()

diff --git a/api/folder_list_test.go b/api/folder_list_test.go
@@ -39,11 +39,9 @@ func TestFolderList(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(testName(tt.give), func(t *testing.T) {
 			t.Parallel()
 			for _, prefix := range seededPrefixes(t, tt.give) {
-				prefix := prefix
 				t.Run(testName(prefix), func(t *testing.T) {
 					t.Parallel()
 

diff --git a/api/folder_move_test.go b/api/folder_move_test.go
@@ -43,11 +43,9 @@ func TestFolderMove(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(testName(tt.giveSrc, tt.giveDst), func(t *testing.T) {
 			t.Parallel()
 			for _, prefixPair := range seededPrefixProduct(t) {
-				prefixPair := prefixPair
 				t.Run(testName(prefixPair[0], prefixPair[1]), func(t *testing.T) {
 					t.Parallel()
 

diff --git a/api/folder_read_test.go b/api/folder_read_test.go
@@ -59,11 +59,9 @@ func TestFolderRead(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(testName(tt.give), func(t *testing.T) {
 			t.Parallel()
 			for _, prefix := range seededPrefixes(t, tt.give) {
-				prefix := prefix
 				t.Run(testName(prefix), func(t *testing.T) {
 					t.Parallel()
 

diff --git a/api/folder_search_test.go b/api/folder_search_test.go
@@ -56,11 +56,9 @@ func TestFolderSearch(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(testName(tt.give), func(t *testing.T) {
 			t.Parallel()
 			for _, prefix := range seededPrefixes(t, tt.give) {
-				prefix := prefix
 				t.Run(testName(prefix), func(t *testing.T) {
 					t.Parallel()
 

diff --git a/api/folder_write_test.go b/api/folder_write_test.go
@@ -101,11 +101,9 @@ func TestFolderWrite(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			for _, prefix := range seededPrefixes(t, "") {
-				prefix := prefix
 				t.Run(testName(prefix), func(t *testing.T) {
 					t.Parallel()
 

diff --git a/api/helpers_test.go b/api/helpers_test.go
@@ -44,7 +44,6 @@ func TestPathJoin(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.want, func(t *testing.T) {
 			t.Parallel()
 
@@ -91,7 +90,6 @@ func TestIsFolder(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.give, func(t *testing.T) {
 			t.Parallel()
 
@@ -130,7 +128,6 @@ func TestEnsureFolder(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.give, func(t *testing.T) {
 			t.Parallel()
 
@@ -185,7 +182,6 @@ func TestAddPrefix(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.give, func(t *testing.T) {
 			t.Parallel()
 
@@ -240,7 +236,6 @@ func TestEnsurePrefix(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.give, func(t *testing.T) {
 			t.Parallel()
 
@@ -280,7 +275,6 @@ func TestAddPrefixList(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.givePrefix, func(t *testing.T) {
 			t.Parallel()
 
@@ -322,7 +316,6 @@ func TestEnsurePrefixList(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.givePrefix, func(t *testing.T) {
 			t.Parallel()
 
@@ -364,7 +357,6 @@ func TestTrimPrefixList(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.givePrefix, func(t *testing.T) {
 			t.Parallel()
 
@@ -422,7 +414,6 @@ func TestEnsurePrefixMap(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.givePrefix, func(t *testing.T) {
 			t.Parallel()
 
@@ -480,7 +471,6 @@ func TestTrimPrefixMap(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.givePrefix, func(t *testing.T) {
 			t.Parallel()
 
@@ -539,7 +529,6 @@ func TestInsertIntoPath(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.want, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/api/mounts_test.go b/api/mounts_test.go
@@ -57,7 +57,6 @@ func TestMountInfo(t *testing.T) {
 	})
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.give, func(t *testing.T) {
 			t.Parallel()
 
@@ -103,7 +102,6 @@ func TestMountStringToVersion(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.give, func(t *testing.T) {
 			t.Parallel()
 
@@ -207,7 +205,6 @@ func TestRewritePath(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.give, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/api/path_copy_test.go b/api/path_copy_test.go
@@ -40,11 +40,9 @@ func TestPathCopy(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(testName(tt.giveSrc, tt.giveDst), func(t *testing.T) {
 			t.Parallel()
 			for _, prefixPair := range seededPrefixProduct(t) {
-				prefixPair := prefixPair
 				t.Run(testName(prefixPair[0], prefixPair[1]), func(t *testing.T) {
 					t.Parallel()
 

diff --git a/api/path_delete_meta_test.go b/api/path_delete_meta_test.go
@@ -31,11 +31,9 @@ func TestPathDeleteMeta(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(testName(tt.give), func(t *testing.T) {
 			t.Parallel()
 			for _, prefix := range seededPrefixes(t, tt.give) {
-				prefix := prefix
 				if strings.HasPrefix(prefix, "kv1") {
 					t.Run(testName(prefix), func(t *testing.T) {
 						t.Parallel()

diff --git a/api/path_delete_test.go b/api/path_delete_test.go
@@ -35,11 +35,9 @@ func TestPathDelete(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(testName(tt.give), func(t *testing.T) {
 			t.Parallel()
 			for _, prefix := range seededPrefixes(t, tt.give) {
-				prefix := prefix
 				t.Run(testName(prefix), func(t *testing.T) {
 					t.Parallel()
 

diff --git a/api/path_destroy_test.go b/api/path_destroy_test.go
@@ -49,11 +49,9 @@ func TestPathDestroy(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(testName(tt.give), func(t *testing.T) {
 			t.Parallel()
 			for _, prefix := range seededPrefixes(t, tt.give) {
-				prefix := prefix
 				if strings.HasPrefix(prefix, "kv1") {
 					t.Run(testName(prefix), func(t *testing.T) {
 						t.Parallel()

diff --git a/api/path_list_test.go b/api/path_list_test.go
@@ -62,11 +62,9 @@ func TestPathList(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(testName(tt.give), func(t *testing.T) {
 			t.Parallel()
 			for _, prefix := range seededPrefixes(t, tt.give) {
-				prefix := prefix
 				t.Run(testName(prefix), func(t *testing.T) {
 					t.Parallel()
 
@@ -97,11 +95,9 @@ func TestPathListIgnoreErrors(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(testName(tt.give), func(t *testing.T) {
 			t.Parallel()
 			for _, prefix := range seededPrefixes(t, tt.give) {
-				prefix := prefix
 				t.Run(testName(prefix), func(t *testing.T) {
 					t.Parallel()
 

diff --git a/api/path_move_test.go b/api/path_move_test.go
@@ -43,11 +43,9 @@ func TestPathMove(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(testName(tt.giveSrc, tt.giveDst), func(t *testing.T) {
 			t.Parallel()
 			for _, prefixPair := range seededPrefixProduct(t) {
-				prefixPair := prefixPair
 				t.Run(testName(prefixPair[0], prefixPair[1]), func(t *testing.T) {
 					t.Parallel()