Enable ginkgolinter and fix findings

Signed-off-by: killianmuldoon <kmuldoon@vmware.com>
kubernetes-sigs · Jul 6, 2023 · 4a447a4 · 4a447a4
1 parent dafdcb6
commit 4a447a4
Show file tree

Hide file tree

Showing 150 changed files with 826 additions and 832 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -24,6 +24,7 @@ linters:
   - errchkjson
   - exportloopref
   - gci
+  - ginkgolinter
   - goconst
   - gocritic
   - godot
@@ -58,13 +59,6 @@ linters:
 linters-settings:
   gci:
     local-prefixes: "sigs.k8s.io/cluster-api"
-  ginkgolinter:
-    # Suppress the wrong length assertion warning.
-    suppress-len-assertion: false
-    # Suppress the wrong nil assertion warning.
-    suppress-nil-assertion: false
-    # Suppress the wrong error assertion warning.
-    suppress-err-assertion: true
   godot:
     #   declarations - for top level declaration comments (default);
     #   toplevel     - for top level comments;

diff --git a/api/v1alpha4/cluster_types_test.go b/api/v1alpha4/cluster_types_test.go
@@ -95,7 +95,7 @@ func TestClusterIPFamily(t *testing.T) {
 			g := NewWithT(t)
 			ipFamily, err := tt.c.GetIPFamily()
 			g.Expect(ipFamily).To(Equal(tt.expectRes))
-			g.Expect(err).NotTo(HaveOccurred())
+			g.Expect(err).ToNot(HaveOccurred())
 		})
 	}
 
@@ -129,7 +129,7 @@ func TestClusterIPFamily(t *testing.T) {
 			g := NewWithT(t)
 			ipFamily, err := tt.c.GetIPFamily()
 			g.Expect(ipFamily).To(Equal(tt.expectRes))
-			g.Expect(err).NotTo(HaveOccurred())
+			g.Expect(err).ToNot(HaveOccurred())
 		})
 	}
 

diff --git a/api/v1beta1/cluster_types_test.go b/api/v1beta1/cluster_types_test.go
@@ -95,7 +95,7 @@ func TestClusterIPFamily(t *testing.T) {
 			g := NewWithT(t)
 			ipFamily, err := tt.c.GetIPFamily()
 			g.Expect(ipFamily).To(Equal(tt.expectRes))
-			g.Expect(err).NotTo(HaveOccurred())
+			g.Expect(err).ToNot(HaveOccurred())
 		})
 	}
 
@@ -129,7 +129,7 @@ func TestClusterIPFamily(t *testing.T) {
 			g := NewWithT(t)
 			ipFamily, err := tt.c.GetIPFamily()
 			g.Expect(ipFamily).To(Equal(tt.expectRes))
-			g.Expect(err).NotTo(HaveOccurred())
+			g.Expect(err).ToNot(HaveOccurred())
 		})
 	}
 

diff --git a/api/v1beta1/machine_webhook_test.go b/api/v1beta1/machine_webhook_test.go
@@ -206,7 +206,7 @@ func TestMachineClusterNameImmutable(t *testing.T) {
 				g.Expect(err).To(HaveOccurred())
 				g.Expect(warnings).To(BeEmpty())
 			} else {
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 				g.Expect(warnings).To(BeEmpty())
 			}
 		})

diff --git a/api/v1beta1/machinedeployment_webhook_test.go b/api/v1beta1/machinedeployment_webhook_test.go
@@ -401,10 +401,10 @@ func TestMachineDeploymentValidation(t *testing.T) {
 				g.Expect(warnings).To(BeEmpty())
 			} else {
 				warnings, err := md.ValidateCreate()
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 				g.Expect(warnings).To(BeEmpty())
 				warnings, err = md.ValidateUpdate(md)
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 				g.Expect(warnings).To(BeEmpty())
 			}
 		})
@@ -519,7 +519,7 @@ func TestMachineDeploymentClusterNameImmutable(t *testing.T) {
 			if tt.expectErr {
 				g.Expect(err).To(HaveOccurred())
 			} else {
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 			}
 			g.Expect(warnings).To(BeEmpty())
 		})
@@ -549,22 +549,22 @@ func defaultValidateTestCustomDefaulter(object admission.Validator, customDefaul
 			g := NewWithT(t)
 			g.Expect(customDefaulter.Default(ctx, createCopy)).To(Succeed())
 			warnings, err := createCopy.ValidateCreate()
-			g.Expect(err).NotTo(HaveOccurred())
+			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(warnings).To(BeEmpty())
 		})
 		t.Run("validate-on-update", func(t *testing.T) {
 			g := NewWithT(t)
 			g.Expect(customDefaulter.Default(ctx, defaultingUpdateCopy)).To(Succeed())
 			g.Expect(customDefaulter.Default(ctx, updateCopy)).To(Succeed())
 			warnings, err := defaultingUpdateCopy.ValidateUpdate(updateCopy)
-			g.Expect(err).NotTo(HaveOccurred())
+			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(warnings).To(BeEmpty())
 		})
 		t.Run("validate-on-delete", func(t *testing.T) {
 			g := NewWithT(t)
 			g.Expect(customDefaulter.Default(ctx, deleteCopy)).To(Succeed())
 			warnings, err := deleteCopy.ValidateDelete()
-			g.Expect(err).NotTo(HaveOccurred())
+			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(warnings).To(BeEmpty())
 		})
 	}

diff --git a/api/v1beta1/machinehealthcheck_webhook_test.go b/api/v1beta1/machinehealthcheck_webhook_test.go
@@ -100,10 +100,10 @@ func TestMachineHealthCheckLabelSelectorAsSelectorValidation(t *testing.T) {
 				g.Expect(warnings).To(BeEmpty())
 			} else {
 				warnings, err := mhc.ValidateCreate()
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 				g.Expect(warnings).To(BeEmpty())
 				warnings, err = mhc.ValidateUpdate(mhc)
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 				g.Expect(warnings).To(BeEmpty())
 			}
 		})
@@ -172,7 +172,7 @@ func TestMachineHealthCheckClusterNameImmutable(t *testing.T) {
 			if tt.expectErr {
 				g.Expect(err).To(HaveOccurred())
 			} else {
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 			}
 			g.Expect(warnings).To(BeEmpty())
 		})
@@ -229,10 +229,10 @@ func TestMachineHealthCheckUnhealthyConditions(t *testing.T) {
 				g.Expect(warnings).To(BeEmpty())
 			} else {
 				warnings, err := mhc.ValidateCreate()
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 				g.Expect(warnings).To(BeEmpty())
 				warnings, err = mhc.ValidateUpdate(mhc)
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 				g.Expect(warnings).To(BeEmpty())
 			}
 		})
@@ -312,10 +312,10 @@ func TestMachineHealthCheckNodeStartupTimeout(t *testing.T) {
 			g.Expect(warnings).To(BeEmpty())
 		} else {
 			warnings, err := mhc.ValidateCreate()
-			g.Expect(err).NotTo(HaveOccurred())
+			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(warnings).To(BeEmpty())
 			warnings, err = mhc.ValidateUpdate(mhc)
-			g.Expect(err).NotTo(HaveOccurred())
+			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(warnings).To(BeEmpty())
 		}
 	}
@@ -379,10 +379,10 @@ func TestMachineHealthCheckMaxUnhealthy(t *testing.T) {
 			g.Expect(warnings).To(BeEmpty())
 		} else {
 			warnings, err := mhc.ValidateCreate()
-			g.Expect(err).NotTo(HaveOccurred())
+			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(warnings).To(BeEmpty())
 			warnings, err = mhc.ValidateUpdate(mhc)
-			g.Expect(err).NotTo(HaveOccurred())
+			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(warnings).To(BeEmpty())
 		}
 	}
@@ -401,7 +401,7 @@ func TestMachineHealthCheckSelectorValidation(t *testing.T) {
 		},
 	}
 	err := mhc.validate(nil)
-	g.Expect(err).ToNot(BeNil())
+	g.Expect(err).To(HaveOccurred())
 	g.Expect(err.Error()).To(ContainSubstring("selector must not be empty"))
 }
 

diff --git a/api/v1beta1/machineset_webhook_test.go b/api/v1beta1/machineset_webhook_test.go
@@ -114,10 +114,10 @@ func TestMachineSetLabelSelectorMatchValidation(t *testing.T) {
 				g.Expect(warnings).To(BeEmpty())
 			} else {
 				warnings, err := ms.ValidateCreate()
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 				g.Expect(warnings).To(BeEmpty())
 				warnings, err = ms.ValidateUpdate(ms)
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 				g.Expect(warnings).To(BeEmpty())
 			}
 		})
@@ -165,7 +165,7 @@ func TestMachineSetClusterNameImmutable(t *testing.T) {
 			if tt.expectErr {
 				g.Expect(err).To(HaveOccurred())
 			} else {
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 			}
 			g.Expect(warnings).To(BeEmpty())
 		})
@@ -228,10 +228,10 @@ func TestMachineSetVersionValidation(t *testing.T) {
 				g.Expect(warnings).To(BeEmpty())
 			} else {
 				warnings, err := md.ValidateCreate()
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 				g.Expect(warnings).To(BeEmpty())
 				warnings, err = md.ValidateUpdate(md)
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 				g.Expect(warnings).To(BeEmpty())
 			}
 		})
@@ -300,9 +300,9 @@ func TestValidateSkippedMachineSetPreflightChecks(t *testing.T) {
 			g := NewWithT(t)
 			err := validateSkippedMachineSetPreflightChecks(tt.ms)
 			if tt.expectErr {
-				g.Expect(err).NotTo(BeNil())
+				g.Expect(err).To(HaveOccurred())
 			} else {
-				g.Expect(err).To(BeNil())
+				g.Expect(err).ToNot(HaveOccurred())
 			}
 		})
 	}

diff --git a/bootstrap/kubeadm/api/v1alpha4/kubeadm_types_test.go b/bootstrap/kubeadm/api/v1alpha4/kubeadm_types_test.go
@@ -39,7 +39,7 @@ func TestMarshalJSON(t *testing.T) {
 			g := NewWithT(t)
 
 			b, err := json.Marshal(rt.bts)
-			g.Expect(err).NotTo(HaveOccurred())
+			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(string(b)).To(Equal(rt.expected))
 		})
 	}
@@ -69,7 +69,7 @@ func TestUnmarshalJSON(t *testing.T) {
 			if rt.expectedError {
 				g.Expect(err).To(HaveOccurred())
 			} else {
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 			}
 			g.Expect(newbts).To(Equal(rt.bts))
 		})
@@ -180,7 +180,7 @@ func TestNewBootstrapTokenString(t *testing.T) {
 			if rt.expectedError {
 				g.Expect(err).To(HaveOccurred())
 			} else {
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 			}
 			g.Expect(actual).To(Equal(rt.bts))
 		})

diff --git a/bootstrap/kubeadm/api/v1beta1/kubeadm_types_test.go b/bootstrap/kubeadm/api/v1beta1/kubeadm_types_test.go
@@ -77,7 +77,7 @@ func TestNodeRegistrationOptionsMarshalJSON(t *testing.T) {
 			g := NewWithT(t)
 
 			b, err := tt.opts.MarshalJSON()
-			g.Expect(err).NotTo(HaveOccurred())
+			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(string(b)).To(Equal(tt.expected))
 		})
 	}
@@ -97,7 +97,7 @@ func TestBootstrapTokenStringMarshalJSON(t *testing.T) {
 			g := NewWithT(t)
 
 			b, err := json.Marshal(rt.bts)
-			g.Expect(err).NotTo(HaveOccurred())
+			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(string(b)).To(Equal(rt.expected))
 		})
 	}
@@ -127,7 +127,7 @@ func TestBootstrapTokenStringUnmarshalJSON(t *testing.T) {
 			if rt.expectedError {
 				g.Expect(err).To(HaveOccurred())
 			} else {
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 			}
 			g.Expect(newbts).To(Equal(rt.bts))
 		})
@@ -238,7 +238,7 @@ func TestNewBootstrapTokenString(t *testing.T) {
 			if rt.expectedError {
 				g.Expect(err).To(HaveOccurred())
 			} else {
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 			}
 			g.Expect(actual).To(Equal(rt.bts))
 		})

diff --git a/bootstrap/kubeadm/api/v1beta1/kubeadmconfig_webhook_test.go b/bootstrap/kubeadm/api/v1beta1/kubeadmconfig_webhook_test.go
@@ -472,10 +472,10 @@ func TestKubeadmConfigValidate(t *testing.T) {
 				g.Expect(warnings).To(BeEmpty())
 			} else {
 				warnings, err := tt.in.ValidateCreate()
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 				g.Expect(warnings).To(BeEmpty())
 				warnings, err = tt.in.ValidateUpdate(nil)
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(err).ToNot(HaveOccurred())
 				g.Expect(warnings).To(BeEmpty())
 			}
 		})

diff --git a/bootstrap/kubeadm/api/v1beta1/kubeadmconfigtemplate_webhook_test.go b/bootstrap/kubeadm/api/v1beta1/kubeadmconfigtemplate_webhook_test.go
@@ -69,10 +69,10 @@ func TestKubeadmConfigTemplateValidation(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			g := NewWithT(t)
 			warnings, err := tt.in.ValidateCreate()
-			g.Expect(err).NotTo(HaveOccurred())
+			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(warnings).To(BeEmpty())
 			warnings, err = tt.in.ValidateUpdate(nil)
-			g.Expect(err).NotTo(HaveOccurred())
+			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(warnings).To(BeEmpty())
 		})
 	}

diff --git a/bootstrap/kubeadm/internal/cloudinit/cloudinit_test.go b/bootstrap/kubeadm/internal/cloudinit/cloudinit_test.go
@@ -68,7 +68,7 @@ func TestNewInitControlPlaneAdditionalFileEncodings(t *testing.T) {
 	}
 
 	out, err := NewInitControlPlane(cpinput)
-	g.Expect(err).NotTo(HaveOccurred())
+	g.Expect(err).ToNot(HaveOccurred())
 
 	expectedFiles := []string{
 		`-   path: /tmp/my-path
@@ -114,7 +114,7 @@ func TestNewInitControlPlaneCommands(t *testing.T) {
 	}
 
 	out, err := NewInitControlPlane(cpinput)
-	g.Expect(err).NotTo(HaveOccurred())
+	g.Expect(err).ToNot(HaveOccurred())
 
 	expectedCommands := []string{
 		`"\"echo $(date) ': hello world!'\""`,
@@ -164,7 +164,7 @@ func TestNewInitControlPlaneDiskMounts(t *testing.T) {
 	}
 
 	out, err := NewInitControlPlane(cpinput)
-	g.Expect(err).NotTo(HaveOccurred())
+	g.Expect(err).ToNot(HaveOccurred())
 
 	expectedDiskSetup := `disk_setup:
   test-device:
@@ -224,7 +224,7 @@ func TestNewJoinControlPlaneAdditionalFileEncodings(t *testing.T) {
 	}
 
 	out, err := NewJoinControlPlane(cpinput)
-	g.Expect(err).NotTo(HaveOccurred())
+	g.Expect(err).ToNot(HaveOccurred())
 
 	expectedFiles := []string{
 		`-   path: /tmp/my-path
@@ -266,7 +266,7 @@ func TestNewJoinControlPlaneExperimentalRetry(t *testing.T) {
 	}
 
 	out, err := NewJoinControlPlane(cpinput)
-	g.Expect(err).NotTo(HaveOccurred())
+	g.Expect(err).ToNot(HaveOccurred())
 
 	expectedFiles := []string{
 		`-   path: ` + retriableJoinScriptName + `

diff --git a/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller_reconciler_test.go b/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller_reconciler_test.go
@@ -33,7 +33,7 @@ func TestKubeadmConfigReconciler(t *testing.T) {
 			g := NewWithT(t)
 
 			ns, err := env.CreateNamespace(ctx, "test-kubeadm-config-reconciler")
-			g.Expect(err).To(BeNil())
+			g.Expect(err).ToNot(HaveOccurred())
 
 			cluster := builder.Cluster(ns.Name, "cluster1").Build()
 			g.Expect(env.Create(ctx, cluster)).To(Succeed())