Address PR review comments

Author: afritzler

internal/controller/test_helper.go

@@ -16,35 +16,41 @@ func EnsureCleanState() {
 	GinkgoHelper()
 
 	Eventually(func(g Gomega) error {
-		bmcList := &metalv1alpha1.BMCList{}
-		g.Eventually(ObjectList(bmcList)).Should(HaveField("Items", HaveLen(0)))
+		endpoints := &metalv1alpha1.EndpointList{}
+		g.Eventually(ObjectList(endpoints)).Should(HaveField("Items", HaveLen(0)))
 
-		bmcSecretList := &metalv1alpha1.BMCSecretList{}
-		g.Eventually(ObjectList(bmcSecretList)).Should(HaveField("Items", HaveLen(0)))
+		bmcs := &metalv1alpha1.BMCList{}
+		g.Eventually(ObjectList(bmcs)).Should(HaveField("Items", HaveLen(0)))
 
-		claimList := &metalv1alpha1.ServerClaimList{}
-		g.Eventually(ObjectList(claimList)).Should(HaveField("Items", HaveLen(0)))
+		bmcSecrets := &metalv1alpha1.BMCSecretList{}
+		g.Eventually(ObjectList(bmcSecrets)).Should(HaveField("Items", HaveLen(0)))
+
+		claims := &metalv1alpha1.ServerClaimList{}
+		g.Eventually(ObjectList(claims)).Should(HaveField("Items", HaveLen(0)))
 
 		bmcSettingsList := &metalv1alpha1.BMCSettingsList{}
 		g.Eventually(ObjectList(bmcSettingsList)).Should(HaveField("Items", HaveLen(0)))
 
-		bmcVersionSetList := &metalv1alpha1.BMCVersionSetList{}
-		g.Eventually(ObjectList(bmcVersionSetList)).Should(HaveField("Items", HaveLen(0)))
+		bmcVersionSets := &metalv1alpha1.BMCVersionSetList{}
+		g.Eventually(ObjectList(bmcVersionSets)).Should(HaveField("Items", HaveLen(0)))
+
+		bmcVersions := &metalv1alpha1.BMCVersionList{}
+		g.Eventually(ObjectList(bmcVersions)).Should(HaveField("Items", HaveLen(0)))
 
-		bmcVersionList := &metalv1alpha1.BMCVersionList{}
-		g.Eventually(ObjectList(bmcVersionList)).Should(HaveField("Items", HaveLen(0)))
+		biosVersions := &metalv1alpha1.BIOSVersionList{}
+		g.Eventually(ObjectList(biosVersions)).Should(HaveField("Items", HaveLen(0)))
 
-		biosSettingsSetList := &metalv1alpha1.BIOSSettingsSetList{}
-		g.Eventually(ObjectList(biosSettingsSetList)).Should(HaveField("Items", HaveLen(0)))
+		biosSettingsSets := &metalv1alpha1.BIOSSettingsSetList{}
+		g.Eventually(ObjectList(biosSettingsSets)).Should(HaveField("Items", HaveLen(0)))
 
-		biosSettings := &metalv1alpha1.BIOSSettingsList{}
-		g.Eventually(ObjectList(biosSettings)).Should(HaveField("Items", HaveLen(0)))
+		biosSettingsList := &metalv1alpha1.BIOSSettingsList{}
+		g.Eventually(ObjectList(biosSettingsList)).Should(HaveField("Items", HaveLen(0)))
 
-		maintenanceList := &metalv1alpha1.ServerMaintenanceList{}
-		g.Eventually(ObjectList(maintenanceList)).Should(HaveField("Items", HaveLen(0)))
+		maintenances := &metalv1alpha1.ServerMaintenanceList{}
+		g.Eventually(ObjectList(maintenances)).Should(HaveField("Items", HaveLen(0)))
 
-		serverList := &metalv1alpha1.ServerList{}
-		g.Eventually(ObjectList(serverList)).Should(HaveField("Items", HaveLen(0)))
+		servers := &metalv1alpha1.ServerList{}
+		g.Eventually(ObjectList(servers)).Should(HaveField("Items", HaveLen(0)))
 
 		return nil
 	}).Should(Succeed())

internal/webhook/v1alpha1/biosversion_webhook.go

@@ -97,7 +97,7 @@ func (v *BIOSVersionCustomValidator) ValidateDelete(ctx context.Context, obj run
 	versionLog.Info("Validation for BIOSVersion upon deletion", "name", version.GetName())
 
 	if version.Status.State == metalv1alpha1.BIOSVersionStateInProgress && !ShouldAllowForceDeleteInProgress(version) {
-		return nil, apierrors.NewBadRequest("The bios version in progress, unable to delete")
+		return nil, apierrors.NewBadRequest("The BIOS version is in progress and cannot be deleted")
 	}
 	return nil, nil
 }

internal/webhook/v1alpha1/biosversion_webhook_test.go

@@ -40,7 +40,7 @@ var _ = Describe("BIOSVersion Webhook", func() {
 	})
 
 	AfterEach(func() {
-		By("Deleting the BIOSVersion and Server resources")
+		By("Deleting the BIOSVersion resources")
 		Expect(k8sClient.DeleteAllOf(ctx, &metalv1alpha1.BIOSVersion{})).To(Succeed())
 
 		By("Ensuring clean state")
@@ -146,7 +146,7 @@ var _ = Describe("BIOSVersion Webhook", func() {
 		}
 		Expect(k8sClient.Create(ctx, biosVersionV2)).To(Succeed())
 
-		By("Updating an BIOSVersion V2 to a non-conflicting spec.serverRef ")
+		By("Updating an BIOSVersion V2 to a non-conflicting spec.serverRef")
 		biosVersionV2Updated := biosVersionV2.DeepCopy()
 		biosVersionV2Updated.Spec.ServerRef = &v1.LocalObjectReference{Name: "foobar"}
 		Expect(validator.ValidateUpdate(ctx, biosVersionV2, biosVersionV2Updated)).Error().ToNot(HaveOccurred())
@@ -179,12 +179,12 @@ var _ = Describe("BIOSVersion Webhook", func() {
 	})
 
 	It("Should refuse to delete if InProgress", func() {
-		By("Patching the BIOSVersionV1 to InProgress state")
+		By("Patching the BIOSVersion V1 to InProgress state")
 		Eventually(UpdateStatus(biosVersionV1, func() {
 			biosVersionV1.Status.State = metalv1alpha1.BIOSVersionStateInProgress
 		})).Should(Succeed())
 
-		By("Deleting the BIOSSettings V1 should fail")
+		By("Deleting the BIOSVersion V1 should fail")
 		Expect(k8sClient.Delete(ctx, biosVersionV1)).To(Not(Succeed()))
 
 		Eventually(UpdateStatus(biosVersionV1, func() {