From f3d6c1e6f977e21231b0cf6314fd5d866ca3e0ca Mon Sep 17 00:00:00 2001 From: SeSeicht Date: Fri, 13 May 2022 09:58:56 +0200 Subject: [PATCH 1/2] Add SetContext to Removal --- .../pipelineTemplates/jobs.validateModuleDeployment.yml | 1 + .../resourceRemoval/Initialize-DeploymentRemoval.ps1 | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml b/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml index cb80dd5790..9bf41838c8 100644 --- a/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml +++ b/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml @@ -359,6 +359,7 @@ jobs: DeploymentName = '$(deploymentName)' TemplateFilePath = $templateFilePath ResourceGroupName = '${{ parameters.resourceGroupName }}' + subscriptionId = '${{ parameters.subscriptionId }}' ManagementGroupId = '${{ parameters.managementGroupId }}' Verbose = $true } diff --git a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 index e7aad99a7e..4ac7bbd16c 100644 --- a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 +++ b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 @@ -36,6 +36,9 @@ function Initialize-DeploymentRemoval { [Parameter(Mandatory = $false)] [string] $ResourceGroupName, + [Parameter(Mandatory = $false)] + [string] $subscriptionId, + [Parameter(Mandatory = $false)] [string] $ManagementGroupId ) @@ -47,6 +50,12 @@ function Initialize-DeploymentRemoval { } process { + + if (-not [String]::IsNullOrEmpty($subscriptionId)) { + Write-Verbose ('Setting context to subscription [{0}]' -f $subscriptionId) + $null = Set-AzContext -Subscription $subscriptionId + } + $moduleName = Split-Path (Split-Path $templateFilePath -Parent) -LeafBase # The initial sequence is a general order-recommendation From 15c9424f0580aed9377a56ed0e7a1edddaa69214 Mon Sep 17 00:00:00 2001 From: SeSeicht Date: Fri, 13 May 2022 10:12:01 +0200 Subject: [PATCH 2/2] indents --- .../pipelineTemplates/jobs.validateModuleDeployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml b/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml index 9bf41838c8..207b45e811 100644 --- a/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml +++ b/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml @@ -359,7 +359,7 @@ jobs: DeploymentName = '$(deploymentName)' TemplateFilePath = $templateFilePath ResourceGroupName = '${{ parameters.resourceGroupName }}' - subscriptionId = '${{ parameters.subscriptionId }}' + subscriptionId = '${{ parameters.subscriptionId }}' ManagementGroupId = '${{ parameters.managementGroupId }}' Verbose = $true }