builder/azure-arm: Remove duplicate resource deletion steps

builder/azure/arm/builder.go

@@ -221,8 +221,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			NewStepSnapshotDataDisks(azureClient, ui, &b.config),
 			NewStepCaptureImage(azureClient, ui),
 			NewStepPublishToSharedImageGallery(azureClient, ui, &b.config),
-			NewStepDeleteResourceGroup(azureClient, ui),
-			NewStepDeleteOSDisk(azureClient, ui),
 			NewStepDeleteAdditionalDisks(azureClient, ui),
 		}
 	} else if b.config.OSType == constants.Target_Windows {
@@ -264,8 +262,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			NewStepSnapshotDataDisks(azureClient, ui, &b.config),
 			NewStepCaptureImage(azureClient, ui),
 			NewStepPublishToSharedImageGallery(azureClient, ui, &b.config),
-			NewStepDeleteResourceGroup(azureClient, ui),
-			NewStepDeleteOSDisk(azureClient, ui),
 			NewStepDeleteAdditionalDisks(azureClient, ui),
 		)
 	} else {

builder/azure/arm/step_create_resource_group.go

@@ -111,27 +111,30 @@ func (s *StepCreateResourceGroup) Cleanup(state multistep.StateBag) {
 	if state.Get(constants.ArmIsExistingResourceGroup).(bool) {
 		ui.Say("\nThe resource group was not created by Packer, not deleting ...")
 		return
-	} else {
-		ui.Say("\nCleanup requested, deleting resource group ...")
+	}
 
-		var resourceGroupName = state.Get(constants.ArmResourceGroupName).(string)
-		ctx := context.TODO()
-		f, err := s.client.GroupsClient.Delete(ctx, resourceGroupName)
-		if err == nil {
-			if state.Get(constants.ArmAsyncResourceGroupDelete).(bool) {
-				s.say(fmt.Sprintf("\n Not waiting for Resource Group delete as requested by user. Resource Group Name is %s", resourceGroupName))
-			} else {
-				err = f.WaitForCompletionRef(ctx, s.client.GroupsClient.Client)
-			}
-		}
-		if err != nil {
-			ui.Error(fmt.Sprintf("Error deleting resource group.  Please delete it manually.\n\n"+
-				"Name: %s\n"+
-				"Error: %s", resourceGroupName, err))
-			return
-		}
-		if !state.Get(constants.ArmAsyncResourceGroupDelete).(bool) {
-			ui.Say("Resource group has been deleted.")
+	ctx := context.TODO()
+	resourceGroupName := state.Get(constants.ArmResourceGroupName).(string)
+	if exists, err := s.exists(ctx, resourceGroupName); !exists || err != nil {
+		return
+	}
+
+	ui.Say("\nCleanup requested, deleting resource group ...")
+	f, err := s.client.GroupsClient.Delete(ctx, resourceGroupName)
+	if err == nil {
+		if state.Get(constants.ArmAsyncResourceGroupDelete).(bool) {
+			s.say(fmt.Sprintf("\n Not waiting for Resource Group delete as requested by user. Resource Group Name is %s", resourceGroupName))
+		} else {
+			err = f.WaitForCompletionRef(ctx, s.client.GroupsClient.Client)
 		}
 	}
+	if err != nil {
+		ui.Error(fmt.Sprintf("Error deleting resource group.  Please delete it manually.\n\n"+
+			"Name: %s\n"+
+			"Error: %s", resourceGroupName, err))
+		return
+	}
+	if !state.Get(constants.ArmAsyncResourceGroupDelete).(bool) {
+		ui.Say("Resource group has been deleted.")
+	}
 }

builder/azure/arm/step_delete_additional_disks.go

@@ -35,8 +35,13 @@ func NewStepDeleteAdditionalDisks(client *AzureClient, ui packer.Ui) *StepDelete
 
 func (s *StepDeleteAdditionalDisk) deleteBlob(storageContainerName string, blobName string) error {
 	blob := s.client.BlobStorageClient.GetContainerReference(storageContainerName).GetBlobReference(blobName)
-	err := blob.Delete(nil)
+	_, err := blob.BreakLease(nil)
+	if err != nil && !strings.Contains(err.Error(), "LeaseNotPresentWithLeaseOperation") {
+		s.say(s.client.LastError.Error())
+		return err
+	}
 
+	err = blob.Delete(nil)
 	if err != nil {
 		s.say(s.client.LastError.Error())
 	}
@@ -80,25 +85,26 @@ func (s *StepDeleteAdditionalDisk) Run(ctx context.Context, state multistep.Stat
 				s.say("Failed to delete the managed Additional Disk!")
 				return processStepResult(err, s.error, state)
 			}
-		} else {
-			u, err := url.Parse(additionaldisk)
-			if err != nil {
-				s.say("Failed to parse the Additional Disk's VHD URI!")
-				return processStepResult(err, s.error, state)
-			}
+			continue
+		}
 
-			xs := strings.Split(u.Path, "/")
-			if len(xs) < 3 {
-				err = errors.New("Failed to parse Additional Disk's VHD URI!")
-			} else {
-				var storageAccountName = xs[1]
-				var blobName = strings.Join(xs[2:], "/")
+		u, err := url.Parse(additionaldisk)
+		if err != nil {
+			s.say("Failed to parse the Additional Disk's VHD URI!")
+			return processStepResult(err, s.error, state)
+		}
 
-				err = s.delete(storageAccountName, blobName)
-			}
-			if err != nil {
-				return processStepResult(err, s.error, state)
-			}
+		xs := strings.Split(u.Path, "/")
+		if len(xs) < 3 {
+			err = errors.New("Failed to parse Additional Disk's VHD URI!")
+		} else {
+			var storageAccountName = xs[1]
+			var blobName = strings.Join(xs[2:], "/")
+
+			err = s.delete(storageAccountName, blobName)
+		}
+		if err != nil {
+			return processStepResult(err, s.error, state)
 		}
 	}
 	return multistep.ActionContinue