Merge pull request Azure#1387 from vivsriaus/FixSetResource

Do not get nested deployment operations if the nested deployment is i…

Author: Hovsep

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

@@ -324,6 +324,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ActiveDirectoryTests\TestGetADUserWithMail.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.DeploymentTests\TestNestedDeploymentFromTemplateFile.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.DeploymentTests\TestNewDeploymentFromTemplateFile.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -553,6 +556,12 @@
     <None Include="sampleTemplateParams.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="sampleNestedTemplate.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="sampleNestedTemplateParams.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

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

@@ -30,6 +30,12 @@ public void TestNewDeploymentFromTemplateFile()
             ResourcesController.NewInstance.RunPsTest("Test-NewDeploymentFromTemplateFile");
         }
 
+        [Fact]
+        public void TestNestedDeploymentFromTemplateFile()
+        {
+            ResourcesController.NewInstance.RunPsTest("Test-NestedDeploymentFromTemplateFile");
+        }
+
         [Fact(Skip = "Fix acquisition of TenantId in KeyVault Test.")]
         public void TestNewDeploymentWithKeyVaultReference()
         {

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

@@ -68,6 +68,41 @@ function Test-NewDeploymentFromTemplateFile
     }
 }
 
+<#
+.SYNOPSIS
+Tests nested deployment.
+#>
+function Test-NestedDeploymentFromTemplateFile
+{
+	# Setup
+	$rgname = Get-ResourceGroupName
+	$rname = Get-ResourceName
+	$rglocation = Get-ProviderLocation ResourceManagement
+	$location = Get-ProviderLocation "Microsoft.Web/sites"
+
+	try
+	{
+		# Test
+		New-AzureRmResourceGroup -Name $rgname -Location $rglocation
+		
+		$deployment = New-AzureRmResourceGroupDeployment -Name $rname -ResourceGroupName $rgname -TemplateFile sampleNestedTemplate.json -TemplateParameterFile sampleNestedTemplateParams.json
+
+		# Assert
+		Assert-AreEqual Succeeded $deployment.ProvisioningState
+
+		$subId = (Get-AzureRmContext).Subscription.SubscriptionId
+		$deploymentId = "/subscriptions/$subId/resourcegroups/$rgname/providers/Microsoft.Resources/deployments/$rname"
+		$getById = Get-AzureRmResourceGroupDeployment -Id $deploymentId
+		Assert-AreEqual $getById.DeploymentName $deployment.DeploymentName
+	}
+	
+	finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}
+
 <#
 .SYNOPSIS
 Tests deployment via template file and parameter file with KeyVault reference.

src/ResourceManager/Resources/Commands.Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.DeploymentTests/TestNestedDeploymentFromTemplateFile.json

@@ -0,0 +1,29 @@
+{
+	"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+	"contentVersion": "1.0.0.0",
+	"parameters": {
+		"StorageAccountName": {
+			"type": "String"
+		}
+	},
+	"variables": {
+		"templatelink": "https://raw.githubusercontent.com/vivsriaus/armtemplates/master/newStorageAccount.json"
+	},
+	"resources": [{
+		"apiVersion": "2015-01-01",
+		"name": "nestedTemplate",
+		"type": "Microsoft.Resources/deployments",
+		"properties": {
+			"mode": "incremental",
+			"templateLink": {
+				"uri": "[variables('templatelink')]",
+				"contentVersion": "1.0.0.0"
+			},
+			"parameters": {
+				"StorageAccountName": {
+					"value": "[parameters('StorageAccountName')]"
+				}
+			}
+		}
+	}]
+}

src/ResourceManager/Resources/Commands.Resources.Test/sampleNestedTemplate.json

@@ -0,0 +1,9 @@
+{
+    "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {
+        "StorageAccountName": {
+            "value": "testvivek52134"
+        }
+    }
+}

src/ResourceManager/Resources/Commands.Resources.Test/sampleNestedTemplateParams.json

@@ -23,6 +23,7 @@
 using Hyak.Common;
 using Microsoft.Azure.Commands.Resources.Models.Authorization;
 using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
+using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Utilities;
 using Microsoft.Azure.Commands.Tags.Model;
 using Microsoft.Azure.Common.Authentication;
 using Microsoft.Azure.Common.Authentication.Models;
@@ -34,6 +35,7 @@
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using Newtonsoft.Json;
 using ProjectResources = Microsoft.Azure.Commands.Resources.Properties.Resources;
+using System.Net;
 
 namespace Microsoft.Azure.Commands.Resources.Models
 {
@@ -340,16 +342,21 @@ private List<DeploymentOperation> GetNewOperations(List<DeploymentOperation> old
                 //If nested deployment, get the operations under those deployments as well
                 if(operation.Properties.TargetResource.ResourceType.Equals(Constants.MicrosoftResourcesDeploymentType, StringComparison.OrdinalIgnoreCase))
                 {
-                    List<DeploymentOperation> newNestedOperations = new List<DeploymentOperation>();
-                    DeploymentOperationsListResult result;
+                    HttpStatusCode statusCode;
+                    Enum.TryParse<HttpStatusCode>(operation.Properties.StatusCode, out statusCode);
+                    if(!statusCode.IsClientFailureRequest())
+                    {
+                        List<DeploymentOperation> newNestedOperations = new List<DeploymentOperation>();
+                        DeploymentOperationsListResult result;
 
-                    result = ResourceManagementClient.DeploymentOperations.List(
-                        resourceGroupName: ResourceIdUtility.GetResourceGroupName(operation.Properties.TargetResource.Id),
-                        deploymentName: operation.Properties.TargetResource.ResourceName,
-                        parameters: null);
+                        result = ResourceManagementClient.DeploymentOperations.List(
+                            resourceGroupName: ResourceIdUtility.GetResourceGroupName(operation.Properties.TargetResource.Id),
+                            deploymentName: operation.Properties.TargetResource.ResourceName,
+                            parameters: null);
 
-                    newNestedOperations = GetNewOperations(operations, result.Operations);
-                    newOperations.AddRange(newNestedOperations);
+                        newNestedOperations = GetNewOperations(operations, result.Operations);
+                        newOperations.AddRange(newNestedOperations);
+                    }
                 }
             }