Merge branch 'dev' of https://github.com/elvg/azure-powershell into dev3

elvg · elvg · commit 3f57ac064c2e · 2015-02-02T15:47:33.000-08:00
diff --git a/src/ServiceManagement/Automation/Commands.Automation/Cmdlet/AzureAutomationBaseCmdlet.cs b/src/ServiceManagement/Automation/Commands.Automation/Cmdlet/AzureAutomationBaseCmdlet.cs
@@ -85,9 +85,9 @@ public override void ExecuteCmdlet()
                     }
                 }
 
-                if (cloudException.Response.StatusCode == HttpStatusCode.NoContent || cloudException.Response.StatusCode == HttpStatusCode.NotFound)
+                if (cloudException.Response.StatusCode == HttpStatusCode.NotFound)
                 {
-                    throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Resources.ResourceNotFound), cloudException);
+                    throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Resources.AutomationAccountNotFound), cloudException);
                 }
 
                 throw;
diff --git a/src/ServiceManagement/Automation/Commands.Automation/Cmdlet/GetAzureAutomationJob.cs b/src/ServiceManagement/Automation/Commands.Automation/Cmdlet/GetAzureAutomationJob.cs
@@ -38,7 +38,8 @@ public class GetAzureAutomationJob : AzureAutomationBaseCmdlet
          /// <summary> 
          /// Gets or sets the runbook name of the job. 
          /// </summary> 
-         [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByRunbookName, Mandatory = true, HelpMessage = "The runbook name of the job.")] 
+         [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByRunbookName, Mandatory = true, HelpMessage = "The runbook name of the job.")]
+         [Alias("Name")] 
          public string RunbookName { get; set; }
 
          /// <summary> 
diff --git a/src/ServiceManagement/Automation/Commands.Automation/Cmdlet/GetAzureAutomationJobOutput.cs b/src/ServiceManagement/Automation/Commands.Automation/Cmdlet/GetAzureAutomationJobOutput.cs
@@ -32,7 +32,7 @@ public class GetAzureAutomationJobOutput : AzureAutomationBaseCmdlet
         /// Gets or sets the job id
         /// </summary>
         [Alias("JobId")]
-        [Parameter(Mandatory = true, Position = 0, ValueFromPipelineByPropertyName = true, HelpMessage = "The job name or Id")]
+        [Parameter(Mandatory = true, Position = 1, ValueFromPipelineByPropertyName = true, HelpMessage = "The job name or Id")]
         public Guid Id { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The stream type. Defaults to Any.")]
diff --git a/src/ServiceManagement/Automation/Commands.Automation/Cmdlet/StartAzureAutomationRunbook.cs b/src/ServiceManagement/Automation/Commands.Automation/Cmdlet/StartAzureAutomationRunbook.cs
@@ -30,7 +30,7 @@ public class StartAzureAutomationRunbook : AzureAutomationBaseCmdlet
         /// <summary>
         /// Gets or sets the runbook name
         /// </summary>
-        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByRunbookName, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The runbook name.")]
+        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByRunbookName, Position = 1, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The runbook name.")]
         [ValidateNotNullOrEmpty]
         [Alias("RunbookName")]
         public string Name { get; set; }
diff --git a/src/ServiceManagement/Automation/Commands.Automation/Common/AutomationClient.cs b/src/ServiceManagement/Automation/Commands.Automation/Common/AutomationClient.cs
@@ -107,7 +107,7 @@ public void DeleteSchedule(string automationAccountName, string scheduleName)
             }
             catch (CloudException cloudException)
             {
-                if (cloudException.Response.StatusCode == HttpStatusCode.NotFound)
+                if (cloudException.Response.StatusCode == HttpStatusCode.NoContent)
                 {
                     throw new ResourceNotFoundException(typeof(Schedule),
                         string.Format(CultureInfo.CurrentCulture, Resources.ScheduleNotFound, scheduleName));
@@ -144,6 +144,8 @@ public Schedule UpdateSchedule(string automationAccountName, string scheduleName
         {
             AutomationManagement.Models.Schedule scheduleModel = this.GetScheduleModel(automationAccountName,
                 scheduleName);
+            isEnabled = (isEnabled.HasValue) ? isEnabled : scheduleModel.Properties.IsEnabled;
+            description = description ?? scheduleModel.Properties.Description; ;
             return this.UpdateScheduleHelper(automationAccountName, scheduleModel, isEnabled, description);
         }
 
@@ -228,7 +230,20 @@ public Runbook CreateRunbookByPath(string automationAccountName, string runbookP
 
         public void DeleteRunbook(string automationAccountName, string runbookName)
         {
-            this.automationManagementClient.Runbooks.Delete(automationAccountName, runbookName);
+            try
+            {
+                this.automationManagementClient.Runbooks.Delete(automationAccountName, runbookName);
+            }
+            catch (CloudException cloudException)
+            {
+                if (cloudException.Response.StatusCode == HttpStatusCode.NoContent)
+                {
+                    throw new ResourceNotFoundException(typeof(Connection), string.Format(CultureInfo.CurrentCulture, Resources.RunbookNotFound, runbookName));
+                }
+
+                throw;
+            }
+
         }
 
         public Runbook UpdateRunbook(string automationAccountName, string runbookName, string description,
@@ -249,7 +264,7 @@ public Runbook UpdateRunbook(string automationAccountName, string runbookName, s
             runbookUpdateParameters.Properties =  new RunbookUpdateProperties();
             runbookUpdateParameters.Properties.Description = description ?? runbookModel.Properties.Description;
             runbookUpdateParameters.Properties.LogProgress = (logProgress.HasValue) ?  logProgress.Value : runbookModel.Properties.LogProgress;
-            runbookUpdateParameters.Properties.LogVerbose = (logProgress.HasValue) ? logProgress.Value : runbookModel.Properties.LogVerbose;
+            runbookUpdateParameters.Properties.LogVerbose = (logVerbose.HasValue) ? logVerbose.Value : runbookModel.Properties.LogVerbose;
 
             var runbook = this.automationManagementClient.Runbooks.Update(automationAccountName, runbookUpdateParameters).Runbook;
 
@@ -266,8 +281,8 @@ public RunbookDefinition UpdateRunbookDefinition(string automationAccountName, s
                     string.Format(CultureInfo.CurrentCulture, Resources.RunbookNotFound, runbookName));
             }
 
-            if ((0 ==
-                 String.Compare(runbook.Properties.State, RunbookState.Edit, CultureInfo.InvariantCulture,
+            if ((0 !=
+                 String.Compare(runbook.Properties.State, RunbookState.Published, CultureInfo.InvariantCulture,
                      CompareOptions.IgnoreCase) && overwrite == false))
             {
                 throw new ResourceCommonException(typeof(Runbook),
@@ -295,19 +310,40 @@ public IEnumerable<RunbookDefinition> ListRunbookDefinitionsByRunbookName(string
                     string.Format(CultureInfo.CurrentCulture, Resources.RunbookNotFound, runbookName));
             }
 
-            if (0 !=
-                String.Compare(runbook.Properties.State, RunbookState.Published, CultureInfo.InvariantCulture,
-                    CompareOptions.IgnoreCase) && isDraft != null && isDraft.Value == true)
+            var draftContent = String.Empty;
+            var publishedContent = String.Empty;
+
+            if (0 != String.Compare(runbook.Properties.State, RunbookState.Published, CultureInfo.InvariantCulture, CompareOptions.IgnoreCase))
             {
-                var draftContent =
-                    this.automationManagementClient.RunbookDraft.Content(automationAccountName, runbookName).Stream;
-                ret.Add(new RunbookDefinition(automationAccountName, runbook, draftContent, Constants.Draft));
+                draftContent = this.automationManagementClient.RunbookDraft.Content(automationAccountName, runbookName).Stream;
             }
-            else
+            if (0 != String.Compare(runbook.Properties.State, RunbookState.New, CultureInfo.InvariantCulture, CompareOptions.IgnoreCase))
             {
-                var publishedContent =
-                    this.automationManagementClient.Runbooks.Content(automationAccountName, runbookName).Stream;
-                ret.Add(new RunbookDefinition(automationAccountName, runbook, publishedContent, Constants.Published));
+                publishedContent = this.automationManagementClient.Runbooks.Content(automationAccountName, runbookName).Stream;
+            }
+
+            // if no slot specified return both draft and publish content
+            if (false == isDraft.HasValue)
+            {
+                if (false == String.IsNullOrEmpty(draftContent)) ret.Add(new RunbookDefinition(automationAccountName, runbook, draftContent, Constants.Draft));
+                if (false == String.IsNullOrEmpty(publishedContent)) ret.Add(new RunbookDefinition(automationAccountName, runbook, publishedContent, Constants.Published));
+            }
+            else 
+            {
+                if (isDraft.Value == true)
+                {
+
+                    if (String.IsNullOrEmpty(draftContent)) throw new ResourceCommonException(typeof(Runbook),
+                            string.Format(CultureInfo.CurrentCulture, Resources.RunbookHasNoDraftVersion, runbookName));
+                    if (false == String.IsNullOrEmpty(draftContent)) ret.Add(new RunbookDefinition(automationAccountName, runbook, draftContent, Constants.Draft));
+                }
+                else
+                {
+                    if (String.IsNullOrEmpty(publishedContent)) throw new ResourceCommonException(typeof(Runbook),
+                            string.Format(CultureInfo.CurrentCulture, Resources.RunbookHasNoPublishedVersion, runbookName));
+
+                    if (false == String.IsNullOrEmpty(publishedContent)) ret.Add(new RunbookDefinition(automationAccountName, runbook, publishedContent, Constants.Published));
+                }
             }
 
             return ret;
@@ -421,10 +457,15 @@ public void DeleteVariable(string automationAccountName, string variableName)
                     this.automationManagementClient.Variables.Delete(automationAccountName, variableName);
                 }
             }
-            catch (ResourceNotFoundException)
+            catch (CloudException cloudException)
             {
-                // the variable does not exists or already deleted. Do nothing. Return.
-                return;
+                if (cloudException.Response.StatusCode == HttpStatusCode.NoContent)
+                {
+                    throw new ResourceNotFoundException(typeof(Variable),
+                        string.Format(CultureInfo.CurrentCulture, Resources.VariableNotFound, variableName));
+                }
+
+                throw;
             }
         }
 
@@ -583,10 +624,11 @@ public CredentialInfo CreateCredential(string automationAccountName, string name
         public CredentialInfo UpdateCredential(string automationAccountName, string name, string userName, string password,
             string description)
         {
+            var exisitngCredential = this.GetCredential(automationAccountName, name);
             var credentialUpdateParams = new AutomationManagement.Models.CredentialUpdateParameters();
             credentialUpdateParams.Name = name;
             credentialUpdateParams.Properties = new AutomationManagement.Models.CredentialUpdateProperties();
-            if (description != null) credentialUpdateParams.Properties.Description = description;
+            credentialUpdateParams.Properties.Description = description ?? exisitngCredential.Description;
 
             credentialUpdateParams.Properties.UserName = userName;
             credentialUpdateParams.Properties.Password = password;
@@ -647,7 +689,7 @@ public void DeleteCredential(string automationAccountName, string name)
             {
                 if (cloudException.Response.StatusCode == HttpStatusCode.NotFound)
                 {
-                    throw new ResourceNotFoundException(typeof(Schedule), string.Format(CultureInfo.CurrentCulture, Resources.CredentialNotFound, name));
+                    throw new ResourceNotFoundException(typeof(Credential), string.Format(CultureInfo.CurrentCulture, Resources.CredentialNotFound, name));
                 }
 
                 throw;
@@ -757,9 +799,9 @@ public void DeleteModule(string automationAccountName, string name)
             }
             catch (CloudException cloudException)
             {
-                if (cloudException.Response.StatusCode == HttpStatusCode.NotFound)
+                if (cloudException.Response.StatusCode == HttpStatusCode.NoContent)
                 {
-                    throw new ResourceNotFoundException(typeof(Schedule), string.Format(CultureInfo.CurrentCulture, Resources.ModuleNotFound, name));
+                    throw new ResourceNotFoundException(typeof(Module), string.Format(CultureInfo.CurrentCulture, Resources.ModuleNotFound, name));
                 }
 
                 throw;
@@ -1129,7 +1171,19 @@ public IEnumerable<CertificateInfo> ListCertificates(string automationAccountNam
 
         public void DeleteCertificate(string automationAccountName, string name)
         {
-            this.automationManagementClient.Certificates.Delete(automationAccountName, name);
+            try
+            {
+                this.automationManagementClient.Certificates.Delete(automationAccountName, name);
+            }
+            catch (CloudException cloudException)
+            {
+                if (cloudException.Response.StatusCode == HttpStatusCode.NoContent)
+                {
+                    throw new ResourceNotFoundException(typeof(Schedule), string.Format(CultureInfo.CurrentCulture, Resources.CertificateNotFound, name));
+                }
+
+                throw;
+            }
         }
 
         #endregion 
@@ -1230,7 +1284,19 @@ public IEnumerable<Connection> ListConnections(string automationAccountName)
 
         public void DeleteConnection(string automationAccountName, string name)
         {
-            this.automationManagementClient.Connections.Delete(automationAccountName, name);
+            try
+            {
+                this.automationManagementClient.Connections.Delete(automationAccountName, name);
+            }
+            catch (CloudException cloudException)
+            {
+                if (cloudException.Response.StatusCode == HttpStatusCode.NoContent)
+                {
+                    throw new ResourceNotFoundException(typeof(Connection), string.Format(CultureInfo.CurrentCulture, Resources.ConnectionNotFound, name));
+                }
+
+                throw;
+            }
         }
 
         #endregion
diff --git a/src/ServiceManagement/Automation/Commands.Automation/Model/AutomationAccount.cs b/src/ServiceManagement/Automation/Commands.Automation/Model/AutomationAccount.cs
@@ -39,8 +39,6 @@ public AutomationAccount(AutomationManagement.Models.CloudService cloudService,
 
             this.AutomationAccountName = resource.Name;
             this.Location = cloudService.GeoRegion;
-            this.Plan = resource.Plan;
-
             switch (resource.State)
             {
                 case AutomationManagement.Models.AutomationResourceState.Started:
@@ -53,6 +51,8 @@ public AutomationAccount(AutomationManagement.Models.CloudService cloudService,
                     this.State = resource.State;
                     break;
             }
+
+            if (resource.IntrinsicSettings != null) this.Plan = resource.IntrinsicSettings.SubscriptionPlan;
         }
 
         /// <summary>
diff --git a/src/ServiceManagement/Automation/Commands.Automation/Model/Job.cs b/src/ServiceManagement/Automation/Commands.Automation/Model/Job.cs
@@ -39,13 +39,10 @@ public Job(string accountName, Azure.Management.Automation.Models.Job job)
             Requires.Argument("accountName", accountName).NotNull();
 
             this.AutomationAccountName = accountName;
-            this.Location = job.Location;
-            this.Type = job.Type;
-            this.Tags = job.Tags ?? new Dictionary<string, string>();
-            this.Id = Guid.Parse(job.Name);
 
             if (job.Properties == null) return;
 
+            this.Id = job.Properties.JobId;
             this.CreationTime = job.Properties.CreationTime.ToLocalTime();
             this.LastModifiedTime = job.Properties.LastModifiedTime.ToLocalTime();
             this.StartTime = job.Properties.StartTime;
@@ -75,21 +72,6 @@ public Job()
         /// </summary>
         public Guid Id { get; set; }
 
-        /// <summary>
-        /// Gets or sets the location.
-        /// </summary>
-        public string Location { get; set; }
-
-        /// <summary>
-        /// Gets or sets the type.
-        /// </summary>
-        public string Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags.
-        /// </summary>
-        public IDictionary<string, string> Tags { get; set; }
-
         /// <summary>
         /// Gets or sets the tags.
         /// </summary>
diff --git a/src/ServiceManagement/Automation/Commands.Automation/Properties/Resources.Designer.cs b/src/ServiceManagement/Automation/Commands.Automation/Properties/Resources.Designer.cs
diff --git a/src/ServiceManagement/Automation/Commands.Automation/Properties/Resources.resx b/src/ServiceManagement/Automation/Commands.Automation/Properties/Resources.resx
@@ -172,7 +172,8 @@
     <comment>Automation</comment>
   </data>
   <data name="ResourceExists" xml:space="preserve">
-    <value>Resource exists.</value>
+    <value>Resource exist.</value>
+    <comment>Automation</comment>
   </data>
   <data name="RunbookNotFound" xml:space="preserve">
     <value>The Runbook was not found. Runbook name: {0}.</value>
@@ -247,7 +248,7 @@
     <comment>Automation</comment>
   </data>
   <data name="ResourceNotFound" xml:space="preserve">
-    <value>Resource does not exists.</value>
+    <value>Resource does not exist.</value>
     <comment>Automation</comment>
   </data>
   <data name="ConnectionAlreadyExists" xml:space="preserve">
@@ -266,4 +267,8 @@
     <value>Password and Exportable parameters cannot be updated for an existing certificate. They can only be specified when overwriting this certificate with a new one, via the Path parameter</value>
     <comment>Automation</comment>
   </data>
+  <data name="RunbookHasNoDraftVersion" xml:space="preserve">
+    <value>The runbook has no draft version. Runbook name {0}.</value>
+    <comment>Automation</comment>
+  </data>
 </root>

Original file line number	Diff line number	Diff line change
`@@ -85,9 +85,9 @@ public override void ExecuteCmdlet()`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
`88`		`- if (cloudException.Response.StatusCode == HttpStatusCode.NoContent \|\| cloudException.Response.StatusCode == HttpStatusCode.NotFound)`
	`88`	`+ if (cloudException.Response.StatusCode == HttpStatusCode.NotFound)`
`89`	`89`	`{`
`90`		`- throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Resources.ResourceNotFound), cloudException);`
	`90`	`+ throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Resources.AutomationAccountNotFound), cloudException);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`throw;`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,6 @@ public AutomationAccount(AutomationManagement.Models.CloudService cloudService,`
`39`	`39`
`40`	`40`	`this.AutomationAccountName = resource.Name;`
`41`	`41`	`this.Location = cloudService.GeoRegion;`
`42`		`- this.Plan = resource.Plan;`
`43`		`-`
`44`	`42`	`switch (resource.State)`
`45`	`43`	`{`
`46`	`44`	`case AutomationManagement.Models.AutomationResourceState.Started:`
`@@ -53,6 +51,8 @@ public AutomationAccount(AutomationManagement.Models.CloudService cloudService,`
`53`	`51`	`this.State = resource.State;`
`54`	`52`	`break;`
`55`	`53`	`}`
	`54`	`+`
	`55`	`+ if (resource.IntrinsicSettings != null) this.Plan = resource.IntrinsicSettings.SubscriptionPlan;`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/// <summary>`