Adding RunOn support and other issue fixes.

Adding runOn support for Scheduled Job and Webhook cmdlets; Also adding alias for Modules in New/Set Modules. The changes were required for couple of issues raised earlier.

Author: vrdmr

src/ResourceManager/Automation/ChangeLog.md

@@ -20,6 +20,8 @@
 ## Current Release
 * Made changes to AutomationDSC* cmdlets to pull more than 100 records
 * Resolved the issue where the Verbose streams stop working after calling some Automation cmdlets (for example Get-AzureRmAutomationVariable, Get-AzureRmAutomationJob).
+* Bug fixes for existing issues - Fixes the alias issue is #3775 and the runOn alias and support for HybridWorkers.
+
 ## Version 3.2.1
 ## Version 3.2.0
 * Properly setting TimeZone value for Weekly and Monthly schedules for New-AzureRmAutomationSchedule
@@ -40,4 +42,4 @@
 
 ## Version 2.4.0
 
-## Version 2.3.0
+## Version 2.3.0

src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/NewAzureAutomationWebhookTest.cs

@@ -53,7 +53,7 @@ public void NewAzureAutomationWebhookByNameSuccessful()
             DateTimeOffset expiryTime = DateTimeOffset.Now.AddDays(1);
 
             this.mockAutomationClient.Setup(
-                f => f.CreateWebhook(resourceGroupName, accountName, name, runbookName, true, expiryTime, null));
+                f => f.CreateWebhook(resourceGroupName, accountName, name, runbookName, true, expiryTime, null, null));
 
             // Test
             this.cmdlet.ResourceGroupName = resourceGroupName;
@@ -67,7 +67,7 @@ public void NewAzureAutomationWebhookByNameSuccessful()
 
             // Assert
             this.mockAutomationClient.Verify(
-                f => f.CreateWebhook(resourceGroupName, accountName, name, runbookName, true, expiryTime, null),
+                f => f.CreateWebhook(resourceGroupName, accountName, name, runbookName, true, expiryTime, null, null),
                 Times.Once());
         }
     }

src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/RegisterAzureAutomationScheduledRunbookTest.cs

@@ -53,7 +53,7 @@ public void RegisterAzureAutomationScheduledRunbookSuccessfull()
             string runOn = "hybridWorkerGroup";
 
             this.mockAutomationClient.Setup(
-                f => f.RegisterScheduledRunbook(resourceGroupName, accountName, runbookName, scheduleName, null, runOn));
+                f => f.RegisterScheduledRunbook(resourceGroupName, accountName, runbookName, scheduleName, null, null));
 
             // Test
             this.cmdlet.ResourceGroupName = resourceGroupName;
@@ -63,7 +63,7 @@ public void RegisterAzureAutomationScheduledRunbookSuccessfull()
             this.cmdlet.ExecuteCmdlet();
 
             // Assert
-            this.mockAutomationClient.Verify(f => f.RegisterScheduledRunbook(resourceGroupName, accountName, runbookName, scheduleName, null, runOn), Times.Once());
+            this.mockAutomationClient.Verify(f => f.RegisterScheduledRunbook(resourceGroupName, accountName, runbookName, scheduleName, null, null), Times.Once());
         }
     }
 }

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

@@ -39,16 +39,17 @@ public class NewAzureAutomationModule : AzureAutomationBaseCmdlet
         /// </summary>
         [Parameter(Position = 3, Mandatory = true, ValueFromPipelineByPropertyName = true,
             HelpMessage = "The url to a module zip package.")]
+        [Alias("ContentLink")]
         [ValidateNotNullOrEmpty]
-        public Uri ContentLink { get; set; }
+        public Uri ContentLinkUri { get; set; }
 
         /// <summary>
         /// Execute this cmdlet.
         /// </summary>
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
         protected override void AutomationProcessRecord()
         {
-            var createdModule = this.AutomationClient.CreateModule(this.ResourceGroupName, this.AutomationAccountName, ContentLink, Name);
+            var createdModule = this.AutomationClient.CreateModule(this.ResourceGroupName, this.AutomationAccountName, ContentLinkUri, Name);
             this.WriteObject(createdModule);
         }
     }

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

@@ -70,6 +70,14 @@ public class NewAzureAutomationWebhook : AzureAutomationBaseCmdlet
         [Parameter(Mandatory = false, HelpMessage = "Skip warning message about one-time viewable webhook URL")]
         public SwitchParameter Force { get; set; }
 
+        /// <summary>
+        /// Gets or sets the optional hybrid agent friendly name upon which the runbook should be executed.
+        /// </summary>
+        [Parameter(Mandatory = false, 
+            HelpMessage = "Optional name of the hybrid agent which should execute the runbook")]
+        [Alias("HybridWorker")]
+        public string RunOn { get; set; }
+
         /// <summary>
         /// Execute this cmdlet.
         /// </summary>
@@ -90,7 +98,8 @@ protected override void AutomationProcessRecord()
                         this.RunbookName,
                         this.IsEnabled,
                         this.ExpiryTime,
-                        this.Parameters)));
+                        this.Parameters,
+                        this.RunOn)));
 
         }
     }

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

@@ -54,20 +54,22 @@ public class RegisterAzureAutomationScheduledRunbook : AzureAutomationBaseCmdlet
         /// <summary>
         /// Gets or sets the optional hybrid agent friendly name upon which the runbook should be executed.
         /// </summary>
-        [Alias("HybridWorker")]
         [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByRunbookNameAndScheduleName, Mandatory = false, ValueFromPipelineByPropertyName = true,
-            HelpMessage = "The name of the hybrid runbook worker group.")]
+			HelpMessage = "Optional name of the hybrid agent which should execute the runbook")]
+        [Alias("HybridWorker")]
         public string RunOn { get; set; }
 
         /// <summary>
         /// Execute this cmdlet.
         /// </summary>
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
         protected override void AutomationProcessRecord()
-        {            
-            var jobSchedule = this.AutomationClient.RegisterScheduledRunbook(
+        {
+            JobSchedule jobSchedule;
+
+            jobSchedule = this.AutomationClient.RegisterScheduledRunbook(
                     this.ResourceGroupName, this.AutomationAccountName, this.RunbookName, this.ScheduleName, this.Parameters, this.RunOn);
-          
+
             this.WriteObject(jobSchedule);
         }
     }

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

@@ -40,6 +40,7 @@ public class SetAzureAutomationModule : AzureAutomationBaseCmdlet
         /// </summary>
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true,
             HelpMessage = "The url to module zip file package.")]
+        [Alias("ContentLink")]
         public Uri ContentLinkUri { get; set; }
 
         /// <summary>

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

@@ -35,7 +35,8 @@ public Model.Webhook CreateWebhook(
             string runbookName,
             bool isEnabled,
             DateTimeOffset expiryTime,
-            IDictionary runbookParameters)
+            IDictionary runbookParameters,
+            string runOn)
         {
             Requires.Argument("ResourceGroupName", resourceGroupName).NotNull();
             Requires.Argument("AutomationAccountName", automationAccountName).NotNull();
@@ -51,7 +52,8 @@ public Model.Webhook CreateWebhook(
                                                            this.automationManagementClient
                                                            .Webhooks.GenerateUri(
                                                                resourceGroupName,
-                                                               automationAccountName).Uri
+                                                               automationAccountName).Uri,
+                   RunOn = runOn
                 };
                 if (runbookParameters != null)
                 {

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

@@ -149,7 +149,8 @@ Model.Webhook CreateWebhook(
             string runbookName,
             bool isEnabled,
             DateTimeOffset expiryTime,
-            IDictionary parameters);
+            IDictionary parameters,
+            string runOn);
 
         Model.Webhook GetWebhook(string resourceGroupName, string automationAccountName, string name);
 
@@ -295,8 +296,8 @@ IEnumerable<JobStream> GetJobStream(string resourceGroupName, string automationA
         IEnumerable<JobSchedule> ListJobSchedulesByRunbookName(string resourceGroupName, string automationAccountName, string runbookName);
 
         IEnumerable<JobSchedule> ListJobSchedulesByScheduleName(string resourceGroupName, string automationAccountName, string scheduleName);
-                
-        JobSchedule RegisterScheduledRunbook(string resourceGroupName, string automationAccountName, string runbookName, string scheduleName, IDictionary parameters, string RunOn);
+        
+	JobSchedule RegisterScheduledRunbook(string resourceGroupName, string automationAccountName, string runbookName, string scheduleName, IDictionary parameters, string runOn);
 
         void UnregisterScheduledRunbook(string resourceGroupName, string automationAccountName, Guid jobScheduleId);
 
@@ -311,4 +312,4 @@ IEnumerable<JobStream> GetJobStream(string resourceGroupName, string automationA
 
         #endregion
     }
-}
+}

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

@@ -46,7 +46,7 @@ public JobSchedule(string resourceGroupName, string automationAccountName, Azure
             this.RunbookName = jobSchedule.Properties.Runbook.Name;
             this.ScheduleName = jobSchedule.Properties.Schedule.Name;
             this.Parameters = new Hashtable(StringComparer.InvariantCultureIgnoreCase);
-            this.RunOn = jobSchedule.Properties.RunOn;
+            this.HybridWorker = jobSchedule.Properties.RunOn;
             foreach (var kvp in jobSchedule.Properties.Parameters.Where(kvp => 0 != String.Compare(kvp.Key, Constants.JobStartedByParameterName, CultureInfo.InvariantCulture,
                 CompareOptions.IgnoreCase)))
             {
@@ -92,5 +92,10 @@ public JobSchedule()
         /// Gets or sets the runbook parameters.
         /// </summary>
         public Hashtable Parameters { get; set; }
+
+        /// <summary>
+        /// Gets or sets the HybridWorker.
+        /// </summary>
+        public string HybridWorker { get; set; }
     }
 }

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

@@ -69,6 +69,7 @@ public Webhook(
 
             this.RunbookName = webhook.Properties.Runbook.Name;
             this.WebhookURI = webhookUri;
+            this.HybridWorker = webhook.Properties.RunOn;
         }
 
         public string ResourceGroupName { get; set; }
@@ -94,5 +95,10 @@ public Webhook(
         public string RunbookName { get; set; }
 
         public string WebhookURI { get; set; }
+
+        /// <summary>
+        /// Gets or sets the HybridWorker.
+        /// </summary>
+        public string HybridWorker { get; set; }
     }
 }