Fix docker-archive-public#3976

m4r10k · shin- · commit f3af48967784 · 2017-10-10T17:01:20.000-07:00
Signed-off-by: Mario Kleinsasser <mario.kleinsasser@gmail.com> Change storage account deletion logic to fix docker-archive-public#3976 Signed-off-by: Mario Kleinsasser <mario.kleinsasser@gmail.com>
diff --git a/drivers/azure/azureutil/azureutil.go b/drivers/azure/azureutil/azureutil.go
@@ -460,6 +460,22 @@ func (a AzureClient) removeOSDiskBlob(resourceGroup, vmName, vhdURL string) erro
 	if err != nil {
 		log.Debugf("Container remove happened: %v", ok)
 	}
+
+	cts, err := bs.GetBlobService().ListContainers(blobstorage.ListContainersParameters{})
+	if err != nil {
+		return err
+	}
+
+	if len(cts.Containers) == 0 {
+		log.Debugf("No storage containers left. Deleting virtual machine storage account.")
+		resp, err := a.storageAccountsClient().Delete(resourceGroup, storageAccount)
+		if err != nil {
+			return err
+		}
+
+		log.Debugf("Storage account deletion happened: %v", resp.Response.Status)
+	}
+
 	return err
 }
 
