From 4ca8d267d61a5ec890dca1b2d3b677c58ae7c969 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 8 Apr 2020 16:30:38 -0700 Subject: [PATCH] Sync eng/common directory with azure-sdk-tools repository (#67) --- .../TestResources/New-TestResources.ps1 | 14 +++++++-- .../TestResources/New-TestResources.ps1.md | 29 ++++++++++++++++--- .../TestResources/Remove-TestResources.ps1 | 6 ++-- .../TestResources/Remove-TestResources.ps1.md | 29 +++++++++++++++---- .../TestResources/deploy-test-resources.yml | 4 +-- .../TestResources/remove-test-resources.yml | 4 +-- 6 files changed, 66 insertions(+), 20 deletions(-) diff --git a/eng/common/TestResources/New-TestResources.ps1 b/eng/common/TestResources/New-TestResources.ps1 index 4fc565a4e..203d8d6bc 100644 --- a/eng/common/TestResources/New-TestResources.ps1 +++ b/eng/common/TestResources/New-TestResources.ps1 @@ -153,7 +153,7 @@ if ($ProvisionerApplicationId) { } $provisionerAccount = Retry { - Connect-AzAccount -Tenant $TenantId -Credential $provisionerCredential -ServicePrincipal @subscriptionArgs + Connect-AzAccount -Tenant $TenantId -Credential $provisionerCredential -ServicePrincipal -Environment $Environment @subscriptionArgs } $exitActions += { @@ -388,6 +388,10 @@ The tenant ID of a service principal when a provisioner is specified. The same Tenant ID is used for Test Application and Provisioner Application. This value is passed to the ARM template as 'tenantId'. +.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 The AAD Application ID used to provision test resources when a provisioner is specified. @@ -418,8 +422,12 @@ timestamp is less than the current time. This isused for CI automation. .PARAMETER Location -Optional location where resources should be created. By default this is -'westus2'. +Optional location where resources should be created. If left empty, the default +is based on the cloud to which the template is being deployed: + +* AzureCloud -> 'westus2' +* AzureUSGovernment -> 'usgovvirginia' +* AzureChinaCloud -> 'chinaeast2' .PARAMETER Environment Name of the cloud environment. The default is the Azure Public Cloud diff --git a/eng/common/TestResources/New-TestResources.ps1.md b/eng/common/TestResources/New-TestResources.ps1.md index 4c9785125..ac0d33260 100644 --- a/eng/common/TestResources/New-TestResources.ps1.md +++ b/eng/common/TestResources/New-TestResources.ps1.md @@ -23,7 +23,7 @@ New-TestResources.ps1 [-BaseName] -ServiceDirectory -TestAppli ### Provisioner ``` New-TestResources.ps1 [-BaseName] -ServiceDirectory -TestApplicationId - [-TestApplicationSecret ] [-TestApplicationOid ] -TenantId + [-TestApplicationSecret ] [-TestApplicationOid ] -TenantId [-SubscriptionId ] -ProvisionerApplicationId -ProvisionerApplicationSecret [-DeleteAfterHours ] [-Location ] [-Environment ] [-AdditionalParameters ] [-CI] [-Force] [-WhatIf] [-Confirm] [] @@ -214,6 +214,23 @@ Accept pipeline input: False Accept wildcard characters: False ``` +### -SubscriptionId +Optional subscription ID to use for new resources when logging in as a +provisioner. +You can also use Set-AzContext if not provisioning. + +```yaml +Type: String +Parameter Sets: Provisioner +Aliases: + +Required: False +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + ### -ProvisionerApplicationId The AAD Application ID used to provision test resources when a provisioner is specified. @@ -283,8 +300,12 @@ Accept wildcard characters: False ### -Location Optional location where resources should be created. -By default this is -'westus2'. +If left empty, the default +is based on the cloud to which the template is being deployed: + +* AzureCloud -\> 'westus2' +* AzureUSGovernment -\> 'usgovvirginia' +* AzureChinaCloud -\> 'chinaeast2' ```yaml Type: String @@ -293,7 +314,7 @@ Aliases: Required: False Position: Named -Default value: Westus2 +Default value: None Accept pipeline input: False Accept wildcard characters: False ``` diff --git a/eng/common/TestResources/Remove-TestResources.ps1 b/eng/common/TestResources/Remove-TestResources.ps1 index d6783738c..881e48afe 100644 --- a/eng/common/TestResources/Remove-TestResources.ps1 +++ b/eng/common/TestResources/Remove-TestResources.ps1 @@ -102,7 +102,7 @@ if ($ProvisionerApplicationId) { } $provisionerAccount = Retry { - Connect-AzAccount -Tenant $TenantId -Credential $provisionerCredential -ServicePrincipal @subscriptionArgs + Connect-AzAccount -Tenant $TenantId -Credential $provisionerCredential -ServicePrincipal -Environment $Environment @subscriptionArgs } $exitActions += { @@ -148,8 +148,8 @@ The name of the resource group to delete. 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. +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/common/TestResources/Remove-TestResources.ps1.md b/eng/common/TestResources/Remove-TestResources.ps1.md index 03803d8e5..44d4a8a11 100644 --- a/eng/common/TestResources/Remove-TestResources.ps1.md +++ b/eng/common/TestResources/Remove-TestResources.ps1.md @@ -20,16 +20,16 @@ Remove-TestResources.ps1 [-BaseName] [-Environment ] [-Force] [ ### Default+Provisioner ``` -Remove-TestResources.ps1 [-BaseName] -TenantId -ProvisionerApplicationId - -ProvisionerApplicationSecret [-Environment ] [-Force] [-WhatIf] [-Confirm] - [] +Remove-TestResources.ps1 [-BaseName] -TenantId [-SubscriptionId ] + -ProvisionerApplicationId -ProvisionerApplicationSecret [-Environment ] [-Force] + [-WhatIf] [-Confirm] [] ``` ### ResourceGroup+Provisioner ``` -Remove-TestResources.ps1 -ResourceGroupName -TenantId -ProvisionerApplicationId - -ProvisionerApplicationSecret [-Environment ] [-Force] [-WhatIf] [-Confirm] - [] +Remove-TestResources.ps1 -ResourceGroupName -TenantId [-SubscriptionId ] + -ProvisionerApplicationId -ProvisionerApplicationSecret [-Environment ] [-Force] + [-WhatIf] [-Confirm] [] ``` ### ResourceGroup @@ -122,6 +122,23 @@ Accept pipeline input: False Accept wildcard characters: False ``` +### -SubscriptionId +Optional subscription ID to use for new resources when logging in as a +provisioner. +You can also use Set-AzContext if not provisioning. + +```yaml +Type: String +Parameter Sets: Default+Provisioner, ResourceGroup+Provisioner +Aliases: + +Required: False +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + ### -ProvisionerApplicationId A service principal ID to provision test resources when a provisioner is specified. diff --git a/eng/common/TestResources/deploy-test-resources.yml b/eng/common/TestResources/deploy-test-resources.yml index a1901a111..00e75a3bf 100644 --- a/eng/common/TestResources/deploy-test-resources.yml +++ b/eng/common/TestResources/deploy-test-resources.yml @@ -40,7 +40,7 @@ steps: -BaseName 'Generated' -ServiceDirectory '${{ parameters.ServiceDirectory }}' -TenantId '$(aad-azure-sdk-test-tenant-id-gov)' - -SubscriptionId '$(azure-subscription-id)' + -SubscriptionId '$(azure-subscription-id-gov)' -TestApplicationId '$(aad-azure-sdk-test-client-id-gov)' -TestApplicationSecret '$(aad-azure-sdk-test-client-secret-gov)' -ProvisionerApplicationId '$(aad-azure-sdk-test-client-id-gov)' @@ -60,7 +60,7 @@ steps: -BaseName 'Generated' -ServiceDirectory '${{ parameters.ServiceDirectory }}' -TenantId '$(aad-azure-sdk-test-tenant-id-cn)' - -SubscriptionId '$(azure-subscription-id)' + -SubscriptionId '$(azure-subscription-id-cn)' -TestApplicationId '$(aad-azure-sdk-test-client-id-cn)' -TestApplicationSecret '$(aad-azure-sdk-test-client-secret-cn)' -ProvisionerApplicationId '$(aad-azure-sdk-test-client-id-cn)' diff --git a/eng/common/TestResources/remove-test-resources.yml b/eng/common/TestResources/remove-test-resources.yml index 869397440..40eec569f 100644 --- a/eng/common/TestResources/remove-test-resources.yml +++ b/eng/common/TestResources/remove-test-resources.yml @@ -26,7 +26,7 @@ steps: eng/common/TestResources/Remove-TestResources.ps1 -ResourceGroupName "${env:AZURE_RESOURCEGROUP_NAME}" -TenantId '$(aad-azure-sdk-test-tenant-id-gov)' - -SubscriptionId '$(azure-subscription-id)' + -SubscriptionId '$(azure-subscription-id-gov)' -ProvisionerApplicationId '$(aad-azure-sdk-test-client-id-gov)' -ProvisionerApplicationSecret '$(aad-azure-sdk-test-client-secret-gov)' -Environment 'AzureUSGovernment' @@ -40,7 +40,7 @@ steps: eng/common/TestResources/Remove-TestResources.ps1 -ResourceGroupName "${env:AZURE_RESOURCEGROUP_NAME}" -TenantId '$(aad-azure-sdk-test-tenant-id-cn)' - -SubscriptionId '$(azure-subscription-id)' + -SubscriptionId '$(azure-subscription-id-cn)' -ProvisionerApplicationId '$(aad-azure-sdk-test-client-id-cn)' -ProvisionerApplicationSecret '$(aad-azure-sdk-test-client-secret-cn)' -Environment 'AzureChinaCloud'