Fix azcontainerregistry live test authentication (Azure#24419)

Author: chlowell

sdk/containers/azcontainerregistry/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Release History
 
-## 0.2.3 (2025-04-08)
+## 0.2.3 (2025-04-15)
 
 ### Other Changes
 * Default audience of Azure Container Registry of all clouds to https://containerregistry.azure.net

sdk/containers/azcontainerregistry/test-resources-post.ps1

@@ -27,9 +27,3 @@ param (
 
 $ErrorActionPreference = 'Stop'
 $PSNativeCommandUseErrorActionPreference = $true
-
-if ($CI) {
-    az cloud set -n $Environment
-    az login --federated-token $env:ARM_OIDC_TOKEN --service-principal -t $TenantId -u $TestApplicationId
-    az account set --subscription $SubscriptionId
-}

sdk/containers/azcontainerregistry/test-resources-pre.ps1

@@ -0,0 +1,40 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# IMPORTANT: Do not invoke this file directly. Please instead run eng/common/TestResources/New-TestResources.ps1 from the repository root.
+
+param (
+    [Parameter(Mandatory = $true)]
+    [ValidateNotNullOrEmpty()]
+    [string] $SubscriptionId,
+
+    [Parameter(Mandatory = $true)]
+    [ValidateNotNullOrEmpty()]
+    [string] $TenantId,
+
+    [Parameter(Mandatory = $true)]
+    [ValidatePattern('^[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}$')]
+    [string] $TestApplicationId,
+
+    [Parameter(Mandatory = $true)]
+    [ValidateNotNullOrEmpty()]
+    [string] $Environment,
+
+    [Parameter()]
+    [switch] $CI = ($null -ne $env:SYSTEM_TEAMPROJECTID),
+
+    # Captures any arguments from eng/New-TestResources.ps1 not declared here (no parameter errors).
+    [Parameter(ValueFromRemainingArguments = $true)]
+    $RemainingArguments
+)
+
+$ErrorActionPreference = 'Stop'
+$PSNativeCommandUseErrorActionPreference = $true
+
+if ($CI) {
+    az cloud set -n $Environment
+    az login --federated-token $env:ARM_OIDC_TOKEN --service-principal -t $TenantId -u $TestApplicationId
+    if ($LASTEXITCODE) { exit $LASTEXITCODE }
+    az account set --subscription $SubscriptionId
+    if ($LASTEXITCODE) { exit $LASTEXITCODE }
+}

sdk/containers/azcontainerregistry/utils_test.go

@@ -157,7 +157,7 @@ func buildImage(t *testing.T) (string, string) {
 				cmd := exec.CommandContext(ctx, "az", "acr", "build", "-r", testConfig.registryName, "--image", repository, "--build-arg", "ID="+repository, ".")
 				cmd.Dir = "testdata"
 				out, err = cmd.CombinedOutput()
-				if err == nil {
+				if err == nil || strings.Contains(string(out), "az login") {
 					return
 				}
 			}