Merge pull request Azure#2241 from krkhan/dev

Update VMEncryption extension namespace, allow EncryptionDisable for Linux VMs

Author: Hovsep

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

@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.Compute.Extension.AzureDiskEncryption
     /// </summary>
     public class AzureDiskEncryptionExtensionContext : PSVirtualMachineExtension
     {
-        public const string LinuxExtensionDefaultPublisher = "Microsoft.OSTCExtensions";
+        public const string LinuxExtensionDefaultPublisher = "Microsoft.Azure.Security";
         public const string LinuxExtensionDefaultName = "AzureDiskEncryptionForLinux";
         public const string LinuxExtensionDefaultVersion = "0.1";
 

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

@@ -140,6 +140,21 @@ private VirtualMachineExtension GetVmExtensionParameters(VirtualMachine vmParame
                     AutoUpgradeMinorVersion = !DisableAutoUpgradeMinorVersion.IsPresent
                 };
             }
+            if (OperatingSystemTypes.Linux.Equals(currentOSType))
+            {
+                this.Name = this.Name ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultName;
+
+                vmExtensionParameters = new VirtualMachineExtension
+                {
+                    Location = vmParameters.Location,
+                    Publisher = AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultPublisher,
+                    VirtualMachineExtensionType = AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultName,
+                    TypeHandlerVersion = (this.TypeHandlerVersion) ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultVersion,
+                    Settings = SettingString,
+                    ProtectedSettings = ProtectedSettingString,
+                    AutoUpgradeMinorVersion = !DisableAutoUpgradeMinorVersion.IsPresent
+                };
+            }
 
             return vmExtensionParameters;
         }
@@ -214,18 +229,6 @@ public override void ExecuteCmdlet()
                 }
 
                 currentOSType = virtualMachineResponse.StorageProfile.OsDisk.OsType;
-                if (OperatingSystemTypes.Linux.Equals(currentOSType))
-                {
-                    ThrowTerminatingError(
-                        new ErrorRecord(
-                            new ArgumentException(
-                                string.Format(
-                                    CultureInfo.CurrentUICulture,
-                                    "Disable-AzureDiskEncryption cmdlet is supported only for Windows virtual machines")),
-                            "InvalidType",
-                            ErrorCategory.NotImplemented,
-                            null));
-                }
 
                 if (this.Force.IsPresent ||
                     this.ShouldContinue(Properties.Resources.DisableAzureDiskEncryptionConfirmation, Properties.Resources.DisableAzureDiskEncryptionCaption))