Merge pull request #1227 from vivsriaus/release1

Instantiate cmdlet header values before getting Api version

Author: markcowl

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Resource/FindAzureResourceCmdlet.cs

@@ -391,11 +391,8 @@ private async Task<Resource<JToken>> GetPopulatedResource(Resource<JToken> resou
         {
             try
             {
-                var apiVersion = await ApiVersionHelper
-                    .DetermineApiVersion(
-                        DefaultContext,
+                var apiVersion = await this.DetermineApiVersion(
                         resourceId: resource.Id,
-                        cancellationToken: this.CancellationToken.Value,
                         pre: this.Pre)
                     .ConfigureAwait(continueOnCapturedContext: false);
 

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Resource/GetAzureResourceCmdlet.cs

@@ -461,12 +461,9 @@ private async Task<Resource<JToken>> GetPopulatedResource(Resource<JToken> resou
         {
             try
             {
-                var apiVersion = await ApiVersionHelper
-                    .DetermineApiVersion(
-                        DefaultContext,
-                        resourceId: resource.Id,
-                        cancellationToken: this.CancellationToken.Value,
-                        pre: this.Pre)
+                var apiVersion = await this.DetermineApiVersion(
+                    resourceId: resource.Id,
+                    pre: this.Pre)
                     .ConfigureAwait(continueOnCapturedContext: false);
 
                 return await this

src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj

@@ -486,6 +486,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ActiveDirectoryTests\TestNewADServicePrincipal.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceTests\TestGetResourceWithExpandProperties.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceTests\TestMoveAResourceTest.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -551,4 +554,4 @@
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
-</Project>
+</Project>

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceTests.cs

@@ -77,13 +77,14 @@ public void TestGetResourcesViaPipingFromAnotherResource()
             ResourcesController.NewInstance.RunPsTest("Test-GetResourcesViaPipingFromAnotherResource");
         }
 
-        [Fact(Skip = "Need to re-record test")] 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestMoveAResourceTest()
         {
             ResourcesController.NewInstance.RunPsTest("Test-MoveAResource");
         }
 
-        [Fact(Skip = "TODO: Re-record. Test not working Live due to infra issues in Profile")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestSetAResourceTest()
         {
@@ -96,5 +97,12 @@ public void TestFindAResourceTest()
         {
             ResourcesController.NewInstance.RunPsTest("Test-FindAResource");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestGetResourceWithExpandProperties()
+        {
+            ResourcesController.NewInstance.RunPsTest("Test-GetResourceExpandProperties");
+        }
     }
 }

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceTests.ps1

@@ -299,4 +299,26 @@ function Test-FindAResource
 	New-AzureRmResource -Name $rname2 -Location $rglocation -Tags @{Name = "testtag"; Value = "testval"} -ResourceGroupName $rgname -ResourceType $resourceType -PropertyObject @{"key" = "value"} -SkuObject @{ Name = "A0" } -ApiVersion $apiversion -Force
 	$expected = Find-AzureRmResource -ResourceNameContains test -ResourceGroupNameContains $rgname
 	Assert-AreEqual 2 @($expected).Count
+}
+
+<#
+.SYNOPSIS
+Tests getting a resource with properties expanded
+#>
+function Test-GetResourceExpandProperties
+{
+	# Setup
+	$rgname = Get-ResourceGroupName
+	$rname = Get-ResourceName
+	$rglocation = Get-ProviderLocation ResourceManagement
+	$apiversion = "2014-04-01"
+	$resourceType = "Providers.Test/statefulResources"
+
+	# Test
+	New-AzureRmResourceGroup -Name $rgname -Location $rglocation
+	$resource = New-AzureRmResource -Name $rname -Location $rglocation -Tags @{Name = "testtag"; Value = "testval"} -ResourceGroupName $rgname -ResourceType $resourceType -PropertyObject @{"key" = "value"} -SkuObject @{ Name = "A0" } -ApiVersion $apiversion -Force
+	$resourceGet = Get-AzureRmResource -ResourceName $rname -ResourceGroupName $rgname -ExpandProperties
+
+	# Assert
+	Assert-AreEqual $resourceGet.Properties.key "value"
 }