Skip to content

Commit 5815a63

Browse files
commit
1 parent 66c43e2 commit 5815a63

2 files changed

Lines changed: 24 additions & 1 deletion

File tree

infra/scripts/configure_auth.ps1

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,20 @@
88

99
$ErrorActionPreference = "Stop"
1010

11+
# Check AZURE_SKIP_AUTH_SETUP from both env var and azd env (if available)
12+
$skipAuth = $false
1113
if ($env:AZURE_SKIP_AUTH_SETUP -eq "true") {
14+
$skipAuth = $true
15+
}
16+
elseif (Get-Command azd -ErrorAction SilentlyContinue) {
17+
try {
18+
$azdValue = azd env get-value AZURE_SKIP_AUTH_SETUP 2>$null
19+
if ($azdValue -eq "true") {
20+
$skipAuth = $true
21+
}
22+
} catch {}
23+
}
24+
if ($skipAuth) {
1225
Write-Host "⏭️ AZURE_SKIP_AUTH_SETUP=true — skipping auth configuration."
1326
return
1427
}

infra/scripts/configure_auth.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,17 @@ make_temp_file() {
3535
}
3636

3737
trap cleanup_temp_files EXIT
38-
if [[ "${AZURE_SKIP_AUTH_SETUP:-false}" == "true" ]]; then
38+
39+
# Check AZURE_SKIP_AUTH_SETUP from both env var and azd env (if available)
40+
AZURE_SKIP_AUTH_SETUP_EFFECTIVE="${AZURE_SKIP_AUTH_SETUP:-}"
41+
if command -v azd >/dev/null 2>&1 && azd env get-values >/dev/null 2>&1; then
42+
AZD_ENV_SKIP_AUTH_SETUP="$(azd env get-value AZURE_SKIP_AUTH_SETUP 2>/dev/null || echo "")"
43+
if [[ -z "$AZURE_SKIP_AUTH_SETUP_EFFECTIVE" && -n "$AZD_ENV_SKIP_AUTH_SETUP" ]]; then
44+
AZURE_SKIP_AUTH_SETUP_EFFECTIVE="$AZD_ENV_SKIP_AUTH_SETUP"
45+
fi
46+
fi
47+
48+
if [[ "${AZURE_SKIP_AUTH_SETUP_EFFECTIVE,,}" == "true" ]]; then
3949
echo "⏭️ AZURE_SKIP_AUTH_SETUP=true — skipping auth configuration."
4050
exit 0
4151
fi

0 commit comments

Comments
 (0)