linter fixes

Author: chrischdi

controllers/vspherecluster_reconciler.go

@@ -567,10 +567,7 @@ func (r *clusterReconciler) controlPlaneMachineToCluster(ctx context.Context, o
 	}
 
 	return []ctrl.Request{{
-		NamespacedName: types.NamespacedName{
-			Namespace: vsphereClusterKey.Namespace,
-			Name:      vsphereClusterKey.Name,
-		},
+		NamespacedName: types.NamespacedName(vsphereClusterKey),
 	}}
 }
 

controllers/vspherecluster_reconciler_test.go

@@ -119,7 +119,7 @@ var _ = Describe("VIM based VSphere ClusterReconciler", func() {
 			// Make sure the VSphereCluster exists.
 			Eventually(func() error {
 				return testEnv.Get(ctx, key, instance)
-			}, timeout).Should(BeNil())
+			}, timeout).Should(Succeed())
 
 			By("setting the OwnerRef on the VSphereCluster")
 			Eventually(func() error {
@@ -132,7 +132,7 @@ var _ = Describe("VIM based VSphere ClusterReconciler", func() {
 					UID:        "blah",
 				})
 				return ph.Patch(ctx, instance, patch.WithStatusObservedGeneration{})
-			}, timeout).Should(BeNil())
+			}, timeout).Should(Succeed())
 
 			Eventually(func() bool {
 				if err := testEnv.Get(ctx, key, instance); err != nil {
@@ -432,7 +432,7 @@ var _ = Describe("VIM based VSphere ClusterReconciler", func() {
 				Expect(err).ShouldNot(HaveOccurred())
 				zoneOne.Status.Ready = ptr.To(true)
 				return ph.Patch(ctx, zoneOne, patch.WithStatusObservedGeneration{})
-			}, timeout).Should(BeNil())
+			}, timeout).Should(Succeed())
 
 			Eventually(func() bool {
 				if err := testEnv.Get(ctx, key, instance); err != nil {
@@ -451,7 +451,7 @@ var _ = Describe("VIM based VSphere ClusterReconciler", func() {
 					Expect(err).ShouldNot(HaveOccurred())
 					zoneOne.Status.Ready = ptr.To(true)
 					return ph.Patch(ctx, zoneOne, patch.WithStatusObservedGeneration{})
-				}, timeout).Should(BeNil())
+				}, timeout).Should(Succeed())
 			})
 
 			It("should remove the FailureDomainsAvailable condition from the cluster", func() {

controllers/vspheremachine_controller_test.go

@@ -166,7 +166,7 @@ var _ = Describe("VsphereMachineReconciler", func() {
 			Expect(err).ShouldNot(HaveOccurred())
 			capiCluster.Status.InfrastructureReady = true
 			return ph.Patch(ctx, capiCluster, patch.WithStatusObservedGeneration{})
-		}, timeout).Should(BeNil())
+		}, timeout).Should(Succeed())
 
 		Eventually(func() bool {
 			return isPresentAndFalseWithReason(infraMachine, infrav1.VMProvisionedCondition, infrav1.WaitingForClusterInfrastructureReason)
@@ -199,7 +199,7 @@ var _ = Describe("VsphereMachineReconciler", func() {
 					DataSecretName: ptr.To("some-secret"),
 				}
 				return ph.Patch(ctx, capiMachine, patch.WithStatusObservedGeneration{})
-			}, timeout).Should(BeNil())
+			}, timeout).Should(Succeed())
 
 			Eventually(func() int {
 				vms := infrav1.VSphereVMList{}

pkg/services/govmomi/ipam/status_test.go

@@ -218,7 +218,7 @@ func Test_buildIPAMDeviceConfigs(t *testing.T) {
 		// The IPAddressClaimed condition should not be added
 		config, err := buildIPAMDeviceConfigs(ctx, vmCtx, networkStatus)
 		g.Expect(err).NotTo(gomega.HaveOccurred())
-		g.Expect(config[0].IPAMAddresses).To(gomega.HaveLen(0))
+		g.Expect(config[0].IPAMAddresses).To(gomega.BeEmpty())
 	})
 }
 
@@ -435,7 +435,7 @@ func Test_BuildState(t *testing.T) {
 
 		state, err := BuildState(ctx, vmCtx, networkStatus)
 		g.Expect(err).NotTo(gomega.HaveOccurred())
-		g.Expect(state).To(gomega.HaveLen(0))
+		g.Expect(state).To(gomega.BeEmpty())
 	})
 
 	t.Run("when one device has no pool and is DHCP true, and one device has a IPAddressPool", func(_ *testing.T) {

test/e2e/multivc_test.go

@@ -138,11 +138,11 @@ func VerifyMultiVC(ctx context.Context, input MultiVCenterSpecInput) {
 	Consistently(func() error {
 		kubeSystem := &corev1.Namespace{}
 		return input.Global.BootstrapClusterProxy.GetClient().Get(ctx, client.ObjectKey{Name: "kube-system"}, kubeSystem)
-	}, "5s", "100ms").Should(BeNil(), "Failed to assert bootstrap API server stability")
+	}, "5s", "100ms").Should(Succeed(), "Failed to assert bootstrap API server stability")
 	Consistently(func() error {
 		kubeSystem := &corev1.Namespace{}
 		return mgmtClusterProxy.GetClient().Get(ctx, client.ObjectKey{Name: "kube-system"}, kubeSystem)
-	}, "5s", "100ms").Should(BeNil(), "Failed to assert self-hosted API server stability")
+	}, "5s", "100ms").Should(Succeed(), "Failed to assert self-hosted API server stability")
 
 	// Get the machines of the workloadCluster before it is moved to become self-hosted to make sure that the move did not trigger
 	// any unexpected rollouts.

test/e2e/scale_test.go

@@ -123,15 +123,15 @@ var _ = Describe("When testing the machinery for scale testing using vcsim provi
 						addVCSimTestVariables(clusterProxy, fmt.Sprintf("scale-%s", clusterName), testSpecificIPAddressClaims, testSpecificVariables, false)
 					}
 
-					clusterTemplateYAML = bytes.Replace(clusterTemplateYAML, []byte(scaleClusterControlPlaneEndpointIPPlaceholder), []byte(testSpecificVariables["CONTROL_PLANE_ENDPOINT_IP"]), -1)
-					clusterTemplateYAML = bytes.Replace(clusterTemplateYAML, []byte(scaleClusterControlPlaneEndpointPortPlaceholder), []byte(testSpecificVariables["CONTROL_PLANE_ENDPOINT_PORT"]), -1)
-					clusterTemplateYAML = bytes.Replace(clusterTemplateYAML, []byte(scaleClusterVSphereServerPlaceholder), []byte(testSpecificVariables["VSPHERE_SERVER"]), -1)
-					clusterTemplateYAML = bytes.Replace(clusterTemplateYAML, []byte(scaleClusterVSphereTLSThumbprintPlaceholder), []byte(testSpecificVariables["VSPHERE_TLS_THUMBPRINT"]), -1)
+					clusterTemplateYAML = bytes.ReplaceAll(clusterTemplateYAML, []byte(scaleClusterControlPlaneEndpointIPPlaceholder), []byte(testSpecificVariables["CONTROL_PLANE_ENDPOINT_IP"]))
+					clusterTemplateYAML = bytes.ReplaceAll(clusterTemplateYAML, []byte(scaleClusterControlPlaneEndpointPortPlaceholder), []byte(testSpecificVariables["CONTROL_PLANE_ENDPOINT_PORT"]))
+					clusterTemplateYAML = bytes.ReplaceAll(clusterTemplateYAML, []byte(scaleClusterVSphereServerPlaceholder), []byte(testSpecificVariables["VSPHERE_SERVER"]))
+					clusterTemplateYAML = bytes.ReplaceAll(clusterTemplateYAML, []byte(scaleClusterVSphereTLSThumbprintPlaceholder), []byte(testSpecificVariables["VSPHERE_TLS_THUMBPRINT"]))
 
 					if testMode == GovmomiTestMode {
-						clusterClassYAML = bytes.Replace(clusterClassYAML, []byte(scaleClusterNamePlaceholder), []byte(clusterName), -1)
-						clusterClassYAML = bytes.Replace(clusterClassYAML, []byte(scaleClusterVSphereServerPlaceholder), []byte(testSpecificVariables["VSPHERE_SERVER"]), -1)
-						clusterClassYAML = bytes.Replace(clusterClassYAML, []byte(scaleClusterVSphereTLSThumbprintPlaceholder), []byte(testSpecificVariables["VSPHERE_TLS_THUMBPRINT"]), -1)
+						clusterClassYAML = bytes.ReplaceAll(clusterClassYAML, []byte(scaleClusterNamePlaceholder), []byte(clusterName))
+						clusterClassYAML = bytes.ReplaceAll(clusterClassYAML, []byte(scaleClusterVSphereServerPlaceholder), []byte(testSpecificVariables["VSPHERE_SERVER"]))
+						clusterClassYAML = bytes.ReplaceAll(clusterClassYAML, []byte(scaleClusterVSphereTLSThumbprintPlaceholder), []byte(testSpecificVariables["VSPHERE_TLS_THUMBPRINT"]))
 					}
 
 					return clusterClassYAML, clusterTemplateYAML

test/framework/ip/vcsim.go

@@ -88,7 +88,7 @@ func (h *vcsim) ClaimIPs(ctx context.Context, opts ...ClaimOption) (AddressClaim
 				// might be we want to shift to a better error management here, but for now this should be enough to point in the right direction
 				panic(fmt.Sprintf("unable to claim vcsim controlPlaneEndpoint for variable name %s. variable name must end with _IP", variables))
 			}
-			variables[strings.Replace(variable, "_IP", "_PORT", -1)] = port
+			variables[strings.ReplaceAll(variable, "_IP", "_PORT")] = port
 		}
 	}