Fixed minor bugs.

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

Author: aliasgar16

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

@@ -433,19 +433,23 @@ private void ValidateParameters()
             bool IsClientRbEmpty = string.IsNullOrEmpty(this.ClientRb);
             bool IsChefServerUrlEmpty = string.IsNullOrEmpty(this.ChefServerUrl);
             bool IsValidationClientNameEmpty = string.IsNullOrEmpty(this.ValidationClientName);
+            bool IsDaemonEmpty = string.IsNullOrEmpty(this.Daemon);
             // Validate ClientRb or ChefServerUrl and ValidationClientName should exist.
             if (IsClientRbEmpty && (IsChefServerUrlEmpty || IsValidationClientNameEmpty))
             {
                 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)
+            if (!IsDaemonEmpty)
             {
-                throw new ArgumentException(
-                    "Invalid use of -Daemon option.");
+                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))

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

@@ -293,19 +293,23 @@ protected override void ValidateParameters()
             bool IsClientRbEmpty = string.IsNullOrEmpty(this.ClientRb);
             bool IsChefServerUrlEmpty = string.IsNullOrEmpty(this.ChefServerUrl);
             bool IsValidationClientNameEmpty = string.IsNullOrEmpty(this.ValidationClientName);
+            bool IsDaemonEmpty = string.IsNullOrEmpty(this.Daemon);
             // Validate ClientRb or ChefServerUrl and ValidationClientName should exist.
             if (IsClientRbEmpty && (IsChefServerUrlEmpty || IsValidationClientNameEmpty))
             {
                 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)
+            if (!IsDaemonEmpty)
             {
-                throw new ArgumentException(
-                    "Invalid use of -Daemon option.");
+                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))

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

@@ -21,7 +21,7 @@ public class VirtualMachineChefExtensionCmdletBase : VirtualMachineExtensionCmdl
         protected const string ExtensionDefaultPublisher = "Chef.Bootstrap.WindowsAzure";
         protected const string ExtensionDefaultName = "ChefClient";
         protected const string LinuxExtensionName = "LinuxChefClient";
-        protected const string PrivateConfigurationTemplate = "{{\"validation_key\":\"{0}\"}}";
+        protected const string PrivateConfigurationTemplate = "validation_key";
         protected const string ClientRbTemplate = "client_rb";
         protected const string BootstrapVersionTemplate = "bootstrap_version";
         protected const string BootStrapOptionsTemplate = "bootstrap_options";