Enable mg deployments in mg scoped stacks (#23019)

* enable mg deployments in new and set

* updated create management group cmdlets to not require a deployment sub

* fix help files, mg set cmdlet, and fix small issue in mg tests.

* small adjustments to cmdlets

* updated help files

Author: dantedallag

src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzManagementGroupDeploymentStack.cs

@@ -46,6 +46,10 @@ public class NewAzManagementGroupDeploymentStack : DeploymentStacksCreateCmdletB
         [ValidateNotNullOrEmpty]
         public string ManagementGroupId { get; set; }
 
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true,
+            HelpMessage = "The subscription id at which the deployment should be created.")]
+        public string DeploymentSubscriptionId { get; set; }
+
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true,
             HelpMessage = "Description for the stack")]
         public string Description { get; set; }
@@ -76,10 +80,6 @@ public class NewAzManagementGroupDeploymentStack : DeploymentStacksCreateCmdletB
         [Parameter(Mandatory = false, HelpMessage = "Apply to child scopes.")]
         public SwitchParameter DenySettingsApplyToChildScopes { get; set; }
 
-        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true,
-            HelpMessage = "The subscription id at which the deployment should be created.")]
-        public string DeploymentSubscriptionId { get; set; }
-
         [Parameter(Mandatory = false, HelpMessage = "The tags to put on the deployment.")]
         public Hashtable Tag { get; set; }
 
@@ -182,8 +182,11 @@ protected override void OnProcessRecord()
                 var shouldDeleteResources = (DeleteAll.ToBool() || DeleteResources.ToBool()) ? true : false;
                 var shouldDeleteResourceGroups = (DeleteAll.ToBool() || DeleteResourceGroups.ToBool()) ? true : false;
 
-                // construct deploymentScope if ResourceGroup was provided
-                var deploymentScope = "/subscriptions/" + DeploymentSubscriptionId;
+                string deploymentScope = null;
+                if (DeploymentSubscriptionId != null)
+                {
+                    deploymentScope = "/subscriptions/" + DeploymentSubscriptionId;
+                }
 
                 var currentStack = DeploymentStacksSdkClient.GetManagementGroupDeploymentStack(ManagementGroupId, Name, throwIfNotExists: false);
                 if (currentStack != null && Tag == null)

src/Resources/ResourceManager/Implementation/DeploymentStacks/SetAzManagmentGroupDeploymentStack.cs

@@ -45,9 +45,8 @@ public class SetAzManagementGroupDeploymentStack : DeploymentStacksCreateCmdletB
         [ValidateNotNullOrEmpty]
         public string ManagementGroupId { get; set; }
 
-        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true,
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true,
             HelpMessage = "The subscription Id at which the deployment should be created.")]
-        [ValidateNotNullOrEmpty]
         public string DeploymentSubscriptionId { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true,
@@ -183,8 +182,11 @@ protected override void OnProcessRecord()
                 var shouldDeleteResources = (DeleteAll.ToBool() || DeleteResources.ToBool()) ? true : false;
                 var shouldDeleteResourceGroups = (DeleteAll.ToBool() || DeleteResourceGroups.ToBool()) ? true : false;
 
-                // construct deploymentScope if ResourceGroup was provided
-                var deploymentScope = "/subscriptions/" + DeploymentSubscriptionId;
+                string deploymentScope = null;
+                if (DeploymentSubscriptionId != null)
+                {
+                    deploymentScope = "/subscriptions/" + DeploymentSubscriptionId;
+                }
 
                 var currentStack = DeploymentStacksSdkClient.GetManagementGroupDeploymentStack(ManagementGroupId, Name, throwIfNotExists: false);
                 if (currentStack != null && Tag == null)

src/Resources/Resources.Test/ScenarioTests/DeploymentStackTests.ps1

@@ -1252,10 +1252,14 @@ function Test-NewManagementGroupDeploymentStack
 
 		# --- ParameterlessTemplateFileParameterSetName ---
 
-		# Test - Success
+		# Test - Success - blank template
 		$deployment = New-AzManagementGroupDeploymentStack -Name $rname -Description "A Stack" -ManagementGroupId $mgid -DeploymentSubscriptionId $subId -TemplateFile blankTemplate.json -Location $location -DenySettingsMode None -Force
 		Assert-AreEqual "succeeded" $deployment.ProvisioningState
 
+		# Test - Success - MG scoped deployment
+		$deployment = New-AzManagementGroupDeploymentStack -Name $rname -Description "A Stack" -ManagementGroupId $mgid -TemplateFile StacksMGTemplateMGDeployment.json -Location $location -DenySettingsMode None -Force
+		Assert-AreEqual "succeeded" $deployment.ProvisioningState
+
 		# Test - Failure - template file not found
 		$missingFile = "missingFile142.json"
 		$exceptionMessage = "The provided file $missingFile doesn't exist"
@@ -1439,6 +1443,10 @@ function Test-SetManagementGroupDeploymentStack
 		$deployment = Set-AzManagementGroupDeploymentStack -Name $rname -Description "A Stack" -ManagementGroup $mgid  -DeploymentSubscriptionId $subId -TemplateFile StacksMGTemplate.json -TemplateParameterFile StacksMGTemplateParams.json -Location $location -DenySettingsMode None -Force
 		Assert-AreEqual "succeeded" $deployment.ProvisioningState
 
+		# Test - Success - MG scoped deployment
+		$deployment = Set-AzManagementGroupDeploymentStack -Name $rname -Description "A Stack" -ManagementGroupId $mgid -TemplateFile StacksMGTemplateMGDeployment.json -Location $location -DenySettingsMode None -Force
+		Assert-AreEqual "succeeded" $deployment.ProvisioningState
+
 		# Test - Failure - template file not found
 		$missingFile = "missingFile142.json"
 		$exceptionMessage = "The provided file $missingFile doesn't exist"