Skip to content

Commit d8532f7

Browse files
author
Kamran Khan
committed
Remove check for DisableEncryption on Linux
1 parent 7f07ab1 commit d8532f7

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

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

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,21 @@ private VirtualMachineExtension GetVmExtensionParameters(VirtualMachine vmParame
140140
AutoUpgradeMinorVersion = !DisableAutoUpgradeMinorVersion.IsPresent
141141
};
142142
}
143+
if (OperatingSystemTypes.Linux.Equals(currentOSType))
144+
{
145+
this.Name = this.Name ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultName;
146+
147+
vmExtensionParameters = new VirtualMachineExtension
148+
{
149+
Location = vmParameters.Location,
150+
Publisher = AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultPublisher,
151+
VirtualMachineExtensionType = AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultName,
152+
TypeHandlerVersion = (this.TypeHandlerVersion) ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultVersion,
153+
Settings = SettingString,
154+
ProtectedSettings = ProtectedSettingString,
155+
AutoUpgradeMinorVersion = !DisableAutoUpgradeMinorVersion.IsPresent
156+
};
157+
}
143158

144159
return vmExtensionParameters;
145160
}
@@ -214,18 +229,6 @@ public override void ExecuteCmdlet()
214229
}
215230

216231
currentOSType = virtualMachineResponse.StorageProfile.OsDisk.OsType;
217-
if (OperatingSystemTypes.Linux.Equals(currentOSType))
218-
{
219-
ThrowTerminatingError(
220-
new ErrorRecord(
221-
new ArgumentException(
222-
string.Format(
223-
CultureInfo.CurrentUICulture,
224-
"Disable-AzureDiskEncryption cmdlet is supported only for Windows virtual machines")),
225-
"InvalidType",
226-
ErrorCategory.NotImplemented,
227-
null));
228-
}
229232

230233
if (this.Force.IsPresent ||
231234
this.ShouldContinue(Properties.Resources.DisableAzureDiskEncryptionConfirmation, Properties.Resources.DisableAzureDiskEncryptionCaption))

0 commit comments

Comments
 (0)