Skip to content

Commit ab27ef2

Browse files
committed
Merge pull request #4 from moisesac/mocardev
Fixing disable encryption operation when VolumeType is Data
2 parents 893887b + 4cbce53 commit ab27ef2

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/DisableAzureDiskEncryption.cs

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,15 +232,25 @@ public override void ExecuteCmdlet()
232232
{
233233
VirtualMachineExtension parameters = GetVmExtensionParameters(virtualMachineResponse);
234234

235-
this.VirtualMachineExtensionClient.CreateOrUpdateWithHttpMessagesAsync(
235+
var opExt = this.VirtualMachineExtensionClient.CreateOrUpdateWithHttpMessagesAsync(
236236
this.ResourceGroupName,
237237
this.VMName,
238238
this.Name,
239239
parameters).GetAwaiter().GetResult();
240240

241-
var op = UpdateVmEncryptionSettings();
242-
var result = Mapper.Map<PSAzureOperationResponse>(op);
243-
WriteObject(result);
241+
if(string.IsNullOrWhiteSpace(VolumeType) ||
242+
VolumeType.Equals(AzureDiskEncryptionExtensionContext.VolumeTypeAll, StringComparison.InvariantCultureIgnoreCase) ||
243+
VolumeType.Equals(AzureDiskEncryptionExtensionContext.VolumeTypeOS, StringComparison.InvariantCultureIgnoreCase))
244+
{
245+
var opVm = UpdateVmEncryptionSettings();
246+
var result = Mapper.Map<PSAzureOperationResponse>(opVm);
247+
WriteObject(result);
248+
}
249+
else
250+
{
251+
var result = Mapper.Map<PSAzureOperationResponse>(opExt);
252+
WriteObject(result);
253+
}
244254
}
245255
});
246256
}

0 commit comments

Comments
 (0)