Specify subscription ID for test resources (#10983)

* Specify subscription ID for test resources Testing fix for Azure/azure-sdk-tools#474 specifically for azure-sdk-for-net repo. * Put -SubscriptionId in right param sets
Azure · Apr 2, 2020 · 48a7a6e · 48a7a6e
1 parent 1e5b516
commit 48a7a6e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/eng/New-TestResources.ps1 b/eng/New-TestResources.ps1
@@ -33,6 +33,10 @@ param (
     [ValidateNotNullOrEmpty()]
     [string] $TenantId,
 
+    [Parameter(ParameterSetName = 'Provisioner')]
+    [ValidatePattern('^[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}$')]
+    [string] $SubscriptionId,
+
     [Parameter(ParameterSetName = 'Provisioner', Mandatory = $true)]
     [ValidatePattern('^[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}$')]
     [string] $ProvisionerApplicationId,
@@ -130,8 +134,13 @@ if ($ProvisionerApplicationId) {
     $provisionerSecret = ConvertTo-SecureString -String $ProvisionerApplicationSecret -AsPlainText -Force
     $provisionerCredential = [System.Management.Automation.PSCredential]::new($ProvisionerApplicationId, $provisionerSecret)
 
+    # Use the given subscription ID if provided.
+    $subscriptionArgs = if ($SubscriptionId) {
+        @{SubscriptionId = $SubscriptionId}
+    }
+
     $provisionerAccount = Retry {
-        Connect-AzAccount -Tenant $TenantId -Credential $provisionerCredential -ServicePrincipal
+        Connect-AzAccount -Tenant $TenantId -Credential $provisionerCredential -ServicePrincipal @subscriptionArgs
     }
 
     $exitActions += {
@@ -320,6 +329,9 @@ Optional service principal secret (password) to authenticate the test runner aga
 .PARAMETER TenantId
 The tenant ID of a service principal when a provisioner is specified.
 
+.PARAMETER SubscriptionId
+Optional subscription ID to use for new resources when logging in as a provisioner. You can also use Set-AzContext if not provisioning.
+
 .PARAMETER ProvisionerApplicationId
 A service principal ID to provision test resources when a provisioner is specified.
 

diff --git a/eng/Remove-TestResources.ps1 b/eng/Remove-TestResources.ps1
@@ -25,6 +25,11 @@ param (
     [ValidateNotNullOrEmpty()]
     [string] $TenantId,
 
+    [Parameter(ParameterSetName = 'Default+Provisioner')]
+    [Parameter(ParameterSetName = 'ResourceGroup+Provisioner')]
+    [ValidatePattern('^[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}$')]
+    [string] $SubscriptionId,
+
     [Parameter(ParameterSetName = 'Default+Provisioner', Mandatory = $true)]
     [Parameter(ParameterSetName = 'ResourceGroup+Provisioner', Mandatory = $true)]
     [ValidatePattern('^[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}$')]
@@ -86,8 +91,14 @@ if ($ProvisionerApplicationId) {
     Log "Logging into service principal '$ProvisionerApplicationId'"
     $provisionerSecret = ConvertTo-SecureString -String $ProvisionerApplicationSecret -AsPlainText -Force
     $provisionerCredential = [System.Management.Automation.PSCredential]::new($ProvisionerApplicationId, $provisionerSecret)
+
+    # Use the given subscription ID if provided.
+    $subscriptionArgs = if ($SubscriptionId) {
+        @{SubscriptionId = $SubscriptionId}
+    }
+
     $provisionerAccount = Retry {
-        Connect-AzAccount -Tenant $TenantId -Credential $provisionerCredential -ServicePrincipal
+        Connect-AzAccount -Tenant $TenantId -Credential $provisionerCredential -ServicePrincipal @subscriptionArgs
     }
 
     $exitActions += {
@@ -126,6 +137,9 @@ The name of the resource group to delete.
 .PARAMETER TenantId
 The tenant ID of a service principal when a provisioner is specified.
 
+.PARAMETER SubscriptionId
+Optional subscription ID to use for new resources when logging in as a provisioner. You can also use Set-AzContext if not provisioning.
+
 .PARAMETER ProvisionerApplicationId
 A service principal ID to provision test resources when a provisioner is specified.
 

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml
@@ -70,6 +70,7 @@ jobs:
           -BaseName 'Generated'
           -ServiceDirectory '${{ parameters.ServiceDirectory }}'
           -TenantId '$(aad-azure-sdk-test-tenant-id)'
+          -SubscriptionId '$(azure-subscription-id)'
           -ProvisionerApplicationId '$(aad-azure-sdk-test-client-id)'
           -ProvisionerApplicationSecret '$(aad-azure-sdk-test-client-secret)'
           -TestApplicationId '$(aad-azure-sdk-test-client-id)'
@@ -102,6 +103,7 @@ jobs:
           eng/Remove-TestResources.ps1
           -ResourceGroupName "${env:AZURE_RESOURCEGROUP_NAME}"
           -TenantId '$(aad-azure-sdk-test-tenant-id)'
+          -SubscriptionId '$(azure-subscription-id)'
           -ProvisionerApplicationId '$(aad-azure-sdk-test-client-id)'
           -ProvisionerApplicationSecret '$(aad-azure-sdk-test-client-secret)'
           -Force