Merge branch 'andyliuliming-AzureDiskEncryption' into dev

Author: Sudhakara Reddy Evuri

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

@@ -44,6 +44,7 @@ public class AzureDiskEncryptionExtensionContext : PSVirtualMachineExtension
         public string VolumeType { get; set; }
         public string AadClientCertThumbprint { get; set; }
         public string SequenceVersion { get; set; }
+        public SecureString Passphrase { get; set; } 
 
         private static SecureString ConvertStringToSecureString(string str)
         {
@@ -74,6 +75,7 @@ private void InitializeAzureDiskEncryptionMembers(PSVirtualMachineExtension psEx
             AadClientCertThumbprint = (publicSettings == null) ? null : publicSettings.AadClientCertThumbprint;
             SequenceVersion = (publicSettings == null) ? null : publicSettings.SequenceVersion;
             AadClientSecret = (protectedSettings == null) ? null : ConvertStringToSecureString(protectedSettings.AadClientSecret);
+            Passphrase = (protectedSettings == null) ? null : ConvertStringToSecureString(protectedSettings.Passphrase);
         }
 
         public AzureDiskEncryptionExtensionContext(PSVirtualMachineExtension psExt)

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

@@ -18,5 +18,6 @@ namespace Microsoft.Azure.Commands.Compute.Extension.AzureDiskEncryption
     class AzureDiskEncryptionExtensionProtectedSettings
     {
         public string AadClientSecret { get; set; }
+        public string Passphrase { get; set; }
     }
 }

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

@@ -46,6 +46,7 @@ public class SetAzureDiskEncryptionExtensionCommand : VirtualMachineExtensionBas
         private const string volumeTypeKey = "VolumeType";
         private const string encryptionOperationKey = "EncryptionOperation";
         private const string sequenceVersionKey = "SequenceVersion";
+        private const string passphraseKey = "Passphrase";
 
         [Parameter(
            Mandatory = true,
@@ -161,6 +162,14 @@ public class SetAzureDiskEncryptionExtensionCommand : VirtualMachineExtensionBas
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
+        [Parameter(
+            Mandatory = false,
+            Position = 13,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "The passphrase specified in parameters. This parameter only works for Linux VM.")]
+        [ValidateNotNullOrEmpty]
+        public string Passphrase { get; set; }
+
         [Parameter(HelpMessage = "To force the removal.")]
         [ValidateNotNullOrEmpty]
         public SwitchParameter Force { get; set; }
@@ -317,7 +326,10 @@ private string GetExtensionProtectedSettings()
         {
             Hashtable protectedSettings = new Hashtable();
             protectedSettings.Add(aadClientSecretKey, AadClientSecret ?? String.Empty);
-
+            if (string.Equals(this.currentOSType, "Linux"))
+            {
+                protectedSettings.Add(passphraseKey, Passphrase ?? null);
+            }
             return JsonConvert.SerializeObject(protectedSettings);
         }
 

src/ResourceManager/Compute/Commands.Compute/Extension/AzureVMBackup/RemoveAzureVMBackup.cs

@@ -61,7 +61,11 @@ public class RemoveAzureVMBackup : VirtualMachineExtensionBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string VMName { get; set; }
 
-        [Parameter(ValueFromPipelineByPropertyName = true)]
+        [Parameter(
+            Mandatory = true,
+            Position = 2,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "The tag for this backup.")]
         public string Tag { get; set; }
 
         protected override void ProcessRecord()

src/ResourceManager/Compute/Commands.Compute/Extension/AzureVMBackup/SetAzureVMBackupExtension.cs

@@ -68,8 +68,11 @@ public class SetAzureVMBackupExtension: VirtualMachineExtensionBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
-
-        [Parameter(ValueFromPipelineByPropertyName = true)]
+        [Parameter(
+            Mandatory = true,
+            Position = 2,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "The tag for this backup.")]
         public string Tag { get; set; }
 
         protected override void ProcessRecord()