Added secret and secret-file option in Chef Extension for ASM commands and daemon option for ARM commands.

Signed-off-by: aliasgar16 <[email protected]>

Author: aliasgar16

src/ResourceManager/Compute/Commands.Compute/Extension/Chef/SetAzureVMChefExtension.cs

@@ -48,6 +48,7 @@ public class SetAzureVMChefExtensionCommand : VirtualMachineExtensionBaseCmdlet
         private string JsonAttributeTemplate = "custom_json_attr";
         private string ChefServiceIntervalTemplate = "chef_service_interval";
         private string RunListTemplate = "runlist";
+        private string DaemonTemplate = "daemon";
 
         [Parameter(
             Mandatory = true,
@@ -114,6 +115,15 @@ public string TypeHandlerVersion
         [ValidateNotNullOrEmpty]
         public string ChefServiceInterval { get; set; }
 
+        [Parameter(
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Configures the chef-client service for unattended execution. The node platform should be Windows." +
+                          "Options: 'none' or 'service'." +
+                          "none - Currently prevents the chef-client service from being configured as a service." +
+                          "service - Configures the chef-client to run automatically in the background as a service.")]
+        [ValidateNotNullOrEmpty]
+        public string Daemon { get; set; }
+
         [Parameter(
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "The Chef Server Node Runlist.")]
@@ -228,6 +238,7 @@ private Hashtable PublicConfiguration
                     bool IsJsonAttributeEmpty = string.IsNullOrEmpty(this.JsonAttribute);
                     bool IsChefServiceIntervalEmpty = string.IsNullOrEmpty(this.ChefServiceInterval);
                     string BootstrapVersion = string.IsNullOrEmpty(this.BootstrapVersion) ? "" : this.BootstrapVersion;
+                    bool IsDaemonEmpty = string.IsNullOrEmpty(this.Daemon);
 
                     //Cases handled:
                     // 1. When clientRb given by user and:
@@ -300,6 +311,11 @@ private Hashtable PublicConfiguration
                         hashTable.Add(ChefServiceIntervalTemplate, ChefServiceInterval);
                     }
 
+                    if (this.Windows.IsPresent && !IsDaemonEmpty)
+                    {
+                        hashTable.Add(DaemonTemplate, this.Daemon);
+                    }
+
                     this.publicConfiguration = hashTable;
                 }
 
@@ -404,6 +420,14 @@ private void ValidateParameters()
                 throw new ArgumentException(
                     "Required -ClientRb or -ChefServerUrl and -ValidationClientName options.");
             }
+
+            bool IsDaemonValueInvalid = Array.IndexOf(new String[2] {"none", "service"}, this.Daemon) == -1;
+            // Validation against the invalid use of Daemon option.
+            if (IsDaemonValueInvalid || this.Linux.IsPresent)
+            {
+                throw new ArgumentException(
+                    "Invalid use of -Daemon option.");
+            }
         }
 
         public override void ExecuteCmdlet()

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/Chef/SetAzureVMChefExtension.cs

@@ -107,12 +107,24 @@ public class SetAzureVMChefExtensionCommand : VirtualMachineChefExtensionCmdletB
         [Parameter(
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "Configures the chef-client service for unattended execution. The node platform should be Windows." +
-                          "Options: 'auto' or 'service'." +
-                          "auto - Currently prevents the chef-client service from being configured as a service." +
+                          "Options: 'none' or 'service'." +
+                          "none - Currently prevents the chef-client service from being configured as a service." +
                           "service - Configures the chef-client to run automatically in the background as a service.")]
         [ValidateNotNullOrEmpty]
         public string Daemon { get; set; }
 
+        [Parameter(
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "The encryption key used to encrypt and decrypt the data bag item values.")]
+        [ValidateNotNullOrEmpty]
+        public string Secret { get; set; }
+
+        [Parameter(
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "The path to the file that contains the encryption key used to encrypt and decrypt the data bag item values.")]
+        [ValidateNotNullOrEmpty]
+        public string SecretFile { get; set; }
+
         [Parameter(
             Mandatory = true,
             ParameterSetName = LinuxParameterSetName,
@@ -170,8 +182,17 @@ private void SetDefault()
 
         private void SetPrivateConfig()
         {
-            this.PrivateConfiguration = string.Format(PrivateConfigurationTemplate,
+            var hashTable = new Hashtable();
+
+            if (!string.IsNullOrEmpty(this.SecretFile))
+                hashTable.Add(SecretTemplate, File.ReadAllText(this.SecretFile).TrimEnd('\r', '\n'));
+            else if (!string.IsNullOrEmpty(this.Secret))
+                hashTable.Add(SecretTemplate, this.Secret);
+
+            hashTable.Add(PrivateConfigurationTemplate,
                 File.ReadAllText(this.ValidationPem).TrimEnd('\r', '\n'));
+
+            this.PrivateConfiguration = JsonConvert.SerializeObject(hashTable);
         }
 
         private void SetPublicConfig()
@@ -258,7 +279,7 @@ private void SetPublicConfig()
                 hashTable.Add(ChefServiceIntervalTemplate, this.ChefServiceInterval);
             }
 
-            if (!IsDaemonEmpty)
+            if (this.Windows.IsPresent && !IsDaemonEmpty)
             {
                 hashTable.Add(DaemonTemplate, this.Daemon);
             }
@@ -278,6 +299,20 @@ protected override void ValidateParameters()
                 throw new ArgumentException(
                     "Required -ClientRb or -ChefServerUrl and -ValidationClientName options.");
             }
+
+            bool IsDaemonValueInvalid = Array.IndexOf(new String[2] {"none", "service"}, this.Daemon) == -1;
+            // Validation against the invalid use of Daemon option.
+            if (IsDaemonValueInvalid || this.Linux.IsPresent)
+            {
+                throw new ArgumentException(
+                    "Invalid use of -Daemon option.");
+            }
+
+            if (!string.IsNullOrEmpty(this.SecretFile) && !File.Exists(this.SecretFile))
+            {
+                throw new FileNotFoundException(
+                    "File specified in -SecretFile option does not exist.");
+            }
         }
 
         protected override void ProcessRecord()

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/Chef/VirtualMachineChefExtensionCmdletBase.cs

@@ -29,6 +29,7 @@ public class VirtualMachineChefExtensionCmdletBase : VirtualMachineExtensionCmdl
         protected const string ChefServiceIntervalTemplate = "chef_service_interval";
         protected const string RunListTemplate = "runlist";
         protected const string DaemonTemplate = "daemon";
+        protected const string SecretTemplate = "encrypted_data_bag_secret";
 
         public VirtualMachineChefExtensionCmdletBase()
         {

src/ServiceManagement/Services/Commands.Utilities/ChangeLog.md

@@ -29,6 +29,8 @@
 	- LogBackupFrequencyInMinutes : Specifies the frequency of Sql Server Log Backup.
 * Updated Set-AzureVMChefExtension cmdlet to add following new options :
     - Daemon: Configures the chef-client service for unattended execution. e.g. -Daemon 'auto' or e.g. -Daemon 'service'."
+    - Secret: The encryption key used to encrypt and decrypt the data bag item values.
+    - SecretFile: The path to the file that contains the encryption key used to encrypt and decrypt the data bag item values.
 
 ## Version 3.3.0
 * Updated Set-AzureVMChefExtension cmdlet to add following new options :