Merge pull request Azure#4771 from SudhakaraReddyEvuri/preview

Clear encryption settings script update to handle managed disks VMs

Author: cormacpayne

src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/Scripts/ClearEncryptionSettings.ps1

@@ -14,33 +14,30 @@ $VerbosePreference = "Continue";
 $ErrorActionPreference = "Stop";
 
 
-Write-Verbose "ClearEncryptionSettings: resourceGroupName - $resourceGroupName , vmName - $vmName";
+#Stop VM, Update VM model to clear encryption settings and then start VM
+Write-Verbose "Stopping VM resourceGroupName - $resourceGroupName , vmName - $vmName";
+Stop-AzureRmVM -Name $vmName -ResourceGroupName $resourceGroupName -Force -Verbose;
+Write-Verbose "Successfully stopped VM";
 
 # Get the VM object
 $vm = Get-AzureRmVm -ResourceGroupName $resourceGroupName -Name $vmName;
-
-Write-Verbose "VM object encryption settings before clearing encryption settings: $vm.StorageProfile.OsDisk.EncryptionSettings";
+$backupEncryptionSettings = $vm.StorageProfile.OsDisk.EncryptionSettings;
 
 # Clear encryption settings and disable encryption on VM object
+Write-Verbose "ClearEncryptionSettings: resourceGroupName - $resourceGroupName , vmName - $vmName";
+Write-Verbose "VM object encryption settings before clearing encryption settings: $vm.StorageProfile.OsDisk.EncryptionSettings";
 $vm.StorageProfile.OsDisk.EncryptionSettings.Enabled = $false;
 $vm.StorageProfile.OsDisk.EncryptionSettings.DiskEncryptionKey = $null;
 $vm.StorageProfile.OsDisk.EncryptionSettings.KeyEncryptionKey = $null;
-
 Write-Verbose "Cleared encryptionSettings: $vm.StorageProfile.OsDisk.EncryptionSettings";
 
-#Stop VM, Update VM model to clear encryption settings and then start VM
-Stop-AzureRmVM -Name $vmName -ResourceGroupName $resourceGroupName -Force -Verbose;
-
-Write-Verbose "Successfully stopped VM";
-
+# Update VM with cleared encryption settings
 Update-AzureRmVM -VM $vm -ResourceGroupName $resourceGroupName -Verbose;
-
 Write-Verbose "Successfully updated VM";
 
+# Start the VM
 Start-AzureRmVm -ResourceGroupName $resourceGroupName -Name $vmName -Verbose;
-
 Write-Verbose "Successfully started VM";
 
 $vm = Get-AzureRmVm -ResourceGroupName $resourceGroupName -Name $vmName;
-
 Write-Verbose "VM object encryption settings after clearing encryption settings: $vm.StorageProfile.OsDisk.EncryptionSettings";

src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/Scripts/ClearKek.ps1

@@ -12,11 +12,12 @@
 $VerbosePreference = "Continue";
 $ErrorActionPreference = “Stop”;
 
+Write-Host "Stopping VM before clearing encryption settings";
+Stop-AzureRmVM -Name $vmName -ResourceGroupName $resourceGroupName -Force;
+
 $vm = Get-AzureRmVm -ResourceGroupName $resourceGroupName -Name $vmName;
 $backupEncryptionSettings = $vm.StorageProfile.OsDisk.EncryptionSettings;
 
-Write-Host "Stopping VM before clearing encryption settings";
-Stop-AzureRmVM -Name $vmName -ResourceGroupName $resourceGroupName -Force;
 
 ## Clear encryption settings from VM model
 Write-Host "Clearing Encryption settings from VM";