From 0ba2047c4837fd1e2cdbd6666fb43e55761fefe1 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 3 Oct 2024 15:11:12 -0700 Subject: [PATCH] Sync eng/common directory with azure-sdk-tools for PR 9092 (#1904) * Export the subscription data from the service connection * Update deploy-test-resources.yml --------- Co-authored-by: Wes Haggard Co-authored-by: Wes Haggard --- eng/common/TestResources/deploy-test-resources.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/eng/common/TestResources/deploy-test-resources.yml b/eng/common/TestResources/deploy-test-resources.yml index 840acfd9..a9b22415 100644 --- a/eng/common/TestResources/deploy-test-resources.yml +++ b/eng/common/TestResources/deploy-test-resources.yml @@ -59,6 +59,20 @@ steps: ${{ parameters.SubscriptionConfiguration }} '@ | ConvertFrom-Json -AsHashtable; + $context = Get-AzContext + $subscriptionConfiguration["SubscriptionId"] = $context.Subscription.Id + $subscriptionConfiguration["TenantId"] = $context.Subscription.TenantId + $subscriptionConfiguration["TestApplicationId"] = $context.Account.Id + $subscriptionConfiguration["ProvisionerApplicationId"] = $context.Account.Id + + $principal = Get-AzADServicePrincipal -ApplicationId $context.Account.Id + $subscriptionConfiguration["TestApplicationOid"] = $principal.Id + $subscriptionConfiguration["ProvisionerApplicationOid"] = $principal.Id + + Write-Host ($subscriptionConfiguration | ConvertTo-Json) + # Write the new SubscriptionConfiguration to be used by the remove test resources + Write-Host "##vso[task.setvariable variable=SubscriptionConfiguration;]$($subscriptionConfiguration | ConvertTo-Json -Compress)" + # The subscriptionConfiguration may have ArmTemplateParameters defined, so # pass those in via the ArmTemplateParameters flag, and handle any # additional parameters from the pipelines via AdditionalParameters