azure: resource group testing complete

Signed-off-by: HashedDan <georgedanielmangum@gmail.com>
TerjeLafton · Apr 23, 2019 · bbec93c · bbec93c
1 parent f678b2e
commit bbec93c
Show file tree

Hide file tree

Showing 3 changed files with 437 additions and 35 deletions.
diff --git a/pkg/clients/azure/resourcegroup/fake/fake.go b/pkg/clients/azure/resourcegroup/fake/fake.go
@@ -46,6 +46,6 @@ func (m *MockClient) CheckExistence(ctx context.Context, resourceGroupName strin
 }
 
 // DeleteGroup calls the underlying MockDeleteGroup method.
-func (m *MockClient) DeleteGroup(ctx context.Context, resourceGroupName string) (result resources.GroupsDeleteFuture, err error) {
+func (m *MockClient) Delete(ctx context.Context, resourceGroupName string) (result resources.GroupsDeleteFuture, err error) {
 	return m.MockDelete(ctx, resourceGroupName)
 }
diff --git a/pkg/controller/azure/provider/resourcegroup.go b/pkg/controller/azure/provider/resourcegroup.go
@@ -47,6 +47,8 @@ const (
 	reasonDeletingResource = "failed to delete Azure Resource Group resource"
 	reasonSyncingResource  = "failed to sync Azure Resource Group resource"
 
+	azureDeletedMessage = "resource has been deleted on Azure"
+
 	reconcileTimeout = 1 * time.Minute
 )
 
@@ -119,8 +121,9 @@ func (a *azureResourceGroup) Sync(ctx context.Context, r *v1alpha1.ResourceGroup
 	case 204:
 		r.Status.SetReady()
 	case 404:
-		r.Status.SetDeleting()
-		return false
+		// Custom message passed to SetFailed due to Azure API returning 404 instead of error
+		r.Status.SetFailed(reasonSyncingResource, azureDeletedMessage)
+		return true
 	default:
 		return true
 	}
@@ -131,7 +134,6 @@ func (a *azureResourceGroup) Sync(ctx context.Context, r *v1alpha1.ResourceGroup
 func (a *azureResourceGroup) Delete(ctx context.Context, r *v1alpha1.ResourceGroup) bool {
 	if r.Spec.ReclaimPolicy == corev1alpha1.ReclaimDelete {
 		if _, err := a.client.Delete(ctx, r.Spec.Name); err != nil {
-
 			r.Status.SetFailed(reasonDeletingResource, err.Error())
 			return true
 		}