Adjust to golangci-lint 1.56.0

pkg/agent/controller/service_endpoint_slices.go

@@ -99,6 +99,7 @@ func startEndpointSliceController(localClient dynamic.Interface, restMapper meta
 			}))
 
 			retList := make([]runtime.Object, 0, len(list))
+
 			for _, o := range list {
 				eps := o.(*discovery.EndpointSlice)
 				retList = append(retList, &discovery.EndpointSlice{

pkg/agent/controller/service_import.go

@@ -155,8 +155,8 @@ func (c *ServiceImportController) start(stopCh <-chan struct{}) error {
 func (c *ServiceImportController) reconcileRemoteAggregatedServiceImports() {
 	c.localSyncer.Reconcile(func() []runtime.Object {
 		siList := c.remoteSyncer.ListResources()
-
 		retList := make([]runtime.Object, 0, len(siList))
+
 		for i := range siList {
 			si := c.converter.toServiceImport(siList[i])
 
@@ -193,6 +193,7 @@ func (c *ServiceImportController) reconcileLocalAggregatedServiceImports() {
 		}
 
 		retList := make([]runtime.Object, 0, len(siList.Items))
+
 		for i := range siList.Items {
 			si := c.converter.toServiceImport(&siList.Items[i])
 

test/e2e/discovery/headless_services.go

@@ -350,13 +350,16 @@ func verifyHeadlessSRVRecordsWithDig(f *framework.Framework, cluster framework.C
 				return stdout, nil
 			}, func(result interface{}) (bool, string, error) {
 				By(fmt.Sprintf("Validating that dig result %s %q", op, result))
+
 				if len(hostNameList) == 0 && result != "" {
 					return false, fmt.Sprintf("expected execution result %q to be empty", result), nil
 				}
+
 				for _, hostName := range hostNameList {
 					hostDNS := hostName + "." + domainName
 					doesContain := strings.Contains(result.(string), strconv.Itoa(int(port.Port))) &&
 						strings.Contains(result.(string), hostDNS)
+
 					if doesContain && !shouldContain {
 						framework.Logf("expected execution result %q not to contain %q and %d", result, hostDNS, int(port.Port))
 						return false, fmt.Sprintf("expected execution result %q not to contain %q and %d", result, hostDNS, int(port.Port)), nil

test/e2e/discovery/service_discovery.go

@@ -608,13 +608,15 @@ func verifySRVWithDig(f *framework.Framework, srcCluster framework.ClusterIndex,
 
 				By(fmt.Sprintf("Validating that port in dig result for SRV Record %q %s %d and the domain name %s %q", result,
 					op, port.Port, op, clusterDNSName))
+
 				if doesContain && !shouldContain {
 					return false, fmt.Sprintf("expected execution result %q not to contain %d", result, port.Port), nil
 				}
 
 				if !doesContain && shouldContain {
 					return false, fmt.Sprintf("expected execution result %q to contain %q", result, port.Port), nil
 				}
+
 				return true, "", nil
 			})
 		}
@@ -657,6 +659,7 @@ func verifyRoundRobinWithDig(f *framework.Framework, srcCluster framework.Cluste
 				if strings.Contains(result.(string), serviceIP) {
 					serviceIPMap[serviceIP]++
 					retIPs = append(retIPs, serviceIP)
+
 					break
 				}
 			}

test/e2e/discovery/statefulsets.go

@@ -137,6 +137,7 @@ func RunSSDiscoveryLocalTest(f *lhframework.Framework) {
 		for j := range endpointSlice.Endpoints {
 			verifyEndpointsWithDig(f, framework.ClusterA, netshootPodList, &endpointSlice.Endpoints[j], sourceCluster,
 				nginxServiceClusterB, checkedDomains, sourceCluster == clusterAName, sourceCluster == clusterAName)
+
 			verifyCount++
 		}
 	}
@@ -204,6 +205,7 @@ func verifyEndpointSlices(f *lhframework.Framework, targetCluster framework.Clus
 		for j := range endpointSlice.Endpoints {
 			verifyEndpointsWithDig(f, targetCluster, netshootPodList, &endpointSlice.Endpoints[j], sourceCluster,
 				service, checkedDomains, shouldContain, sourceCluster == localClusterName)
+
 			count++
 		}
 	}

test/e2e/framework/framework.go

@@ -354,9 +354,11 @@ func (f *Framework) AwaitEndpointIPs(targetCluster framework.ClusterIndex, name,
 				}
 			}
 		}
+
 		if count != anyCount && len(ipList) != count {
 			return false, fmt.Sprintf("endpoints have %d IPs when expected %d", len(ipList), count), nil
 		}
+
 		return true, "", nil
 	})
 
@@ -580,8 +582,8 @@ func (f *Framework) GetHealthCheckIPInfo(cluster framework.ClusterIndex) (endpoi
 
 				var found bool
 				var err error
-				healthCheckIP, found, err = unstructured.NestedString(endpoint.Object, "spec", "healthCheckIP")
 
+				healthCheckIP, found, err = unstructured.NestedString(endpoint.Object, "spec", "healthCheckIP")
 				if err != nil {
 					return false, "", err
 				}
@@ -591,6 +593,7 @@ func (f *Framework) GetHealthCheckIPInfo(cluster framework.ClusterIndex) (endpoi
 				}
 			}
 		}
+
 		return true, "", nil
 	})
 
@@ -604,20 +607,19 @@ func (f *Framework) GetHealthCheckEnabledInfo(cluster framework.ClusterIndex) (h
 		return unstructuredSubmarinerConfig, err
 	}, func(result interface{}) (bool, string, error) {
 		unstructuredSubmarinerConfig := result.(*unstructured.Unstructured)
+
 		By(fmt.Sprintf("Getting the Submariner Config, for cluster %s", framework.TestContext.ClusterIDs[cluster]))
+
 		var found bool
 		var err error
+
 		healthCheckEnabled, found, err = unstructured.NestedBool(unstructuredSubmarinerConfig.Object,
 			"spec", "connectionHealthCheck", "enabled")
-
 		if err != nil {
 			return false, "", err
 		}
 
-		if !found {
-			return true, "", nil
-		}
-		return true, "", nil
+		return found, "", nil
 	})
 
 	return healthCheckEnabled
@@ -683,6 +685,7 @@ func (f *Framework) VerifyIPWithDig(srcCluster framework.ClusterIndex, service *
 	}, func(result interface{}) (bool, string, error) {
 		doesContain := strings.Contains(result.(string), serviceIP)
 		By(fmt.Sprintf("Validating that dig result %q %s %q", result, op, serviceIP))
+
 		if doesContain && !shouldContain {
 			return false, fmt.Sprintf("expected execution result %q not to contain %q", result, serviceIP), nil
 		}
@@ -731,9 +734,11 @@ func (f *Framework) VerifyIPsWithDig(cluster framework.ClusterIndex, service *v1
 		return stdout, nil
 	}, func(result interface{}) (bool, string, error) {
 		By(fmt.Sprintf("Validating that dig result %s %q", op, result))
+
 		if len(ipList) == 0 && result != "" {
 			return false, fmt.Sprintf("expected execution result %q to be empty", result), nil
 		}
+
 		for _, ip := range ipList {
 			count := strings.Count(result.(string), ip)
 			if count > 0 && !shouldContain {