Skip to content

Commit 59fa2dd

Browse files
committed
fixing issue in override file.
1 parent fb6286d commit 59fa2dd

1 file changed

Lines changed: 13 additions & 4 deletions

File tree

tests/integration/all-resource-types/phases/run-phase4-create-overrides.ps1

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,20 @@ Import-Module $scriptArgModule -Force
5959

6060
Set-ScriptLogPreferences -LogLevel $LogLevel
6161

62+
$targetSubscriptionIdValue = Get-BoundParameterValueOrNull -BoundParameters $PSBoundParameters -Name 'TargetSubscriptionId'
63+
$subscriptionArgs = @()
64+
if (-not [string]::IsNullOrWhiteSpace($targetSubscriptionIdValue)) {
65+
$subscriptionArgs = @('--subscription', $targetSubscriptionIdValue)
66+
}
67+
6268
# Pull the target-specific values directly from Azure for the override file.
6369
Write-Host "🔧 Override — Generate target environment override file"
64-
$targetKvUri = az keyvault list --resource-group $TargetResourceGroup --query "[0].properties.vaultUri" -o tsv
65-
$targetAiResourceId = az monitor app-insights component list --resource-group $TargetResourceGroup --query "[0].id" -o tsv
66-
$targetAiKey = az monitor app-insights component list --resource-group $TargetResourceGroup --query "[0].instrumentationKey" -o tsv
67-
$targetEhNs = az eventhubs namespace list --resource-group $TargetResourceGroup --query "[0].name" -o tsv
70+
$targetKvUri = az keyvault list --resource-group $TargetResourceGroup @subscriptionArgs --query "[0].properties.vaultUri" -o tsv
71+
$targetAiResourceId = az resource list --resource-group $TargetResourceGroup --resource-type "Microsoft.Insights/components" @subscriptionArgs --query "[0].id" -o tsv
72+
$targetAiKey = if (-not [string]::IsNullOrWhiteSpace($targetAiResourceId)) {
73+
az resource show --ids $targetAiResourceId @subscriptionArgs --query "properties.InstrumentationKey" -o tsv
74+
}
75+
$targetEhNs = az eventhubs namespace list --resource-group $TargetResourceGroup @subscriptionArgs --query "[0].name" -o tsv
6876

6977
if (-not $targetKvUri) {
7078
Write-Host "❌ Could not resolve target Key Vault URI in $(Protect-ResourceGroupName -Value $TargetResourceGroup)"
@@ -83,6 +91,7 @@ $targetEhConnStr = az eventhubs namespace authorization-rule keys list `
8391
--resource-group $TargetResourceGroup `
8492
--namespace-name $targetEhNs `
8593
--name 'tgt-eh-send' `
94+
@subscriptionArgs `
8695
--query 'primaryConnectionString' -o tsv
8796

8897
if (-not $targetEhConnStr) {

0 commit comments

Comments
 (0)