refactor: Remove unnecessary loop vars (#1146)

jimmidyson · web-flow · commit ca2deb9a9221 · 2025-06-03T18:32:33.000Z
Since go 1.22 capturing loop variables is unnecessary so just tidying up. See https://go.dev/blog/loopvar-preview for more details.
diff --git a/api/v1alpha1/http_proxy_test.go b/api/v1alpha1/http_proxy_test.go
@@ -180,9 +180,7 @@ func TestGenerateNoProxy(t *testing.T) {
 		},
 	}}
 
-	for idx := range testCases {
-		tt := testCases[idx]
-
+	for _, tt := range testCases {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
diff --git a/common/pkg/capi/clustertopology/handlers/mutation/meta_test.go b/common/pkg/capi/clustertopology/handlers/mutation/meta_test.go
@@ -212,9 +212,7 @@ func TestMetaGeneratePatches(t *testing.T) {
 		},
 	}}
 
-	for idx := range tests {
-		tt := tests[idx]
-
+	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
diff --git a/common/pkg/capi/clustertopology/patches/generator_test.go b/common/pkg/capi/clustertopology/patches/generator_test.go
@@ -123,9 +123,7 @@ func TestMutateIfApplicable(t *testing.T) {
 			},
 		},
 	}}
-	for testIdx := range tests {
-		tt := tests[testIdx] // Capture loop var.
-
+	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
diff --git a/common/pkg/capi/clustertopology/patches/matchers/match_test.go b/common/pkg/capi/clustertopology/patches/matchers/match_test.go
@@ -479,9 +479,7 @@ func TestMatchesSelector(t *testing.T) {
 		},
 		match: false,
 	}}
-	for idx := range tests {
-		tt := tests[idx]
-
+	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
diff --git a/common/pkg/k8s/parser/parser_test.go b/common/pkg/k8s/parser/parser_test.go
@@ -139,8 +139,7 @@ metadata:
 func runUnstructuredTests(t *testing.T, fn func([]string) ([]client.Object, error)) {
 	t.Helper()
 	t.Parallel()
-	for idx := range tests {
-		tt := tests[idx]
+	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			got, err := fn(tt.inputs)
diff --git a/common/pkg/server/server.go b/common/pkg/server/server.go
@@ -79,9 +79,7 @@ func (s *Server) Start(ctx context.Context) error {
 		return err
 	}
 
-	for idx := range s.hooks {
-		h := s.hooks[idx]
-
+	for _, h := range s.hooks {
 		if t, ok := h.(lifecycle.BeforeClusterCreate); ok {
 			if err := webhookServer.AddExtensionHandler(runtimeserver.ExtensionHandler{
 				Hook:        runtimehooksv1.BeforeClusterCreate,
diff --git a/common/pkg/testutils/capitest/variables.go b/common/pkg/testutils/capitest/variables.go
@@ -56,9 +56,7 @@ func ValidateDiscoverVariables[T mutation.DiscoverVariables](
 		"Schema":   gomega.Equal(*variableSchema),
 	}))
 
-	for idx := range variableTestDefs {
-		tt := variableTestDefs[idx]
-
+	for _, tt := range variableTestDefs {
 		t.Run(tt.Name, func(t *testing.T) {
 			t.Parallel()
 
diff --git a/pkg/handlers/aws/mutation/ami/inject_control_plane_test.go b/pkg/handlers/aws/mutation/ami/inject_control_plane_test.go
@@ -90,8 +90,7 @@ var _ = Describe("Generate AMI patches for ControlPlane", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(
 				GinkgoT(),
diff --git a/pkg/handlers/aws/mutation/ami/inject_worker_test.go b/pkg/handlers/aws/mutation/ami/inject_worker_test.go
@@ -98,8 +98,7 @@ var _ = Describe("Generate AMI patches for Worker", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(
 				GinkgoT(),
diff --git a/pkg/handlers/aws/mutation/cni/calico/inject_test.go b/pkg/handlers/aws/mutation/cni/calico/inject_test.go
@@ -277,8 +277,7 @@ var _ = Describe("Generate AWS Calico CNI ingress patches", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(
 				GinkgoT(),
diff --git a/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject_test.go b/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject_test.go
@@ -77,8 +77,7 @@ var _ = Describe("Generate AWS ControlPlane LoadBalancer patches", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(
 				GinkgoT(),
diff --git a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane_test.go b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane_test.go
@@ -49,8 +49,7 @@ var _ = Describe("Generate IAMInstanceProfile patches for ControlPlane", func()
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(
 				GinkgoT(),
diff --git a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker_test.go b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker_test.go
@@ -51,8 +51,7 @@ var _ = Describe("Generate IAMInstanceProfile patches for Worker", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(
 				GinkgoT(),
diff --git a/pkg/handlers/aws/mutation/instancetype/inject_control_plane_test.go b/pkg/handlers/aws/mutation/instancetype/inject_control_plane_test.go
@@ -49,8 +49,7 @@ var _ = Describe("Generate InstanceType patches for ControlPlane", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(
 				GinkgoT(),
diff --git a/pkg/handlers/aws/mutation/instancetype/inject_worker_test.go b/pkg/handlers/aws/mutation/instancetype/inject_worker_test.go
@@ -51,8 +51,7 @@ var _ = Describe("Generate InstanceType patches for Worker", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(
 				GinkgoT(),
diff --git a/pkg/handlers/aws/mutation/network/inject_test.go b/pkg/handlers/aws/mutation/network/inject_test.go
@@ -108,8 +108,7 @@ var _ = Describe("Generate AWS Network patches", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(
 				GinkgoT(),
diff --git a/pkg/handlers/aws/mutation/region/inject_test.go b/pkg/handlers/aws/mutation/region/inject_test.go
@@ -52,8 +52,7 @@ var _ = Describe("Generate AWS Region patches", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(
 				GinkgoT(),
diff --git a/pkg/handlers/aws/mutation/securitygroups/inject_control_plane_test.go b/pkg/handlers/aws/mutation/securitygroups/inject_control_plane_test.go
@@ -65,8 +65,7 @@ var _ = Describe("Generate SecurityGroup patches for ControlPlane", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(
 				GinkgoT(),
diff --git a/pkg/handlers/aws/mutation/securitygroups/inject_worker_test.go b/pkg/handlers/aws/mutation/securitygroups/inject_worker_test.go
@@ -67,8 +67,7 @@ var _ = Describe("Generate AWS SecurityGroups patches for Worker", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(
 				GinkgoT(),
diff --git a/pkg/handlers/docker/mutation/customimage/inject_control_plane_test.go b/pkg/handlers/docker/mutation/customimage/inject_control_plane_test.go
@@ -67,8 +67,7 @@ var _ = Describe("Docker CustomImage patches for ControlPlane", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(
 				GinkgoT(),
diff --git a/pkg/handlers/docker/mutation/customimage/inject_worker_test.go b/pkg/handlers/docker/mutation/customimage/inject_worker_test.go
@@ -67,8 +67,7 @@ var _ = Describe("Docker CustomImage patches for workers", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(
 				GinkgoT(),
diff --git a/pkg/handlers/generic/lifecycle/ccm/nutanix/handler_test.go b/pkg/handlers/generic/lifecycle/ccm/nutanix/handler_test.go
@@ -179,8 +179,7 @@ func Test_templateValues(t *testing.T) {
 			expected: expectedWithVirtualIPSet,
 		},
 	}
-	for idx := range tests {
-		tt := tests[idx]
+	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			out, err := templateValuesFunc(tt.clusterConfig.Nutanix)(nil, tt.in)
diff --git a/pkg/handlers/generic/lifecycle/cni/cluster_test.go b/pkg/handlers/generic/lifecycle/cni/cluster_test.go
@@ -65,8 +65,7 @@ func Test_PodCIDR(t *testing.T) {
 			wantErr: ErrMultiplePodsCIDRBlocks,
 		},
 	}
-	for idx := range tests {
-		tt := tests[idx]
+	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			cidr, err := PodCIDR(tt.cluster)
diff --git a/pkg/handlers/generic/lifecycle/servicelbgc/deleter_test.go b/pkg/handlers/generic/lifecycle/servicelbgc/deleter_test.go
@@ -98,8 +98,7 @@ func Test_shouldDeleteServicesWithLoadBalancer(t *testing.T) {
 		},
 		shouldDelete: false,
 	}}
-	for idx := range tests {
-		tt := tests[idx]
+	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			shouldDelete, err := shouldDeleteServicesWithLoadBalancer(tt.cluster)
@@ -195,8 +194,7 @@ func Test_deleteServicesWithLoadBalancer(t *testing.T) {
 		}},
 	}}
 
-	for idx := range tests {
-		tt := tests[idx] // Capture range variable
+	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			fakeClient := fake.NewClientBuilder().Build()
@@ -280,8 +278,7 @@ func Test_needsDelete(t *testing.T) {
 		},
 		shouldDelete: false,
 	}}
-	for idx := range tests {
-		tt := tests[idx]
+	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			del := needsDelete(tt.service)
diff --git a/pkg/handlers/generic/mutation/auditpolicy/inject_test.go b/pkg/handlers/generic/mutation/auditpolicy/inject_test.go
@@ -81,8 +81,7 @@ var _ = Describe("Generate Audit Policy patches", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(GinkgoT(), patchGenerator, &tt)
 		})
diff --git a/pkg/handlers/generic/mutation/autorenewcerts/inject_test.go b/pkg/handlers/generic/mutation/autorenewcerts/inject_test.go
@@ -118,8 +118,7 @@ var _ = Describe("Generate auto renew patches", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.patchTest.Name, func() {
 			capitest.AssertGeneratePatches(GinkgoT(), patchGenerator, &tt.patchTest)
 		})
diff --git a/pkg/handlers/generic/mutation/containerdapplypatchesandrestart/inject_test.go b/pkg/handlers/generic/mutation/containerdapplypatchesandrestart/inject_test.go
@@ -95,8 +95,7 @@ var _ = Describe("Generate Containerd apply patches and restart patches", func()
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(
 				GinkgoT(),
diff --git a/pkg/handlers/generic/mutation/containerdmetrics/inject_test.go b/pkg/handlers/generic/mutation/containerdmetrics/inject_test.go
@@ -71,8 +71,7 @@ var _ = Describe("Generate containerd metrics patches", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(
 				GinkgoT(),
diff --git a/pkg/handlers/generic/mutation/containerdunprivilegedports/inject_test.go b/pkg/handlers/generic/mutation/containerdunprivilegedports/inject_test.go
@@ -71,8 +71,7 @@ var _ = Describe("Generate containerd unprivileged ports patches", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(
 				GinkgoT(),
diff --git a/pkg/handlers/generic/mutation/controlplanevirtualip/inject_test.go b/pkg/handlers/generic/mutation/controlplanevirtualip/inject_test.go
@@ -203,8 +203,7 @@ var _ = Describe("Generate ControlPlane virtual IP patches", func() {
 	}
 
 	// create test node for each case
-	for idx := range testDefs {
-		tt := testDefs[idx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			clientScheme := runtime.NewScheme()
 			utilruntime.Must(clientgoscheme.AddToScheme(clientScheme))
diff --git a/pkg/handlers/generic/mutation/controlplanevirtualip/providers/kubevip_test.go b/pkg/handlers/generic/mutation/controlplanevirtualip/providers/kubevip_test.go
@@ -165,8 +165,7 @@ func Test_GenerateFilesAndCommands(t *testing.T) {
 		},
 	}
 
-	for idx := range tests {
-		tt := tests[idx] // Capture range variable
+	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -218,8 +217,7 @@ func Test_getTemplate(t *testing.T) {
 		},
 	}
 
-	for idx := range tests {
-		tt := tests[idx] // Capture range variable
+	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
diff --git a/pkg/handlers/generic/mutation/coredns/inject_test.go b/pkg/handlers/generic/mutation/coredns/inject_test.go
@@ -340,8 +340,7 @@ var _ = Describe("Generate CoreDNS patches", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.patchTest.Name, func() {
 			clientScheme := runtime.NewScheme()
 			utilruntime.Must(clientgoscheme.AddToScheme(clientScheme))
diff --git a/pkg/handlers/generic/mutation/etcd/inject_test.go b/pkg/handlers/generic/mutation/etcd/inject_test.go
@@ -135,8 +135,7 @@ var _ = Describe("Generate etcd patches", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(GinkgoT(), patchGenerator, &tt)
 		})
diff --git a/pkg/handlers/generic/mutation/externalcloudprovider/inject_test.go b/pkg/handlers/generic/mutation/externalcloudprovider/inject_test.go
@@ -100,8 +100,7 @@ var _ = Describe("Generate external cloud provider patches", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			capitest.AssertGeneratePatches(
 				GinkgoT(),
diff --git a/pkg/handlers/generic/mutation/extraapiservercertsans/inject_test.go b/pkg/handlers/generic/mutation/extraapiservercertsans/inject_test.go
@@ -169,8 +169,7 @@ var _ = Describe("Generate Extra API server certificate patches", func() {
 	}
 
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.patchTest.Name, func() {
 			clientScheme := runtime.NewScheme()
 			utilruntime.Must(clientgoscheme.AddToScheme(clientScheme))
diff --git a/pkg/handlers/generic/mutation/httpproxy/inject_test.go b/pkg/handlers/generic/mutation/httpproxy/inject_test.go
@@ -113,8 +113,7 @@ var _ = Describe("Generate HTTPProxy Patches", func() {
 		},
 	}
 	// create test node for each case
-	for testIdx := range testDefs {
-		tt := testDefs[testIdx]
+	for _, tt := range testDefs {
 		It(tt.Name, func() {
 			clientScheme := runtime.NewScheme()
 			utilruntime.Must(clientgoscheme.AddToScheme(clientScheme))
diff --git a/pkg/handlers/generic/mutation/httpproxy/systemd_proxy_config_test.go b/pkg/handlers/generic/mutation/httpproxy/systemd_proxy_config_test.go
diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_config_files_test.go b/pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_config_files_test.go
diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/credentials_secret_test.go b/pkg/handlers/generic/mutation/imageregistries/credentials/credentials_secret_test.go
diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/inject_test.go b/pkg/handlers/generic/mutation/imageregistries/credentials/inject_test.go
diff --git a/pkg/handlers/generic/mutation/kubernetesimagerepository/inject_test.go b/pkg/handlers/generic/mutation/kubernetesimagerepository/inject_test.go
diff --git a/pkg/handlers/generic/mutation/mirrors/containerd_files_test.go b/pkg/handlers/generic/mutation/mirrors/containerd_files_test.go
diff --git a/pkg/handlers/generic/mutation/mirrors/inject_test.go b/pkg/handlers/generic/mutation/mirrors/inject_test.go
diff --git a/pkg/handlers/generic/mutation/noderegistration/inject_controlplane_test.go b/pkg/handlers/generic/mutation/noderegistration/inject_controlplane_test.go
diff --git a/pkg/handlers/generic/mutation/noderegistration/inject_worker_test.go b/pkg/handlers/generic/mutation/noderegistration/inject_worker_test.go
diff --git a/pkg/handlers/generic/mutation/taints/inject_controlplane_test.go b/pkg/handlers/generic/mutation/taints/inject_controlplane_test.go
diff --git a/pkg/handlers/generic/mutation/taints/inject_worker_test.go b/pkg/handlers/generic/mutation/taints/inject_worker_test.go
diff --git a/pkg/handlers/generic/mutation/users/inject_test.go b/pkg/handlers/generic/mutation/users/inject_test.go
diff --git a/pkg/handlers/nutanix/mutation/controlplaneendpoint/inject_test.go b/pkg/handlers/nutanix/mutation/controlplaneendpoint/inject_test.go
diff --git a/pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane_test.go b/pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane_test.go
diff --git a/pkg/handlers/nutanix/mutation/machinedetails/inject_worker_test.go b/pkg/handlers/nutanix/mutation/machinedetails/inject_worker_test.go
diff --git a/pkg/handlers/nutanix/mutation/prismcentralendpoint/inject_test.go b/pkg/handlers/nutanix/mutation/prismcentralendpoint/inject_test.go

Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,7 @@ var _ = Describe("Generate AMI patches for ControlPlane", func() {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`// create test node for each case`
`93`		`- for testIdx := range testDefs {`
`94`		`- tt := testDefs[testIdx]`
	`93`	`+ for _, tt := range testDefs {`
`95`	`94`	`It(tt.Name, func() {`
`96`	`95`	`capitest.AssertGeneratePatches(`
`97`	`96`	`GinkgoT(),`
Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,7 @@ var _ = Describe("Generate AMI patches for Worker", func() {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`// create test node for each case`
`101`		`- for testIdx := range testDefs {`
`102`		`- tt := testDefs[testIdx]`
	`101`	`+ for _, tt := range testDefs {`
`103`	`102`	`It(tt.Name, func() {`
`104`	`103`	`capitest.AssertGeneratePatches(`
`105`	`104`	`GinkgoT(),`
Original file line number	Diff line number	Diff line change
`@@ -277,8 +277,7 @@ var _ = Describe("Generate AWS Calico CNI ingress patches", func() {`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`// create test node for each case`
`280`		`- for testIdx := range testDefs {`
`281`		`- tt := testDefs[testIdx]`
	`280`	`+ for _, tt := range testDefs {`
`282`	`281`	`It(tt.Name, func() {`
`283`	`282`	`capitest.AssertGeneratePatches(`
`284`	`283`	`GinkgoT(),`