golangci-lint: Add copyloopvar + autofix + manual fixes

Author: mstoykov

.golangci.yml

@@ -10,6 +10,7 @@ linters:
     - bodyclose
     - canonicalheader
     - contextcheck
+    - copyloopvar
     - cyclop
     - dogsled
     - dupl

api/v1/group_routes_test.go

@@ -155,7 +155,6 @@ func TestGetGroups(t *testing.T) {
 		})
 	})
 	for _, gp := range []*lib.Group{g0, g1, g2} {
-		gp := gp
 		t.Run(gp.Name, func(t *testing.T) {
 			t.Parallel()
 			rw := httptest.NewRecorder()

api/v1/metric_test.go

@@ -25,7 +25,6 @@ func TestNullMetricTypeJSON(t *testing.T) {
 		t.Parallel()
 
 		for mt, val := range values {
-			mt, val := mt, val
 			t.Run(val, func(t *testing.T) {
 				t.Parallel()
 
@@ -39,7 +38,6 @@ func TestNullMetricTypeJSON(t *testing.T) {
 		t.Parallel()
 
 		for mt, val := range values {
-			mt, val := mt, val
 			t.Run(val, func(t *testing.T) {
 				t.Parallel()
 
@@ -63,7 +61,6 @@ func TestNullValueTypeJSON(t *testing.T) {
 		t.Parallel()
 
 		for mt, val := range values {
-			mt, val := mt, val
 			t.Run(val, func(t *testing.T) {
 				t.Parallel()
 
@@ -77,7 +74,6 @@ func TestNullValueTypeJSON(t *testing.T) {
 		t.Parallel()
 
 		for mt, val := range values {
-			mt, val := mt, val
 			t.Run(val, func(t *testing.T) {
 				t.Parallel()
 

api/v1/setup_teardown_routes_test.go

@@ -206,7 +206,6 @@ func TestSetupData(t *testing.T) {
 	}
 
 	for id := range testCases {
-		id := id
 		t.Run(fmt.Sprintf("testcase_%d", id), func(t *testing.T) {
 			t.Parallel()
 			runTestCase(t, id)

api/v1/status_routes_test.go

@@ -105,7 +105,6 @@ func TestPatchStatus(t *testing.T) {
 	}
 
 	for name, testCase := range testData {
-		name, testCase := name, testCase
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

cloudapi/logs_test.go

@@ -150,7 +150,6 @@ func TestRetry(t *testing.T) {
 		}
 
 		for _, tt := range tests {
-			tt := tt
 			t.Run(tt.name, func(t *testing.T) {
 				t.Parallel()
 				var sleepRequests []time.Duration

internal/api/server_test.go

@@ -23,11 +23,9 @@ func testHTTPHandler(rw http.ResponseWriter, _ *http.Request) {
 func TestLogger(t *testing.T) {
 	t.Parallel()
 	for _, method := range []string{"GET", "POST", "PUT", "PATCH"} {
-		method := method
 		t.Run("method="+method, func(t *testing.T) {
 			t.Parallel()
 			for _, path := range []string{"/", "/test", "/test/path"} {
-				path := path
 				t.Run("path="+path, func(t *testing.T) {
 					t.Parallel()
 					rw := httptest.NewRecorder()

internal/cmd/archive_test.go

@@ -69,7 +69,6 @@ func TestArchiveThresholds(t *testing.T) {
 	}
 
 	for _, testCase := range testCases {
-		testCase := testCase
 		t.Run(testCase.name, func(t *testing.T) {
 			t.Parallel()
 

internal/cmd/config_consolidation_test.go

@@ -580,13 +580,11 @@ func TestConfigConsolidation(t *testing.T) {
 	t.Parallel()
 
 	for tcNum, testCase := range getConfigConsolidationTestCases() {
-		tcNum, testCase := tcNum, testCase
 		subCommands := testCase.options.cmds
 		if subCommands == nil { // handle the most common case
 			subCommands = []string{"run", "archive", "cloud"}
 		}
 		for fsNum, subCmd := range subCommands {
-			fsNum, subCmd := fsNum, subCmd
 			t.Run(
 				fmt.Sprintf("TestCase#%d_FlagSet#%d", tcNum, fsNum),
 				func(t *testing.T) {

internal/cmd/config_test.go

@@ -60,11 +60,9 @@ func TestConfigCmd(t *testing.T) {
 	}
 
 	for _, data := range testdata {
-		data := data
 		t.Run(data.Name, func(t *testing.T) {
 			t.Parallel()
 			for _, test := range data.Tests {
-				test := test
 				t.Run(`"`+test.Name+`"`, func(t *testing.T) {
 					t.Parallel()
 					fs := configFlagSet()
@@ -104,11 +102,9 @@ func TestConfigEnv(t *testing.T) {
 		},
 	}
 	for field, data := range testdata {
-		field, data := field, data
 		t.Run(field.Name, func(t *testing.T) {
 			t.Parallel()
 			for value, fn := range data {
-				value, fn := value, fn
 				t.Run(`"`+value+`"`, func(t *testing.T) {
 					t.Parallel()
 					var config Config
@@ -193,7 +189,6 @@ func TestDeriveAndValidateConfig(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 			_, err := deriveAndValidateConfig(tc.conf,
@@ -499,7 +494,6 @@ func TestLoadConfig(t *testing.T) {
 		},
 	}
 	for _, tc := range testcases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 			l, hook := testutils.NewLoggerWithHook(t)