dsc bugifx

Author: safeermohammed

src/ResourceManager/Automation/Commands.Automation/Cmdlet/StartAzureAutomationDscCompilationJob.cs

@@ -12,20 +12,23 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Management.Automation;
 using System.Security.Permissions;
 using Microsoft.Azure.Commands.Automation.Common;
 using Microsoft.Azure.Commands.Automation.Model;
+using Microsoft.Azure.Commands.Automation.Properties;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.Azure.Commands.Automation.Cmdlet
 {
     /// <summary>
     /// starts azure automation compilation job
     /// </summary>
-    [Cmdlet(VerbsLifecycle.Start, "AzureRmAutomationDscCompilationJob")]
+    [Cmdlet(VerbsLifecycle.Start, "AzureRMAutomationDscCompilationJob")]
     [OutputType(typeof(CompilationJob))]
     public class StartAzureAutomationDscCompilationJob : AzureAutomationBaseCmdlet
     {
@@ -56,11 +59,15 @@ protected override void AutomationProcessRecord()
         {
             CompilationJob job = null;
 
-            if (this.ConfigurationData != null)
+            if (this.Parameters != null && this.Parameters.Contains("ConfigurationData"))
             {
-                Parameters.Add("ConfigurationData", this.ConfigurationData);
+                throw new ArgumentException(
+                                          string.Format(
+                                              CultureInfo.CurrentCulture,
+                                              Resources.ConfigurationDataShouldNotBeInJobParameters, "-ConfigurationData"));
             }
-            job = this.AutomationClient.StartCompilationJob(this.ResourceGroupName, this.AutomationAccountName, this.ConfigurationName, this.Parameters);
+
+            job = this.AutomationClient.StartCompilationJob(this.ResourceGroupName, this.AutomationAccountName, this.ConfigurationName, this.Parameters, this.ConfigurationData);
 
             this.WriteObject(job);
         }

src/ResourceManager/Automation/Commands.Automation/Common/AutomationClientDSC.cs

@@ -1015,7 +1015,7 @@ public Model.CompilationJob GetCompilationJob(string resourceGroupName, string a
             }
         }
 
-        public Model.CompilationJob StartCompilationJob(string resourceGroupName, string automationAccountName, string configurationName, IDictionary parameters)
+        public CompilationJob StartCompilationJob(string resourceGroupName, string automationAccountName, string configurationName, IDictionary parameters, IDictionary configurationData)
         {
             using (var request = new RequestSettings(this.automationManagementClient))
             {
@@ -1027,7 +1027,7 @@ public Model.CompilationJob StartCompilationJob(string resourceGroupName, string
                         {
                             Name = configurationName
                         },
-                        Parameters = this.ProcessConfigurationParameters(resourceGroupName, automationAccountName, configurationName, parameters)
+                        Parameters = this.ProcessConfigurationParameters(parameters, configurationData)
                     }
                 };
 
@@ -1477,15 +1477,19 @@ private string FormatDateTime(DateTimeOffset dateTime)
             return string.Format(CultureInfo.InvariantCulture, "{0:O}", dateTime.ToUniversalTime());
         }
 
-        private IDictionary<string, string> ProcessConfigurationParameters(string resourceGroupName, string automationAccountName, string configurationName, IDictionary parameters)
+        private IDictionary<string, string> ProcessConfigurationParameters(IDictionary parameters, IDictionary configurationData)
         {
             parameters = parameters ?? new Dictionary<string, string>();
             var filteredParameters = new Dictionary<string,string>();
+            if (configurationData != null)
+            {
+                filteredParameters.Add("ConfigurationData", JsonConvert.SerializeObject(configurationData));
+            }
             foreach (var key in parameters.Keys)
             {                
                 try
                 {
-                    filteredParameters.Add(key.ToString(), Newtonsoft.Json.JsonConvert.SerializeObject(parameters[key]));
+                    filteredParameters.Add(key.ToString(), JsonConvert.SerializeObject(parameters[key]));
                 }
                 catch (JsonSerializationException)
                 {

src/ResourceManager/Automation/Commands.Automation/Common/IAutomationClient.cs

@@ -49,7 +49,7 @@ public interface IAutomationClient
 
         IEnumerable<CompilationJob> ListCompilationJobs(string resourceGroupName, string automationAccountName, DateTimeOffset? startTime, DateTimeOffset? endTime, string jobStatus);
 
-        CompilationJob StartCompilationJob(string resourceGroupName, string automationAccountName, string configurationName, IDictionary parameters);
+        CompilationJob StartCompilationJob(string resourceGroupName, string automationAccountName, string configurationName, IDictionary parameters, IDictionary configurationData);
 
         IEnumerable<JobStream> GetDscCompilationJobStream(string resourceGroupName, string automationAccountname, Guid jobId, DateTimeOffset? time, string streamType);
         #endregion

src/ResourceManager/Automation/Commands.Automation/Properties/Resources.Designer.cs

@@ -418,4 +418,7 @@
     <value>Invalid node configuration name. Please specify in the format &lt;config name&gt;.&lt;node name&gt;</value>
     <comment>Automation</comment>
   </data>
+  <data name="ConfigurationDataShouldNotBeInJobParameters" xml:space="preserve">
+    <value>ConfigurationData cannot be part of the job parameters. You can specify the ConfigurationData using the {0} switch</value>
+  </data>
 </root>