Fixed issues with TemplateSpec deployments in New-AzTenantDeployment … (#14179)

* Fixed issues with TemplateSpec deployments in New-AzTenantDeployment and New-AzManagementGroupDeployment

* Review fixes

* Modified and re-recorded Test-NewMGDeploymentFromTemplateSpec

Author: Xynoclafe

src/Resources/ResourceManager/Implementation/Deployments/NewAzureManagementGroupDeploymentCmdlet.cs

@@ -82,6 +82,7 @@ public class NewAzureManagementGroupDeploymentCmdlet : DeploymentCreateCmdlet
             QueryString = this.QueryString,
             TemplateFile = this.TemplateUri ?? this.TryResolvePath(this.TemplateFile),
             TemplateObject = this.TemplateObject,
+            TemplateSpecId = TemplateSpecId,
             TemplateParameterObject = this.GetTemplateParameterObject(this.TemplateParameterObject),
             ParameterUri = this.TemplateParameterUri,
             DeploymentDebugLogLevel = this.GetDeploymentDebugLogLevel(this.DeploymentDebugLogLevel),
@@ -94,6 +95,7 @@ public class NewAzureManagementGroupDeploymentCmdlet : DeploymentCreateCmdlet
             deploymentName: this.Name,
             location: this.Location,
             mode: DeploymentMode.Incremental,
+            templateSpecId: TemplateSpecId,
             queryString: this.QueryString,
             templateUri: this.TemplateUri ?? this.TryResolvePath(this.TemplateFile),
             templateObject: this.TemplateObject,

src/Resources/ResourceManager/Implementation/Deployments/NewAzureTenantDeploymentCmdlet.cs

@@ -77,6 +77,7 @@ public class NewAzureTenantDeploymentCmdlet: DeploymentCreateCmdlet
             QueryString = this.QueryString,
             TemplateFile = this.TemplateUri ?? this.TryResolvePath(this.TemplateFile),
             TemplateObject = this.TemplateObject,
+            TemplateSpecId = this.TemplateSpecId,
             TemplateParameterObject = this.GetTemplateParameterObject(this.TemplateParameterObject),
             ParameterUri = this.TemplateParameterUri,
             DeploymentDebugLogLevel = GetDeploymentDebugLogLevel(this.DeploymentDebugLogLevel),
@@ -91,6 +92,7 @@ public class NewAzureTenantDeploymentCmdlet: DeploymentCreateCmdlet
             queryString: this.QueryString,
             templateUri : TemplateUri ?? this.TryResolvePath(TemplateFile),
             templateObject : this.TemplateObject,
+            templateSpecId: TemplateSpecId,
             templateParametersUri : this.TemplateParameterUri,
             templateParametersObject : GetTemplateParameterObject(this.TemplateParameterObject),
             resultFormat : this.WhatIfResultFormat,

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

@@ -55,6 +55,38 @@ public void TestNewDeploymentTemplateSpec()
             TestRunner.RunTestScript("Test-NewDeploymentFromTemplateSpec");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.RunType, Category.CoreOnly)]
+        public void TestNewSubscriptionDeploymentTemplateSpec()
+        {
+            TestRunner.RunTestScript("Test-NewSubscriptionDeploymentFromTemplateSpec");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.RunType, Category.CoreOnly)]
+        public void TestNewFailedSubscriptionDeploymentTemplateSpec()
+        {
+            TestRunner.RunTestScript("Test-NewFailedSubscriptionDeploymentFromTemplateSpec");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.RunType, Category.CoreOnly)]
+        public void TestNewMGDeploymentTemplateSpec()
+        {
+            TestRunner.RunTestScript("Test-NewMGDeploymentFromTemplateSpec");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.RunType, Category.CoreOnly)]
+        public void TestNewTenantDeploymentTemplateSpec()
+        {
+            TestRunner.RunTestScript("Test-NewTenantDeploymentFromTemplateSpec");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestTestResourceGroupDeploymentErrors()

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

@@ -146,6 +146,155 @@ function Test-NewDeploymentFromTemplateSpec
     }
 }
 
+function Test-NewSubscriptionDeploymentFromTemplateSpec
+{
+	# Setup
+    $rgname = Get-ResourceGroupName
+    $rname = Get-ResourceName
+    $rglocation = "West US 2"
+    $subId = (Get-AzContext).Subscription.SubscriptionId
+
+	try
+	{
+		# Prepare our RG and basic template spec:
+
+		New-AzResourceGroup -Name $rgname -Location $rglocation
+
+        $sampleTemplateJson = Get-Content -Raw -Path "subscription_level_template.json"
+        $basicCreatedTemplateSpec = New-AzTemplateSpec -ResourceGroupName $rgname -Name $rname -Location $rgLocation -Version "v1" -TemplateJson $sampleTemplateJson
+
+		$resourceId = $basicCreatedTemplateSpec.Id + "/versions/v1"
+
+		#Create deployment
+		$deployment = New-AzSubscriptionDeployment -Name $rname -TemplateSpecId $resourceId -TemplateParameterFile "subscription_level_parameters.json" -Location $rglocation
+
+		# Assert
+		Assert-AreEqual Succeeded $deployment.ProvisioningState
+
+	}
+
+	finally
+    {
+        # Cleanup
+		Clean-DeploymentAtSubscription $deployment
+		Clean-ResourceGroup $rgname
+    }
+}
+
+function Test-NewFailedSubscriptionDeploymentFromTemplateSpec
+{
+	# Setup
+    $rgname = Get-ResourceGroupName
+    $rname = Get-ResourceName
+    $rglocation = "West US 2"
+    $subId = (Get-AzContext).Subscription.SubscriptionId
+
+	try
+	{
+		# Prepare our RG and basic template spec:
+
+		New-AzResourceGroup -Name $rgname -Location $rglocation
+
+		#Use template that will fail at subscription scope
+        $sampleTemplateJson = Get-Content -Raw -Path "subscription_level_template.json"
+        $basicCreatedTemplateSpec = New-AzTemplateSpec -ResourceGroupName $rgname -Name $rname -Location $rgLocation -Version "v1" -TemplateJson $sampleTemplateJson
+
+		$resourceId = $basicCreatedTemplateSpec.Id + "/versions/v1"
+
+		#Create deployment
+		try {
+			$deployment = New-AzSubscriptionDeployment -Name $rname -TemplateSpecId $resourceId -TemplateParameterFile "subscription_level_parameters.json" -Location $rglocation
+		}
+		Catch {
+			Assert-True { $Error[0].Contains("ResourceNotFound")}
+		}
+
+	}
+
+	finally
+    {
+        # Cleanup
+		Clean-DeploymentAtSubscription $deployment
+		Clean-ResourceGroup $rgname
+    }
+}
+
+function Test-NewMGDeploymentFromTemplateSpec
+{
+	# Setup
+    $rgname = Get-ResourceGroupName
+    $rname = Get-ResourceName
+	$managementGroupId = Get-ResourceName
+    $rglocation = "West US 2"
+    $subId = (Get-AzContext).Subscription.SubscriptionId
+
+	try
+	{
+		#Create New MG
+		New-AzManagementGroup -GroupName $managementGroupId -ParentId "/providers/Microsoft.Management/managementGroups/AzDeploymentsPSTest"
+
+		# Prepare our RG and basic template spec:
+
+		New-AzResourceGroup -Name $rgname -Location $rglocation
+
+        $sampleTemplateJson = Get-Content -Raw -Path "simpleTemplate.json"
+        $basicCreatedTemplateSpec = New-AzTemplateSpec -ResourceGroupName $rgname -Name $rname -Location $rgLocation -Version "v1" -TemplateJson $sampleTemplateJson
+
+		$resourceId = $basicCreatedTemplateSpec.Id + "/versions/v1"
+
+		#Create deployment
+		$deployment = New-AzManagementGroupDeployment -ManagementGroupId $managementGroupId -Name $rname -TemplateSpecId $resourceId -TemplateParameterFile "simpleTemplateParams.json" -Location $rglocation
+
+		# Assert
+		Assert-AreEqual Succeeded $deployment.ProvisioningState
+
+	}
+
+	finally
+    {
+        # Cleanup
+		Remove-AzManagementGroupDeployment -ManagementGroup $managementGroupId -Name $rname
+		Clean-ResourceGroup $rgname
+		Remove-AzManagementGroup -GroupName $managementGroupId
+    }
+}
+
+function Test-NewTenantDeploymentFromTemplateSpec
+{
+	# Setup
+    $rgname = Get-ResourceGroupName
+    $rname = Get-ResourceName
+    $rglocation = "West US 2"
+    $subId = (Get-AzContext).Subscription.SubscriptionId
+
+	try
+	{
+		# Prepare our RG and basic template spec:
+
+		New-AzResourceGroup -Name $rgname -Location $rglocation
+
+        $sampleTemplateJson = Get-Content -Raw -Path "simpleTemplate.json"
+        $basicCreatedTemplateSpec = New-AzTemplateSpec -ResourceGroupName $rgname -Name $rname -Location $rgLocation -Version "v1" -TemplateJson $sampleTemplateJson
+
+		$resourceId = $basicCreatedTemplateSpec.Id + "/versions/v1"
+
+		#Create deployment
+		$deployment = New-AzTenantDeployment -Name $rname -TemplateSpecId $resourceId -TemplateParameterFile "simpleTemplateParams.json" -Location $rglocation
+
+		# Assert
+		Assert-AreEqual Succeeded $deployment.ProvisioningState
+
+	}
+
+	finally
+    {
+        # Cleanup
+		Clean-ResourceGroup $rgname
+		Remove-AzTenantDeployment -Name $rname
+		Clean-DeploymentAtTenant $rname
+    }
+}
+
 function Test-NewDeploymentFromTemplateObject
 {
     # Setup