Fixed up CloudStackMachine webhook tests.

Author: Joshua Reed

api/v1beta1/cloudstackmachine_webhook_test.go

@@ -19,7 +19,6 @@ package v1beta1_test
 import (
 	"context"
 
-	infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1beta1"
 	"github.com/aws/cluster-api-provider-cloudstack/test/dummies"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -31,6 +30,8 @@ var _ = Describe("CloudStackMachine webhook", func() {
 	BeforeEach(func() { // Reset test vars to initial state.
 		dummies.SetDummyVars()
 		ctx = context.Background()
+		// Clear out any remaining machines. Ignore errors.
+		_ = k8sClient.Delete(ctx, dummies.CSMachine1)
 	})
 
 	Context("When creating a CloudStackMachine with all attributes", func() {
@@ -63,38 +64,45 @@ var _ = Describe("CloudStackMachine webhook", func() {
 		})
 	})
 
-	Context("When updating a CloudStackMachine", func() {
-		It("Should be rejected by the validating webhooks", func() {
-			Ω(k8sClient.Create(ctx, dummies.CSMachine1)).Should(Succeed())
+	// Need the `-- not template` here to make the context unique. Apparently ginkgo uses startswith.
+	Context("When updating a CloudStackMachine -- not CloudStackMachineTemplate", func() {
+		forbiddenRegex := "admission webhook.*denied the request.*Forbidden\\: %s"
 
-			forbiddenRegex := "admission webhook.*denied the request.*Forbidden\\: %s"
-			cloudStackMachineUpdate := &infrav1.CloudStackMachine{}
+		BeforeEach(func() { // Reset test vars to initial state.
+			Ω(k8sClient.Create(ctx, dummies.CSMachine1)).Should(Succeed())
+		})
 
-			dummies.CSMachine1.DeepCopyInto(cloudStackMachineUpdate)
-			cloudStackMachineUpdate.Spec.Template = "Template2"
-			Expect(k8sClient.Update(ctx, cloudStackMachineUpdate).Error()).Should(MatchRegexp(forbiddenRegex, "template"))
+		It("should reject VM offering updates.", func() {
+			dummies.CSMachine1.Spec.Offering = "ArbitraryUpdateOffering"
+			Ω(k8sClient.Update(ctx, dummies.CSMachine1).Error()).Should(MatchRegexp(forbiddenRegex, "offering"))
+		})
 
-			dummies.CSMachine1.DeepCopyInto(cloudStackMachineUpdate)
-			cloudStackMachineUpdate.Spec.Offering = "Offering2"
-			Expect(k8sClient.Update(ctx, cloudStackMachineUpdate).Error()).Should(MatchRegexp(forbiddenRegex, "offering"))
+		It("should reject VM template updates.", func() {
+			dummies.CSMachine1.Spec.Template = "ArbitraryUpdateTemplate"
+			Ω(k8sClient.Update(ctx, dummies.CSMachine1).Error()).Should(MatchRegexp(forbiddenRegex, "template"))
+		})
 
-			dummies.CSMachine1.DeepCopyInto(cloudStackMachineUpdate)
-			cloudStackMachineUpdate.Spec.Details = map[string]string{
-				"memoryOvercommitRatio": "1.5",
-			}
-			Expect(k8sClient.Update(ctx, cloudStackMachineUpdate).Error()).Should(MatchRegexp(forbiddenRegex, "details"))
+		It("should reject updates to VM details.", func() {
+			dummies.CSMachine1.Spec.Details = map[string]string{"memoryOvercommitRatio": "1.5"}
+			Ω(k8sClient.Update(ctx, dummies.CSMachine1).Error()).Should(MatchRegexp(forbiddenRegex, "details"))
+		})
 
-			dummies.CSMachine1.DeepCopyInto(cloudStackMachineUpdate)
-			cloudStackMachineUpdate.Spec.IdentityRef.Kind = "ConfigMap"
-			Expect(k8sClient.Update(ctx, cloudStackMachineUpdate).Error()).Should(MatchRegexp(forbiddenRegex, "identityRef\\.Kind"))
+		It("should reject identity reference kind udpates.", func() {
+			dummies.CSMachine1.Spec.IdentityRef.Kind = "ConfigMap"
+			Ω(k8sClient.Update(ctx, dummies.CSMachine1).Error()).
+				Should(MatchRegexp(forbiddenRegex, "identityRef\\.Kind"))
+		})
 
-			dummies.CSMachine1.DeepCopyInto(cloudStackMachineUpdate)
-			cloudStackMachineUpdate.Spec.IdentityRef.Name = "IDentityConfigMap"
-			Expect(k8sClient.Update(ctx, cloudStackMachineUpdate).Error()).Should(MatchRegexp(forbiddenRegex, "identityRef\\.Name"))
+		It("should reject identity reference name udpates.", func() {
+			dummies.CSMachine1.Spec.IdentityRef.Name = "IdentityConfigMap"
+			Ω(k8sClient.Update(ctx, dummies.CSMachine1).Error()).
+				Should(MatchRegexp(forbiddenRegex, "identityRef\\.Name"))
+		})
 
-			dummies.CSMachine1.DeepCopyInto(cloudStackMachineUpdate)
-			cloudStackMachineUpdate.Spec.AffinityGroupIDs = []string{"28b907b8-75a7-4214-bd3d-6c61961fc2af"}
-			Expect(k8sClient.Update(ctx, cloudStackMachineUpdate).Error()).Should(MatchRegexp(forbiddenRegex, "AffinityGroupIDs"))
+		It("should reject udpates to the list of affinty groups.", func() {
+			dummies.CSMachine1.Spec.AffinityGroupIDs = []string{"28b907b8-75a7-4214-bd3d-6c61961fc2af"}
+			Ω(k8sClient.Update(ctx, dummies.CSMachine1).Error()).
+				Should(MatchRegexp(forbiddenRegex, "AffinityGroupIDs"))
 		})
 	})
 })

api/v1beta1/cloudstackmachinetemplate_webhook_test.go

@@ -63,8 +63,8 @@ var _ = Describe("CloudStackMachineTemplate webhook", func() {
 		})
 	})
 
-	Context("When updating a CloudStackMachine", func() {
-		It("Should be rejected by the validating webhooks", func() {
+	Context("When updating a CloudStackMachineTemplate", func() {
+		It("Should be rejected by the machine template validating webhooks", func() {
 			Expect(k8sClient.Create(ctx, dummies.CSMachineTemplate1)).Should(Succeed())
 
 			forbiddenRegex := "admission webhook.*denied the request.*Forbidden\\: %s"

test/dummies/vars.go

@@ -63,7 +63,7 @@ func SetDummyCSMachineTemplateVars() {
 			Kind:       "CloudStackMachineTemplate",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      "test-machinetemplate-2",
+			Name:      "test-machinetemplate-1",
 			Namespace: "default",
 		},
 		Spec: infrav1.CloudStackMachineTemplateSpec{
@@ -74,7 +74,7 @@ func SetDummyCSMachineTemplateVars() {
 				},
 				Spec: infrav1.CloudStackMachineSpec{
 					IdentityRef: &infrav1.CloudStackIdentityReference{
-						Kind: "secret",
+						Kind: "Secret",
 						Name: "IdentitySecret",
 					},
 					Template: "Template",
@@ -101,7 +101,7 @@ func SetDummyCSMachineVars() {
 		},
 		Spec: infrav1.CloudStackMachineSpec{
 			IdentityRef: &infrav1.CloudStackIdentityReference{
-				Kind: "secret",
+				Kind: "Secret",
 				Name: "IdentitySecret",
 			},
 			Template:         "Template",
@@ -131,8 +131,8 @@ func SetDummyCAPCClusterVars() {
 	CSCluster = &infrav1.CloudStackCluster{
 		Spec: infrav1.CloudStackClusterSpec{
 			IdentityRef: &infrav1.CloudStackIdentityReference{
-				Kind: "someName",
-				Name: "someKind",
+				Kind: "Secret",
+				Name: "IdentitySecret",
 			},
 			Zones: []infrav1.Zone{Zone1, Zone2}},
 		ObjectMeta: metav1.ObjectMeta{