Updated webhook tests to use/reuse dummy vars.

Author: Joshua Reed

api/v1beta1/cloudstackmachinetemplate_webhook_test.go

@@ -19,27 +19,22 @@ package v1beta1_test
 import (
 	"context"
 
+	"github.com/aws/cluster-api-provider-cloudstack/test/dummies"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 var _ = Describe("CloudStackMachineTemplate webhook", func() {
-	const (
-		apiVersion            = "infrastructure.cluster.x-k8s.io/v1beta1"
-		identityReferenceKind = "ConfigMap"
-		identityReferenceName = "IdentitySecret"
-		namespace             = "default"
-		templateKind          = "CloudStackMachineTemplate"
-		templateName          = "test-machinetemplate"
-		templateResourceName  = "test-machinetemplateresource"
-		template              = "Template"
-		offering              = "Offering"
-	)
+	var ctx context.Context
+
+	BeforeEach(func() { // Reset test vars to initial state.
+		dummies.SetDummyVars()
+		ctx = context.Background()
+	})
 
 	Context("When creating a CloudStackMachineTemplate with all validated attributes", func() {
 		It("Should succeed", func() {
-			ctx := context.Background()
 			cloudStackMachineTemplate := &CloudStackMachineTemplate{
 				TypeMeta: metav1.TypeMeta{
 					APIVersion: apiVersion,

api/v1beta1/webhook_suite_test.go

@@ -30,6 +30,7 @@ import (
 
 	admissionv1beta1 "k8s.io/api/admission/v1beta1"
 	//+kubebuilder:scaffold:imports
+	infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -70,7 +71,7 @@ var _ = BeforeSuite(func() {
 	Expect(cfg).NotTo(BeNil())
 
 	scheme := runtime.NewScheme()
-	err = AddToScheme(scheme)
+	err = infrav1.AddToScheme(scheme)
 	Expect(err).NotTo(HaveOccurred())
 
 	err = admissionv1beta1.AddToScheme(scheme)
@@ -100,14 +101,9 @@ var _ = BeforeSuite(func() {
 	})
 	Expect(err).NotTo(HaveOccurred())
 
-	err = (&CloudStackCluster{}).SetupWebhookWithManager(mgr)
-	Expect(err).NotTo(HaveOccurred())
-
-	err = (&CloudStackMachine{}).SetupWebhookWithManager(mgr)
-	Expect(err).NotTo(HaveOccurred())
-
-	err = (&CloudStackMachineTemplate{}).SetupWebhookWithManager(mgr)
-	Expect(err).NotTo(HaveOccurred())
+	Ω((&infrav1.CloudStackCluster{}).SetupWebhookWithManager(mgr)).Should(Succeed())
+	Ω((&infrav1.CloudStackMachine{}).SetupWebhookWithManager(mgr)).Should(Succeed())
+	Ω((&infrav1.CloudStackMachineTemplate{}).SetupWebhookWithManager(mgr)).Should(Succeed())
 
 	//+kubebuilder:scaffold:webhook
 

test/dummies/vars.go

@@ -10,23 +10,24 @@ import (
 )
 
 var ( // Declare exported dummy vars.
-	AffinityGroup     *cloud.AffinityGroup
-	CSCluster         *infrav1.CloudStackCluster
-	CAPIMachine       *capiv1.Machine
-	CSMachine1        *infrav1.CloudStackMachine
-	CAPICluster       *clusterv1.Cluster
-	Zone1             infrav1.Zone
-	Zone2             infrav1.Zone
-	Net1              infrav1.Network
-	Net2              infrav1.Network
-	DomainId          string
-	Tags              map[string]string
-	Tag1Key           string
-	Tag1Val           string
-	CSApiVersion      string
-	CSClusterKind     string
-	CSClusterName     string
-	CSlusterNamespace string
+	AffinityGroup      *cloud.AffinityGroup
+	CSCluster          *infrav1.CloudStackCluster
+	CAPIMachine        *capiv1.Machine
+	CSMachine1         *infrav1.CloudStackMachine
+	CAPICluster        *clusterv1.Cluster
+	CSMachineTemplate1 *infrav1.CloudStackMachineTemplate
+	Zone1              infrav1.Zone
+	Zone2              infrav1.Zone
+	Net1               infrav1.Network
+	Net2               infrav1.Network
+	DomainId           string
+	Tags               map[string]string
+	Tag1Key            string
+	Tag1Val            string
+	CSApiVersion       string
+	CSClusterKind      string
+	CSClusterName      string
+	CSlusterNamespace  string
 )
 
 // clusterId          = "0"
@@ -40,6 +41,39 @@ func SetDummyVars() {
 	SetDummyTagVars()
 }
 
+// SetDummyClusterSpecVars resets the values in each of the exported CloudStackMachines related dummy variables.
+func SetDummyCSMachineTemplateVars() {
+	CSMachineTemplate1 = &infrav1.CloudStackMachineTemplate{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: apiVersion,
+			Kind:       templateKind,
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "test-machinetemplate-2",
+			Namespace: namespace,
+		},
+		Spec: CloudStackMachineTemplateSpec{
+			Spec: CloudStackMachineTemplateResource{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      templateResourceName,
+					Namespace: namespace,
+				},
+				Spec: CloudStackMachineSpec{
+					IdentityRef: &CloudStackIdentityReference{
+						Kind: defaultIdentityRefKind,
+						Name: identityReferenceName,
+					},
+					Template: template,
+					Offering: offering,
+					Details: map[string]string{
+						"memoryOvercommitRatio": "1.2",
+					},
+				},
+			},
+		},
+	}
+}
+
 // SetDummyClusterSpecVars resets the values in each of the exported CloudStackMachines related dummy variables.
 func SetDummyCSMachineVars() {
 	CSMachine1 = &infrav1.CloudStackMachine{