Skip to content

Fix: Resolve multiple bugs in setup WorkloadZone in ADO causing silent failures #1011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nnoaman wants to merge 3 commits into
base: release/january-2026
Choose a base branch
from
Open

Fix: Resolve multiple bugs in setup WorkloadZone in ADO causing silent failures #1011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d28405a
fix: resolve multiple bugs in setup WorkloadZone in ADO
nnoaman Jan 30, 2026
67b362e
fix: resolve multiple bugs in setup WorkloadZone in ADO
nnoaman Jan 30, 2026
58b3db4
fix: improve error handling and logging in New-SDAFADOWorkloadZone fu…
nnoaman Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 34 additions & 1 deletion deploy/scripts/pwsh/Output/SDAFUtilities/SDAFUtilities.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,10 @@ function New-SDAFADOProject {

Write-Verbose "Creating service connection: $ConnectionName"
az devops service-endpoint create --service-endpoint-configuration $JsonInputFile --organization $AdoOrganization --project $AdoProject --output none --only-show-errors
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to create service connection '$ConnectionName'"
throw "Service connection creation failed"
}
Write-Host "Service connection '$ConnectionName' created successfully." -ForegroundColor Green

if (Test-Path $JsonInputFile) {
Expand Down Expand Up @@ -1997,6 +2001,10 @@ function New-SDAFADOWorkloadZone {

Write-Verbose "Creating service connection: $ConnectionName"
az devops service-endpoint create --service-endpoint-configuration $JsonInputFile --organization $AdoOrganization --project $AdoProject --output none --only-show-errors
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to create service connection '$ConnectionName'"
throw "Service connection creation failed"
}
Write-Host "Service connection '$ConnectionName' created successfully." -ForegroundColor Green

if (Test-Path $JsonInputFile) {
Expand Down Expand Up @@ -2172,6 +2180,9 @@ function New-SDAFADOWorkloadZone {
throw "Project not found"
}

Write-Verbose "Setting Azure DevOps defaults: organization=$AdoOrganization project=$AdoProject"
az devops configure --defaults organization=$AdoOrganization project="$AdoProject"

$ControlPlaneVariableGroupId = (az pipelines variable-group list --query "[?name=='$ControlPlanePrefix'].id | [0]" --only-show-errors)
$AgentPoolName = ""
if ($ControlPlaneVariableGroupId.Length -ne 0) {
Expand All @@ -2196,7 +2207,7 @@ function New-SDAFADOWorkloadZone {

if ($ManagedIdentityId.Length -ne 0) {
$ResourceGroupName = $ManagedIdentityId.Split("/")[4]
$ManagedIdentityClientId = $(az identity list --query "[?principalId=='$ManagedIdentityObjectId'].id" --subscription $ControlPlaneSubscriptionId --resource-group $ResourceGroupName --output tsv)
$ManagedIdentityClientId = $(az identity list --query "[?principalId=='$ManagedIdentityObjectId'].clientId" --subscription $ControlPlaneSubscriptionId --resource-group $ResourceGroupName --output tsv)
Write-Verbose "Client ID of the Managed Identity: $ManagedIdentityClientId"
if ($ManagedIdentityClientId.Length -eq 0) {
Write-Error "Managed Identity with Object ID $ManagedIdentityObjectId was not found in subscription $ControlPlaneSubscriptionId"
Expand Down Expand Up @@ -2316,16 +2327,38 @@ function New-SDAFADOWorkloadZone {
if ($ServiceConnectionExists.Length -eq 0) {
Write-Host "Creating Service Endpoint" $ServiceConnectionName -ForegroundColor Green
az devops service-endpoint azurerm create --azure-rm-service-principal-id $WorkloadZoneClientId --azure-rm-subscription-id $WorkloadZoneSubscriptionId --azure-rm-subscription-name $WorkloadZoneSubscriptionName --azure-rm-tenant-id $WorkloadZoneTenantId --name $ServiceConnectionName --output none --only-show-errors
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to create service connection '$ServiceConnectionName'"
throw "Service connection creation failed"
}
Write-Host "Service connection '$ServiceConnectionName' created successfully." -ForegroundColor Green
$ServiceConnectionId = az devops service-endpoint list --query "[?name=='$ServiceConnectionName'].id" -o tsv
az devops service-endpoint update --id $ServiceConnectionId --enable-for-all true --output none --only-show-errors
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to enable service connection '$ServiceConnectionName' for all pipelines"
throw "Service connection update failed"
}
}
else {
Write-Host "Service Endpoint already exists, recreating it with the updated credentials" -ForegroundColor Green
$ServiceConnectionId = az devops service-endpoint list --query "[?name=='$ServiceConnectionName'].id" -o tsv
az devops service-endpoint delete --id $ServiceConnectionId --yes
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to delete existing service connection '$ServiceConnectionName'"
throw "Service connection deletion failed"
}
az devops service-endpoint azurerm create --azure-rm-service-principal-id $WorkloadZoneClientId --azure-rm-subscription-id $WorkloadZoneSubscriptionId --azure-rm-subscription-name $WorkloadZoneSubscriptionName --azure-rm-tenant-id $WorkloadZoneTenantId --name $ServiceConnectionName --output none --only-show-errors
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to recreate service connection '$ServiceConnectionName'"
throw "Service connection creation failed"
}
Write-Host "Service connection '$ServiceConnectionName' recreated successfully." -ForegroundColor Green
$ServiceConnectionId = az devops service-endpoint list --query "[?name=='$ServiceConnectionName'].id" -o tsv
az devops service-endpoint update --id $ServiceConnectionId --enable-for-all true --output none --only-show-errors
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to enable service connection '$ServiceConnectionName' for all pipelines"
throw "Service connection update failed"
}
}
}

Expand Down
4 changes: 4 additions & 0 deletions deploy/scripts/pwsh/SDAFUtilities/Public/New-SDAFADOProject.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,10 @@ function New-SDAFADOProject {

Write-Verbose "Creating service connection: $ConnectionName"
az devops service-endpoint create --service-endpoint-configuration $JsonInputFile --organization $AdoOrganization --project $AdoProject --output none --only-show-errors
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to create service connection '$ConnectionName'"
throw "Service connection creation failed"
}
Write-Host "Service connection '$ConnectionName' created successfully." -ForegroundColor Green

if (Test-Path $JsonInputFile) {
Expand Down
31 changes: 30 additions & 1 deletion deploy/scripts/pwsh/SDAFUtilities/Public/New-SDAFADOWorkloadZone.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,10 @@ function New-SDAFADOWorkloadZone {

Write-Verbose "Creating service connection: $ConnectionName"
az devops service-endpoint create --service-endpoint-configuration $JsonInputFile --organization $AdoOrganization --project $AdoProject --output none --only-show-errors
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to create service connection '$ConnectionName'"
throw "Service connection creation failed"
}
Write-Host "Service connection '$ConnectionName' created successfully." -ForegroundColor Green

if (Test-Path $JsonInputFile) {
Expand Down Expand Up @@ -402,6 +406,9 @@ function New-SDAFADOWorkloadZone {
throw "Project not found"
}

Write-Verbose "Setting Azure DevOps defaults: organization=$AdoOrganization project=$AdoProject"
az devops configure --defaults organization=$AdoOrganization project="$AdoProject"

$ControlPlaneVariableGroupId = (az pipelines variable-group list --query "[?name=='$ControlPlanePrefix'].id | [0]" --only-show-errors)
$AgentPoolName = ""
if ($ControlPlaneVariableGroupId.Length -ne 0) {
Expand All @@ -427,7 +434,7 @@ function New-SDAFADOWorkloadZone {

if ($ManagedIdentityId.Length -ne 0) {
$ResourceGroupName = $ManagedIdentityId.Split("/")[4]
$ManagedIdentityClientId = $(az identity list --query "[?principalId=='$ManagedIdentityObjectId'].id" --subscription $ControlPlaneSubscriptionId --resource-group $ResourceGroupName --output tsv)
$ManagedIdentityClientId = $(az identity list --query "[?principalId=='$ManagedIdentityObjectId'].clientId" --subscription $ControlPlaneSubscriptionId --resource-group $ResourceGroupName --output tsv)
Write-Verbose "Client ID of the Managed Identity: $ManagedIdentityClientId"
if ($ManagedIdentityClientId.Length -eq 0) {
Write-Error "Managed Identity with Object ID $ManagedIdentityObjectId was not found in subscription $ControlPlaneSubscriptionId"
Expand Down Expand Up @@ -547,16 +554,38 @@ function New-SDAFADOWorkloadZone {
if ($ServiceConnectionExists.Length -eq 0) {
Write-Host "Creating Service Endpoint" $ServiceConnectionName -ForegroundColor Green
az devops service-endpoint azurerm create --azure-rm-service-principal-id $WorkloadZoneClientId --azure-rm-subscription-id $WorkloadZoneSubscriptionId --azure-rm-subscription-name $WorkloadZoneSubscriptionName --azure-rm-tenant-id $WorkloadZoneTenantId --name $ServiceConnectionName --output none --only-show-errors
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to create service connection '$ServiceConnectionName'"
throw "Service connection creation failed"
}
Write-Host "Service connection '$ServiceConnectionName' created successfully." -ForegroundColor Green
$ServiceConnectionId = az devops service-endpoint list --query "[?name=='$ServiceConnectionName'].id" -o tsv
az devops service-endpoint update --id $ServiceConnectionId --enable-for-all true --output none --only-show-errors
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to enable service connection '$ServiceConnectionName' for all pipelines"
throw "Service connection update failed"
}
}
else {
Write-Host "Service Endpoint already exists, recreating it with the updated credentials" -ForegroundColor Green
$ServiceConnectionId = az devops service-endpoint list --query "[?name=='$ServiceConnectionName'].id" -o tsv
az devops service-endpoint delete --id $ServiceConnectionId --yes
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to delete existing service connection '$ServiceConnectionName'"
throw "Service connection deletion failed"
}
az devops service-endpoint azurerm create --azure-rm-service-principal-id $WorkloadZoneClientId --azure-rm-subscription-id $WorkloadZoneSubscriptionId --azure-rm-subscription-name $WorkloadZoneSubscriptionName --azure-rm-tenant-id $WorkloadZoneTenantId --name $ServiceConnectionName --output none --only-show-errors
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to recreate service connection '$ServiceConnectionName'"
throw "Service connection creation failed"
}
Write-Host "Service connection '$ServiceConnectionName' recreated successfully." -ForegroundColor Green
$ServiceConnectionId = az devops service-endpoint list --query "[?name=='$ServiceConnectionName'].id" -o tsv
az devops service-endpoint update --id $ServiceConnectionId --enable-for-all true --output none --only-show-errors
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to enable service connection '$ServiceConnectionName' for all pipelines"
throw "Service connection update failed"
}
}
}

Expand Down