chore: Add copyloopvar to linters and autofix all the files

This removes pre 1.22 copying of values in a lot of tests with table tests.
grafana · Mar 6, 2025 · 74968a6 · 74968a6
1 parent f92772d
commit 74968a6
Show file tree

Hide file tree

Showing 108 changed files with 12 additions and 318 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -78,6 +78,7 @@ linters:
     - canonicalheader
     - contextcheck
     - cyclop
+    - copyloopvar
     - dogsled
     - dupl
     - durationcheck

diff --git a/api/v1/group_routes_test.go b/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()

diff --git a/api/v1/setup_teardown_routes_test.go b/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)

diff --git a/cloudapi/logs_test.go b/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

diff --git a/internal/api/server_test.go b/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()

diff --git a/internal/cmd/archive_test.go b/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()
 

diff --git a/internal/cmd/config_test.go b/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()
@@ -193,7 +191,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 +496,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)

diff --git a/internal/cmd/new_test.go b/internal/cmd/new_test.go
@@ -38,7 +38,6 @@ func TestNewScriptCmd(t *testing.T) {
 	}
 
 	for _, testCase := range testCases {
-		testCase := testCase
 		t.Run(testCase.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/cmd/options_test.go b/internal/cmd/options_test.go
@@ -53,7 +53,6 @@ func TestParseTagKeyValue(t *testing.T) {
 	}
 
 	for _, data := range testData {
-		data := data
 		t.Run(data.input, func(t *testing.T) {
 			t.Parallel()
 			name, value, err := parseTagNameValue(data.input)

diff --git a/internal/cmd/root_test.go b/internal/cmd/root_test.go
@@ -73,8 +73,6 @@ func TestRootCommandHelpDisplayCommands(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
-
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/cmd/run.go b/internal/cmd/run.go
@@ -329,7 +329,6 @@ func (c *cmdRun) run(cmd *cobra.Command, args []string) (err error) {
 		var wg sync.WaitGroup
 		wg.Add(len(ww))
 		for _, w := range ww {
-			w := w
 			go func() {
 				w()
 				wg.Done()

diff --git a/internal/cmd/run_test.go b/internal/cmd/run_test.go
@@ -225,7 +225,7 @@ func TestRunScriptErrorsAndAbort(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
+
 		name := tc.testFilename
 		if tc.name != "" {
 			name = fmt.Sprintf("%s (%s)", tc.testFilename, tc.name)
@@ -293,8 +293,6 @@ func TestInvalidOptionsThresholdErrExitCode(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
-
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -343,8 +341,6 @@ func TestThresholdsRuntimeBehavior(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
-
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/cmd/runtime_options_test.go b/internal/cmd/runtime_options_test.go
@@ -411,7 +411,6 @@ func TestRuntimeOptions(t *testing.T) {
 		},
 	}
 	for name, tc := range runtimeOptionsTestCases {
-		tc := tc
 		t.Run(fmt.Sprintf("RuntimeOptions test '%s'", name), func(t *testing.T) {
 			t.Parallel()
 			testRuntimeOptionsCase(t, tc)

diff --git a/internal/cmd/tests/cmd_cloud_run_test.go b/internal/cmd/tests/cmd_cloud_run_test.go
@@ -54,8 +54,6 @@ func TestCloudRunCommandIncompatibleFlags(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
-
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/cmd/tests/cmd_run_grpc_test.go b/internal/cmd/tests/cmd_run_grpc_test.go
@@ -94,9 +94,6 @@ func TestGRPCInputOutput(t *testing.T) {
 	require.NoError(t, err)
 
 	for name, test := range tc {
-		name := name
-		test := test
-
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/cmd/tests/cmd_run_test.go b/internal/cmd/tests/cmd_run_test.go
@@ -1884,8 +1884,6 @@ func TestUIRenderOutput(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		tc := tc
-
 		t.Run(tc.expRender, func(t *testing.T) {
 			t.Parallel()
 
@@ -1919,8 +1917,6 @@ func TestUIRenderWebDashboard(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		tc := tc
-
 		t.Run(tc.expRender, func(t *testing.T) {
 			t.Parallel()
 
@@ -1963,8 +1959,6 @@ func TestRunStaticArchives(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		tc := tc
-
 		t.Run("Using "+tc.archive, func(t *testing.T) {
 			t.Parallel()
 
@@ -1997,8 +1991,6 @@ func TestBadLogOutput(t *testing.T) {
 	}
 
 	for name, tc := range cases {
-		name := name
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			ts := NewGlobalTestState(t)
@@ -2141,7 +2133,6 @@ func TestEventSystemError(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 			ts := NewGlobalTestState(t)
@@ -2287,7 +2278,6 @@ func TestBrowserPermissions(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			script := fmt.Sprintf(`

diff --git a/internal/cmd/ui_test.go b/internal/cmd/ui_test.go
@@ -65,7 +65,6 @@ left 2   [   0% ] right 2  000
 	}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 			pbs := createTestProgressBars(3, tc.padding, 1)

diff --git a/internal/event/system_test.go b/internal/event/system_test.go
@@ -88,7 +88,7 @@ func TestEventSystem(t *testing.T) {
 			data       int
 		)
 		for _, et := range emitEvents {
-			et := et
+
 			evt := &Event{Type: et, Data: data, Done: func() {
 				doneMx.Lock()
 				processed[et]++

diff --git a/internal/execution/scheduler_ext_exec_test.go b/internal/execution/scheduler_ext_exec_test.go
@@ -392,7 +392,6 @@ func TestExecutionInfoAll(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/execution/scheduler_ext_test.go b/internal/execution/scheduler_ext_test.go
@@ -132,7 +132,6 @@ func TestSchedulerRunNonDefault(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 			piState := getTestPreInitState(t)
@@ -247,7 +246,6 @@ func TestSchedulerRunEnv(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 			piState := getTestPreInitState(t)
@@ -462,7 +460,6 @@ func TestSchedulerRunCustomTags(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 			piState := getTestPreInitState(t)
@@ -843,7 +840,6 @@ func TestSchedulerStages(t *testing.T) {
 	}
 
 	for name, data := range testdata {
-		data := data
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			runner := &minirunner.MiniRunner{
@@ -1099,7 +1095,6 @@ func TestDNSResolverCache(t *testing.T) {
 	}
 
 	for name, tc := range testCases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			logger := logrus.New()

diff --git a/internal/js/bundle_test.go b/internal/js/bundle_test.go
@@ -195,7 +195,6 @@ func TestNewBundle(t *testing.T) {
 			}
 
 			for _, tc := range testCases {
-				tc := tc
 				t.Run(tc.name, func(t *testing.T) {
 					t.Parallel()
 					rtOpts := lib.RuntimeOptions{CompatibilityMode: null.StringFrom(tc.compatMode)}
@@ -710,7 +709,6 @@ func TestOpen(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			for _, tCase := range testCases {
-				tCase := tCase
 
 				testFunc := func(t *testing.T) {
 					t.Parallel()
@@ -742,7 +740,6 @@ func TestOpen(t *testing.T) {
 					require.NoError(t, err)
 
 					for source, b := range map[string]*Bundle{"source": sourceBundle, "archive": arcBundle} {
-						b := b
 						t.Run(source, func(t *testing.T) {
 							bi, err := b.Instantiate(context.Background(), 0)
 							require.NoError(t, err)
@@ -841,7 +838,6 @@ func TestBundleEnv(t *testing.T) {
 
 	bundles := map[string]*Bundle{"Source": b1, "Archive": b2}
 	for name, b := range bundles {
-		b := b
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			require.Equal(t, "1", b.preInitState.RuntimeOptions.Env["TEST_A"])
@@ -879,7 +875,6 @@ func TestBundleNotSharable(t *testing.T) {
 	bundles := map[string]*Bundle{"Source": b1, "Archive": b2}
 	var vus, iters uint64 = 10, 1000
 	for name, b := range bundles {
-		b := b
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			for i := uint64(0); i < vus; i++ {
@@ -921,7 +916,6 @@ func TestBundleMakeArchive(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.cm.String(), func(t *testing.T) {
 			t.Parallel()
 			fs := fsext.NewMemMapFs()
@@ -982,7 +976,6 @@ func TestGlobalTimers(t *testing.T) {
 
 	bundles := map[string]*Bundle{"Source": b1, "Archive": b2}
 	for name, b := range bundles {
-		b := b
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			_, err := b.Instantiate(context.Background(), 1)

diff --git a/internal/js/console_test.go b/internal/js/console_test.go
@@ -192,8 +192,6 @@ func TestConsoleLogObjectsWithGoTypes(t *testing.T) {
 
 	expFields := logrus.Fields{"source": "console"}
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -242,7 +240,6 @@ func TestConsoleLog(t *testing.T) {
 	}
 
 	for i, tt := range tests {
-		tt := tt
 		t.Run(fmt.Sprintf("case%d", i), func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/js/initcontext_test.go b/internal/js/initcontext_test.go
@@ -243,7 +243,6 @@ func TestInitContextOpen(t *testing.T) {
 		// {[]byte{00, 36, 32, 127}, "utf-16", 2},   // $€
 	}
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.file, func(t *testing.T) {
 			t.Parallel()
 			bi, err := createAndReadFile(t, tc.file, tc.content, tc.length, "")
@@ -266,7 +265,6 @@ func TestInitContextOpen(t *testing.T) {
 	}
 
 	for name, loadPath := range testdata {
-		loadPath := loadPath
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			_, err := createAndReadFile(t, loadPath, []byte("content"), 7, "")