Fixup tests.

Author: Joshua Reed

api/v1beta2/cloudstackcluster_webhook_test.go

@@ -63,11 +63,11 @@ var _ = Describe("CloudStackCluster webhooks", func() {
 
 		It("Should reject updates to CloudStackCluster FailureDomains", func() {
 			dummies.CSCluster.Spec.FailureDomains[0].Zone.Name = "SomeRandomUpdate"
-			Ω(k8sClient.Update(ctx, dummies.CSCluster)).Should(MatchError(MatchRegexp(forbiddenRegex, "FailureDomains and sub")))
+			Ω(k8sClient.Update(ctx, dummies.CSCluster)).Should(MatchError(MatchRegexp(forbiddenRegex, "Cannot change FailureDomain")))
 		})
 		It("Should reject updates to Networks specified in CloudStackCluster Zones", func() {
 			dummies.CSCluster.Spec.FailureDomains[0].Zone.Network.Name = "ArbitraryUpdateNetworkName"
-			Ω(k8sClient.Update(ctx, dummies.CSCluster)).Should(MatchError(MatchRegexp(forbiddenRegex, "FailureDomains and sub")))
+			Ω(k8sClient.Update(ctx, dummies.CSCluster)).Should(MatchError(MatchRegexp(forbiddenRegex, "Cannot change FailureDomain")))
 		})
 		It("Should reject updates to CloudStackCluster controlplaneendpoint.host", func() {
 			dummies.CSCluster.Spec.ControlPlaneEndpoint.Host = "1.1.1.1"

controllers/utils/base_reconciler.go

@@ -266,7 +266,8 @@ func (r *ReconciliationRunner) DeleteOwnedObjects(gvks ...schema.GroupVersionKin
 				refs := pOwned.GetOwnerReferences()
 				for _, ref := range refs {
 					if ref.UID == r.ReconciliationSubject.GetUID() {
-						if err := r.K8sClient.Delete(r.RequestCtx, &pOwned); err != nil {
+						toDelete := pOwned
+						if err := r.K8sClient.Delete(r.RequestCtx, &toDelete); err != nil {
 							return ctrl.Result{}, err
 						}
 					}

controllers/utils/failuredomains.go

@@ -87,7 +87,8 @@ func (r *ReconciliationRunner) RemoveExtraneousFailureDomains(fds *infrav1.Cloud
 		// Send a deletion request for each FailureDomain no speced for.
 		for _, fd := range fds.Items {
 			if _, present := fdPresenceByName[fd.Name]; !present {
-				if err := r.K8sClient.Delete(r.RequestCtx, &fd); err != nil {
+				toDelete := fd
+				if err := r.K8sClient.Delete(r.RequestCtx, &toDelete); err != nil {
 					return ctrl.Result{}, errors.Wrap(err, "failed to delete obsolete failure domain")
 				}
 			}

pkg/cloud/affinity_groups_test.go

@@ -55,7 +55,6 @@ var _ = Describe("AffinityGroup Unit Tests", func() {
 		Ω(client.GetOrCreateAffinityGroup(dummies.AffinityGroup)).Should(Succeed())
 	})
 	It("creates an affinity group", func() {
-		dummies.SetDummyDomainAndAccount()
 		ags.EXPECT().GetAffinityGroupByID(dummies.AffinityGroup.ID).Return(nil, -1, errors.New("FakeError"))
 		ags.EXPECT().NewCreateAffinityGroupParams(dummies.AffinityGroup.Name, dummies.AffinityGroup.Type).
 			Return(&cloudstack.CreateAffinityGroupParams{})

pkg/cloud/instance.go

@@ -319,8 +319,7 @@ func (c *client) DestroyVMInstance(csMachine *infrav1.CloudStackMachine) error {
 		return err
 	}
 
-	return nil
-	//return errors.New("VM deletion in progress")
+	return errors.New("VM deletion in progress")
 }
 
 func (c *client) listVMInstanceDatadiskVolumeIDs(instanceID string) ([]string, error) {

pkg/cloud/zone_test.go

@@ -41,7 +41,6 @@ var _ = Describe("Zone", func() {
 		zs = mockClient.Zone.(*csapi.MockZoneServiceIface)
 		client = cloud.NewClientFromCSAPIClient(mockClient)
 		dummies.SetDummyVars()
-		dummies.SetDummyDomainAndAccount()
 	})
 
 	AfterEach(func() {

test/dummies/v1beta2/vars.go

@@ -334,18 +334,6 @@ func SetACSEndpointSecretVars() {
 	}
 }
 
-// SetClusterDummyDomainAndAccount sets domain and account in the CSCluster Spec. This is not the default.
-func SetClusterDummyDomainAndAccount() {
-	CSCluster.Spec.Account = AccountName
-	CSCluster.Spec.Domain = DomainPath
-}
-
-// SetClusterDummyDomainAndAccount sets domain and account in the CSCluster Spec. This is not the default.
-func SetDummyDomainAndAccount() {
-	CSCluster.Spec.Account = AccountName
-	CSCluster.Spec.Domain = DomainPath
-}
-
 // SetDummyCapiCluster resets the values in each of the exported CAPICluster related dummy variables.
 func SetDummyCAPIClusterVars() {
 	CAPICluster = &clusterv1.Cluster{