Merge pull request #7 from shipram/dev

cmdlet bugs

Author: safeermohammed

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

@@ -16,7 +16,7 @@
 using Microsoft.Azure.Commands.Automation.Properties;
 using Microsoft.WindowsAzure.Commands.Common;
 using System;
-using System.Collections.Generic;
+using System.Collections;
 using System.Management.Automation;
 using System.Security.Permissions;
 
@@ -66,7 +66,7 @@ public class NewAzureAutomationWebhook : AzureAutomationBaseCmdlet
         /// </summary>
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true,
             HelpMessage = "The Runbook parameters name/value.")]
-        public IDictionary<string, string> Parameters { get; set; }
+        public IDictionary Parameters { get; set; }
 
         [Parameter(Mandatory = false, HelpMessage = "Skip warning message about one-time viewable webhook URL")]
         public SwitchParameter Force { get; set; }
@@ -91,7 +91,7 @@ protected override void AutomationExecuteCmdlet()
                         this.RunbookName,
                         this.IsEnabled,
                         this.ExpiryTime,
-                        this.Parameters.ToHashtable())));
+                        this.Parameters)));
 
         }
     }

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

@@ -12,9 +12,9 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System.Collections;
 using Microsoft.Azure.Commands.Automation.Model;
 using Microsoft.WindowsAzure.Commands.Common;
-using System.Collections.Generic;
 using System.Management.Automation;
 using System.Security.Permissions;
 
@@ -48,7 +48,7 @@ public class SetAzureAutomationWebhook : AzureAutomationBaseCmdlet
         /// </summary>
         [Parameter(Position = 4, Mandatory = false, ValueFromPipelineByPropertyName = true,
             HelpMessage = "The Runbook parameters name/value.")]
-        public IDictionary<string, string> Parameters { get; set; }
+        public IDictionary Parameters { get; set; }
 
         /// <summary>
         /// Execute this cmdlet.
@@ -60,7 +60,7 @@ protected override void AutomationExecuteCmdlet()
                 this.ResourceGroupName,
                 this.AutomationAccountName,
                 this.Name,
-                this.Parameters.ToHashtable(),
+                this.Parameters,
                 this.IsEnabled);
             this.WriteObject(updatedWebhook);
         }

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

@@ -37,7 +37,7 @@ public Model.Webhook CreateWebhook(
             string runbookName,
             bool isEnabled,
             DateTimeOffset expiryTime,
-            Hashtable runbookParameters)
+            IDictionary runbookParameters)
         {
             Requires.Argument("ResourceGroupName", resourceGroupName).NotNull();
             Requires.Argument("AutomationAccountName", automationAccountName).NotNull();
@@ -57,9 +57,7 @@ public Model.Webhook CreateWebhook(
                                                    };
                 if (runbookParameters != null)
                 {
-                    createOrUpdateProperties.Parameters =
-                        runbookParameters.Cast<DictionaryEntry>()
-                            .ToDictionary(kvp => (string)kvp.Key, kvp => (string)kvp.Value);
+                    createOrUpdateProperties.Parameters = this.ProcessRunbookParameters(resourceGroupName, automationAccountName, runbookName, runbookParameters);
                 }
 
                 var webhookCreateOrUpdateParameters = new WebhookCreateOrUpdateParameters(
@@ -154,7 +152,7 @@ public Model.Webhook UpdateWebhook(
             string resourceGroupName,
             string automationAccountName,
             string name,
-            Hashtable parameters,
+            IDictionary parameters,
             bool? isEnabled)
         {
             Requires.Argument("ResourceGroupName", resourceGroupName).NotNull();
@@ -173,8 +171,7 @@ public Model.Webhook UpdateWebhook(
                     if (parameters != null)
                     {
                         webhookPatchProperties.Parameters =
-                            parameters.Cast<DictionaryEntry>()
-                                .ToDictionary(kvp => (string)kvp.Key, kvp => (string)kvp.Value);
+                            this.ProcessRunbookParameters(resourceGroupName, automationAccountName, webhookModel.Properties.Runbook.Name, parameters);
                     }
                 }
 

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

@@ -16,6 +16,7 @@
 using System.IO;
 using System.Collections;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 using System.Security;
 using Microsoft.Azure.Commands.Automation.Model;
 using Microsoft.Azure.Common.Authentication.Models;
@@ -141,13 +142,13 @@ Model.Webhook CreateWebhook(
             string runbookName,
             bool isEnabled,
             DateTimeOffset expiryTime,
-            Hashtable parameters);
+            IDictionary parameters);
 
         Model.Webhook GetWebhook(string resourceGroupName, string automationAccountName, string name);
 
         IEnumerable<Model.Webhook> ListWebhooks(string resourceGroupName, string automationAccountName, string runbooName, ref string nextLink);
 
-        Model.Webhook UpdateWebhook(string resourceGroupName, string automationAccountName, string name, Hashtable parameters, bool? isEnabled);
+        Model.Webhook UpdateWebhook(string resourceGroupName, string automationAccountName, string name, IDictionary parameters, bool? isEnabled);
 
         void DeleteWebhook(string resourceGroupName, string automationAccountName, string name);
 

src/ResourceManager/Automation/Commands.Automation/Model/Job.cs

@@ -16,6 +16,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
+using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.Automation.Model
 {
@@ -65,7 +67,20 @@ public Job(string resourceGroupName, string accountName, Azure.Management.Automa
                 if (0 != String.Compare(kvp.Key, Constants.JobStartedByParameterName, CultureInfo.InvariantCulture, CompareOptions.IgnoreCase) && 
                     0 != String.Compare(kvp.Key, Constants.JobRunOnParameterName, CultureInfo.InvariantCulture, CompareOptions.IgnoreCase))
                 {
-                    this.JobParameters.Add(kvp.Key, (object)PowerShellJsonConverter.Deserialize(kvp.Value));
+                    object paramValue;
+                    try
+                    {
+                        paramValue = ((object) PowerShellJsonConverter.Deserialize(kvp.Value));
+                    }
+                    catch (CmdletInvocationException exception)
+                    {
+                        if (!exception.Message.Contains("Invalid JSON primitive"))
+                            throw;
+                        
+                        paramValue = kvp.Value;
+                    }
+                    this.JobParameters.Add(kvp.Key, paramValue);
+                   
                 }
             }
         }

src/ResourceManager/Automation/Commands.Automation/Model/Webhook.cs

@@ -65,7 +65,12 @@ public Webhook(
             }
 
             this.LastModifiedTime = webhook.Properties.LastModifiedTime.ToLocalTime();
-            this.Parameters = new Hashtable(webhook.Properties.Parameters.ToDictionary(kvp => kvp.Key, kvp => kvp.Value));
+            this.Parameters = new Hashtable(StringComparer.InvariantCultureIgnoreCase);
+            foreach (var kvp in webhook.Properties.Parameters)
+            {
+                this.Parameters.Add(kvp.Key, (object)PowerShellJsonConverter.Deserialize(kvp.Value));
+            }
+
             this.RunbookName = webhook.Properties.Runbook.Name;
             this.WebhookURI = webhookUri;
         }