fixed for loops alias

aliasing in for loops no longer needed as per https://go.dev/blog/loopvar-preview Signed-off-by: Mattia Lavacca <lavacca.mattia@gmail.com>
kubernetes-sigs · Sep 5, 2024 · 7112d14 · 7112d14
1 parent 56da781
commit 7112d14
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 19 deletions.
diff --git a/apis/v1/util/validation/gatewayclass_test.go b/apis/v1/util/validation/gatewayclass_test.go
@@ -57,7 +57,6 @@ func TestIsControllerNameValid(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			isValid := validationtutils.IsControllerNameValid(tc.controllerName)
 			if isValid != tc.isvalid {

diff --git a/apis/v1beta1/util/validation/gatewayclass_test.go b/apis/v1beta1/util/validation/gatewayclass_test.go
@@ -57,7 +57,6 @@ func TestIsControllerNameValid(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			isValid := validationtutils.IsControllerNameValid(tc.controllerName)
 			if isValid != tc.isvalid {

diff --git a/conformance/tests/gateway-invalid-tls-configuration.go b/conformance/tests/gateway-invalid-tls-configuration.go
@@ -77,7 +77,6 @@ var GatewayInvalidTLSConfiguration = suite.ConformanceTest{
 		}
 
 		for _, tc := range testCases {
-			tc := tc
 			t.Run(tc.name, func(t *testing.T) {
 				t.Parallel()
 				kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, tc.gatewayNamespacedName, listeners)

diff --git a/conformance/utils/kubernetes/apply.go b/conformance/utils/kubernetes/apply.go
@@ -216,8 +216,6 @@ func (a Applier) prepareResources(t *testing.T, decoder *yaml.YAMLOrJSONDecoder)
 
 func (a Applier) MustApplyObjectsWithCleanup(t *testing.T, c client.Client, timeoutConfig config.TimeoutConfig, resources []client.Object, cleanup bool) {
 	for _, resource := range resources {
-		resource := resource
-
 		ctx, cancel := context.WithTimeout(context.Background(), timeoutConfig.CreateTimeout)
 		defer cancel()
 

diff --git a/conformance/utils/kubernetes/helpers.go b/conformance/utils/kubernetes/helpers.go
@@ -206,7 +206,6 @@ func NamespacesMustBeReady(t *testing.T, c client.Client, timeoutConfig config.T
 				tlog.Errorf(t, "Error listing Gateways: %v", err)
 			}
 			for _, gw := range gwList.Items {
-				gw := gw
 
 				if val, ok := gw.Annotations[GatewayExcludedFromReadinessChecks]; ok && val == "true" {
 					tlog.Logf(t, "Gateway %s is skipped for setup and wont be tested", client.ObjectKeyFromObject(&gw))
@@ -237,7 +236,6 @@ func NamespacesMustBeReady(t *testing.T, c client.Client, timeoutConfig config.T
 				tlog.Errorf(t, "Error listing Pods: %v", err)
 			}
 			for _, pod := range podList.Items {
-				pod := pod
 				if !findPodConditionInList(t, pod.Status.Conditions, "Ready", "True") &&
 					pod.Status.Phase != v1.PodSucceeded &&
 					pod.DeletionTimestamp == nil {
@@ -309,7 +307,6 @@ func MeshNamespacesMustBeReady(t *testing.T, c client.Client, timeoutConfig conf
 				tlog.Errorf(t, "Error listing Pods: %v", err)
 			}
 			for _, pod := range podList.Items {
-				pod := pod
 				if !findPodConditionInList(t, pod.Status.Conditions, "Ready", "True") &&
 					pod.Status.Phase != v1.PodSucceeded &&
 					pod.DeletionTimestamp == nil {

diff --git a/conformance/utils/kubernetes/helpers_test.go b/conformance/utils/kubernetes/helpers_test.go
@@ -313,7 +313,6 @@ func Test_listenersMatch(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
 		t.Run(test.name, func(t *testing.T) {
 			assert.Equal(t, test.want, listenersMatch(t, test.expected, test.actual))
 		})

diff --git a/conformance/utils/suite/reports_test.go b/conformance/utils/suite/reports_test.go
@@ -114,7 +114,6 @@ func TestBuildSummary(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			tc := tc
 			summary := buildSummary(tc.report)
 			require.Equal(t, tc.expectedSummary, summary)
 		})

diff --git a/conformance/utils/suite/suite_test.go b/conformance/utils/suite/suite_test.go
@@ -168,7 +168,6 @@ func TestGetAPIVersionAndChannel(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			version, channel, err := getAPIVersionAndChannel(tc.crds)
 			assert.Equal(t, tc.expectedVersion, version)

diff --git a/gwctl/pkg/printer/gatewayclasses_test.go b/gwctl/pkg/printer/gatewayclasses_test.go
@@ -316,7 +316,6 @@ Events: <none>
 	}
 
 	for _, tc := range testcases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			k8sClients := common.MustClientsForTest(t, tc.objects...)
 			policyManager := utils.MustPolicyManagerForTest(t, k8sClients)

diff --git a/gwctl/pkg/resourcediscovery/resourcemodel.go b/gwctl/pkg/resourcediscovery/resourcemodel.go
@@ -55,7 +55,6 @@ func (rm *ResourceModel) addGatewayClasses(gatewayClasses ...gatewayv1.GatewayCl
 		rm.GatewayClasses = make(map[gatewayClassID]*GatewayClassNode)
 	}
 	for _, gatewayClass := range gatewayClasses {
-		gatewayClass := gatewayClass
 		gatewayClassNode := NewGatewayClassNode(&gatewayClass)
 		if _, ok := rm.GatewayClasses[gatewayClassNode.ID()]; !ok {
 			rm.GatewayClasses[gatewayClassNode.ID()] = gatewayClassNode
@@ -82,7 +81,6 @@ func (rm *ResourceModel) addGateways(gateways ...gatewayv1.Gateway) {
 		rm.Gateways = make(map[gatewayID]*GatewayNode)
 	}
 	for _, gateway := range gateways {
-		gateway := gateway
 		gatewayNode := NewGatewayNode(&gateway)
 		if _, ok := rm.Gateways[gatewayNode.ID()]; !ok {
 			rm.Gateways[gatewayNode.ID()] = gatewayNode
@@ -96,7 +94,6 @@ func (rm *ResourceModel) addHTTPRoutes(httpRoutes ...gatewayv1.HTTPRoute) {
 		rm.HTTPRoutes = make(map[httpRouteID]*HTTPRouteNode)
 	}
 	for _, httpRoute := range httpRoutes {
-		httpRoute := httpRoute
 		httpRouteNode := NewHTTPRouteNode(&httpRoute)
 		if _, ok := rm.HTTPRoutes[httpRouteNode.ID()]; !ok {
 			rm.HTTPRoutes[httpRouteNode.ID()] = httpRouteNode
@@ -110,7 +107,6 @@ func (rm *ResourceModel) addBackends(backends ...unstructured.Unstructured) {
 		rm.Backends = make(map[backendID]*BackendNode)
 	}
 	for _, backend := range backends {
-		backend := backend
 		backendNode := NewBackendNode(&backend)
 		if _, ok := rm.Backends[backendNode.ID()]; !ok {
 			rm.Backends[backendNode.ID()] = backendNode
@@ -124,7 +120,6 @@ func (rm *ResourceModel) addReferenceGrants(referenceGrants ...gatewayv1beta1.Re
 		rm.ReferenceGrants = make(map[referenceGrantID]*ReferenceGrantNode)
 	}
 	for _, referenceGrant := range referenceGrants {
-		referenceGrant := referenceGrant
 		referenceGrantNode := NewReferenceGrantNode(&referenceGrant)
 		if _, ok := rm.ReferenceGrants[referenceGrantNode.ID()]; !ok {
 			rm.ReferenceGrants[referenceGrantNode.ID()] = referenceGrantNode
@@ -140,7 +135,6 @@ func (rm *ResourceModel) addPolicyIfTargetExists(policies ...policymanager.Polic
 		rm.Policies = make(map[policyID]*PolicyNode)
 	}
 	for _, policy := range policies {
-		policy := policy
 		policyNode := NewPolicyNode(&policy)
 
 		switch {

diff --git a/pkg/test/cel/grpcroute_test.go b/pkg/test/cel/grpcroute_test.go
@@ -389,7 +389,6 @@ func TestGRPCMethodMatch(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			route := gatewayv1.GRPCRoute{
 				ObjectMeta: metav1.ObjectMeta{