Merge pull request Azure#1393 from AzureAutomationTeam/dev

Dev: Azure Automation cmdlet changes

Author: jianghaolu

src/ResourceManager/Automation/Commands.Automation/Commands.Automation.csproj

@@ -227,6 +227,7 @@
     <Compile Include="Model\DscOnboardingMetaconfig.cs" />
     <Compile Include="Model\Job.cs" />
     <Compile Include="Model\JobSchedule.cs" />
+    <Compile Include="Model\JobStreamRecord.cs" />
     <Compile Include="Model\JobStream.cs" />
     <Compile Include="Model\Module.cs" />
     <Compile Include="Model\NodeConfiguration.cs" />

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

@@ -989,6 +989,13 @@ public IEnumerable<JobStream> GetJobStream(string resourceGroupName, string auto
                     stream => this.CreateJobStreamFromJobStreamModel(stream, resourceGroupName, automationAccountName, jobId));
         }
 
+        public JobStreamRecord GetJobStreamRecord(string resourceGroupName, string automationAccountName, Guid jobId, string jobStreamId)
+        {
+            var response = this.automationManagementClient.JobStreams.Get(resourceGroupName, automationAccountName, jobId, jobStreamId);
+
+            return new JobStreamRecord(response.JobStream, resourceGroupName, automationAccountName, jobId);
+        }
+
         public Job GetJob(string resourceGroupName, string automationAccountName, Guid Id)
         {
             var job = this.automationManagementClient.Jobs.Get(resourceGroupName, automationAccountName, Id).Job;

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

@@ -809,6 +809,7 @@ public void RegisterDscNode(string resourceGroupName,
             templateParameters.Add("rebootNodeIfNeeded", rebootFlag);
             templateParameters.Add("actionAfterReboot", actionAfterReboot);
             templateParameters.Add("allowModuleOverwrite", moduleOverwriteFlag);
+            templateParameters.Add("timestamp", DateTimeOffset.UtcNow.ToString("o"));
 
             // invoke the New-AzureRmResourceGroupDeployment cmdlet
             using (Pipeline pipe = Runspace.DefaultRunspace.CreateNestedPipeline())

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

@@ -38,6 +38,8 @@ public class Constants
 
         public const string ClientRequestIdHeaderName = "x-ms-client-request-id";
 
+        public const string ActivityIdHeaderName = "x-ms-activity-id";
+
         // default schedule expiry time for daily schedule, consistent with UX
         // 12/31/9999 12:00:00 AM
         public static readonly DateTimeOffset DefaultScheduleExpiryTime = DateTimeOffset.MaxValue;
@@ -59,13 +61,15 @@ public class AutomationAccountState
 
         public const int PsCommandValueDepth = 10;
 
+        public const int JobSummaryLength = 80;
+
         // The template file is a json
-        public const string TemplateFile = @"https://eus2oaasibizamarketprod1.blob.core.windows.net/automationdscpreview/azuredeploy.json";
+        public const string TemplateFile = @"https://eus2oaasibizamarketprod1.blob.core.windows.net/automationdscpreview/azuredeployV2.json";
 
         // The metaconfig file
-        public const string ModulesUrl = @"https://eus2oaasibizamarketprod1.blob.core.windows.net/automationdscpreview/RegistrationMetaConfig.zip";
+        public const string ModulesUrl = @"https://eus2oaasibizamarketprod1.blob.core.windows.net/automationdscpreview/RegistrationMetaConfigV2.zip";
 
-        public const string ConfigurationFunction = @"RegistrationMetaConfig.ps1\RegistrationMetaConfig";
+        public const string ConfigurationFunction = @"RegistrationMetaConfigV2.ps1\RegistrationMetaConfigV2";
 
 
         public static class RunbookType

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

@@ -235,6 +235,8 @@ Model.Webhook CreateWebhook(
         IEnumerable<JobStream> GetJobStream(string resourceGroupName, string automationAccountName, Guid jobId,
             DateTimeOffset? time, string streamType, ref string nextLink);
 
+        JobStreamRecord GetJobStreamRecord(string resourceGroupName, string automationAccountName, Guid jobId, string jobStreamId);
+
         #endregion
 
         #region Certificates

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

@@ -14,6 +14,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.Eventing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -31,6 +32,11 @@ public RequestSettings(IAutomationManagementClient automationClient)
             client = ((AutomationManagementClient)automationClient);
             client.HttpClient.DefaultRequestHeaders.Remove(Constants.ClientRequestIdHeaderName);
             client.HttpClient.DefaultRequestHeaders.Add(Constants.ClientRequestIdHeaderName, Guid.NewGuid().ToString());
+
+            client.HttpClient.DefaultRequestHeaders.Remove(Constants.ActivityIdHeaderName);
+            var activityId = Guid.NewGuid();
+            EventProvider.SetActivityId(ref activityId);
+            client.HttpClient.DefaultRequestHeaders.Add(Constants.ActivityIdHeaderName, activityId.ToString());
         }
 
         public void Dispose()
@@ -43,6 +49,7 @@ protected virtual void Dispose(bool disposing)
             if (disposing)
             {
                 client.HttpClient.DefaultRequestHeaders.Remove(Constants.ClientRequestIdHeaderName);
+                client.HttpClient.DefaultRequestHeaders.Remove(Constants.ActivityIdHeaderName);
             }
         }
     }

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

@@ -50,7 +50,7 @@ public Job(string resourceGroupName, string accountName, Azure.Management.Automa
 
             if (job.Properties == null) return;
 
-            this.Id = job.Properties.JobId;
+            this.JobId = job.Properties.JobId;
             this.CreationTime = job.Properties.CreationTime.ToLocalTime();
             this.LastModifiedTime = job.Properties.LastModifiedTime.ToLocalTime();
             this.StartTime = job.Properties.StartTime.HasValue ? job.Properties.StartTime.Value.ToLocalTime() : (DateTimeOffset?)null;
@@ -105,7 +105,7 @@ public Job()
         /// <summary>
         /// Gets or sets the job id.
         /// </summary>
-        public Guid Id { get; set; }
+        public Guid JobId { get; set; }
 
         /// <summary>
         /// Gets or sets the tags.

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

@@ -13,6 +13,8 @@
 // ----------------------------------------------------------------------------------
 
 using System;
+using System.Collections;
+using System.Management.Automation;
 using Microsoft.Azure.Commands.Automation.Common;
 
 using AutomationManagement = Microsoft.Azure.Management.Automation;
@@ -45,13 +47,19 @@ public JobStream(AutomationManagement.Models.JobStream jobStream, string resourc
         {
             Requires.Argument("jobStream", jobStream).NotNull();
 
-            this.JobStreamId = jobStream.Properties.JobStreamId;
+            this.StreamRecordId = jobStream.Properties.JobStreamId;
             this.Type = jobStream.Properties.StreamType;
-            this.Text = jobStream.Properties.Summary;
             this.Time = jobStream.Properties.Time;
             this.AutomationAccountName = automationAccountName;
             this.ResourceGroupName = resourceGroupName;
-            this.Id = jobId;
+            this.JobId = jobId;
+
+            if (!String.IsNullOrWhiteSpace(jobStream.Properties.Summary))
+            {
+                this.Summary = jobStream.Properties.Summary.Length > Constants.JobSummaryLength ?
+                     jobStream.Properties.Summary.Substring(0, Constants.JobSummaryLength) + "..." :
+                     jobStream.Properties.Summary;
+            }
         }
 
         /// <summary>
@@ -74,22 +82,22 @@ public JobStream()
         /// <summary>
         /// Gets or sets the Job Id.
         /// </summary>
-        public Guid Id { get; set; }
+        public Guid JobId { get; set; }
 
         /// <summary>
-        /// Gets or sets the stream id
+        /// Gets or sets the stream record id
         /// </summary>
-        public string JobStreamId { get; set; }
+        public string StreamRecordId { get; set; }
 
         /// <summary>
         /// Gets or sets the stream time.
         /// </summary>
         public DateTimeOffset Time { get; set; }
 
         /// <summary>
-        /// Gets or sets the stream text.
+        /// Gets or sets the summary.
         /// </summary>
-        public string Text { get; set; }
+        public string Summary { get; set; }
 
         /// <summary>
         /// Gets or sets the stream Type.

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

@@ -0,0 +1,80 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Management.Automation;
+using Microsoft.Azure.Commands.Automation.Common;
+
+using AutomationManagement = Microsoft.Azure.Management.Automation;
+
+namespace Microsoft.Azure.Commands.Automation.Model
+{
+    /// <summary>
+    /// The Job Stream Record.
+    /// </summary>
+    public class JobStreamRecord : JobStream
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JobStreamRecord"/> class.
+        /// </summary>
+        /// <param name="jobStream">
+        /// The job stream.
+        /// </param>
+        /// <param name="resourceGroupName">
+        /// The resource group name.
+        /// </param>
+        /// <param name="automationAccountName">
+        /// The automation account name
+        /// </param>
+        /// <param name="jobId">
+        /// The job Id
+        /// </param>
+        /// <exception cref="System.ArgumentException">
+        /// </exception>
+        public JobStreamRecord(AutomationManagement.Models.JobStream jobStream, string resourceGroupName, string automationAccountName, Guid jobId ) : base (jobStream, resourceGroupName, automationAccountName, jobId)
+        {
+            this.Value = new Hashtable();
+            foreach (var kvp in jobStream.Properties.Value)
+            {
+                object paramValue;
+                try
+                {
+                    paramValue = ((object)PowerShellJsonConverter.Deserialize(kvp.Value.ToString()));
+                }
+                catch (CmdletInvocationException exception)
+                {
+                    if (!exception.Message.Contains("Invalid JSON primitive"))
+                        throw;
+
+                    paramValue = kvp.Value;
+                }
+                this.Value.Add(kvp.Key, paramValue);
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JobStreamRecord"/> class.
+        /// </summary>
+        public JobStreamRecord()
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the stream values.
+        /// </summary>
+        public Hashtable Value { get; set; }
+    }
+}