Merge pull request #287 from safeermohammed/dev

Automation cmdlets bug fixes and updated with Automation SDK version  1.0.1

Author: markcowl

src/Common/Commands.ScenarioTest/Resources/Automation/AutomationTests.ps1

@@ -17,7 +17,7 @@
 Checks whether the first string contains the second one
 #>
 
-$accountName='safeer'
+$accountName='account'
 $location = "East US"
 
 function AssertContains

src/ServiceManagement/Automation/Commands.Automation/Cmdlet/NewAzureAutomationCertificate.cs

@@ -19,6 +19,7 @@
 using System.Security.Permissions;
 using Microsoft.Azure.Commands.Automation.Model;
 using Microsoft.Azure.Commands.Automation.Common;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.Azure.Commands.Automation.Cmdlet
 {
@@ -71,7 +72,7 @@ public class NewAzureAutomationCertificate : AzureAutomationBaseCmdlet
         protected override void AutomationExecuteCmdlet()
         {
 
-            var createdCertificate = this.AutomationClient.CreateCertificate(this.AutomationAccountName, this.Name, this.Path, this.Password, this.Description, this.Exportable.IsPresent);
+            var createdCertificate = this.AutomationClient.CreateCertificate(this.AutomationAccountName, this.Name, this.ResolvePath(this.Path), this.Password, this.Description, this.Exportable.IsPresent);
 
             this.WriteObject(createdCertificate);
         }

src/ServiceManagement/Automation/Commands.Automation/Cmdlet/SetAzureAutomationCertificate.cs

@@ -19,6 +19,7 @@
 using System.Security.Permissions;
 using Microsoft.Azure.Commands.Automation.Model;
 using Microsoft.Azure.Commands.Automation.Common;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.Azure.Commands.Automation.Cmdlet
 {
@@ -71,7 +72,7 @@ public class SetAzureAutomationCertificate : AzureAutomationBaseCmdlet
         protected override void AutomationExecuteCmdlet()
         {
 
-            var updateddCertificate = this.AutomationClient.UpdateCertificate(this.AutomationAccountName, this.Name, this.Path, this.Password, this.Description, this.Exportable);
+            var updateddCertificate = this.AutomationClient.UpdateCertificate(this.AutomationAccountName, this.Name, this.ResolvePath(this.Path), this.Password, this.Description, this.Exportable);
 
             this.WriteObject(updateddCertificate);
         }

src/ServiceManagement/Automation/Commands.Automation/Commands.Automation.csproj

@@ -92,8 +92,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.0.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Management.Automation">
-      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Automation.1.0.0\lib\net40\Microsoft.WindowsAzure.Management.Automation.dll</HintPath>
+    <Reference Include="Microsoft.WindowsAzure.Management.Automation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Automation.1.0.1\lib\net40\Microsoft.WindowsAzure.Management.Automation.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -195,6 +196,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="Common\RequestSettings.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Microsoft.Azure.Commands.Automation.dll-help.xml">

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

@@ -53,5 +53,7 @@ public class AutomationAccountState
 
         public const int PsCommandValueDepth = 10;
 
+        public const string ClientRequestIdHeaderName = "x-ms-client-request-id";
+
     }
 }

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

@@ -0,0 +1,41 @@
+// ----------------------------------------------------------------------------------
+//
+// 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.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Azure.Commands.Automation.Common;
+using Microsoft.WindowsAzure.Management.Automation;
+
+namespace Microsoft.Azure.Commands.Automation
+{
+    public class RequestSettings : IDisposable
+    {
+        private readonly AutomationManagementClient client;
+
+        public RequestSettings(IAutomationManagementClient automationClient)
+        {
+            client = ((AutomationManagementClient)automationClient);
+            client.HttpClient.DefaultRequestHeaders.Remove(Constants.ClientRequestIdHeaderName);
+            client.HttpClient.DefaultRequestHeaders.Add(Constants.ClientRequestIdHeaderName, Guid.NewGuid().ToString());
+        }
+        
+        public void Dispose()
+        {
+            client.HttpClient.DefaultRequestHeaders.Remove(Constants.ClientRequestIdHeaderName);
+        }
+    }
+}