Update pre-provision failover from bash to posh

Author: Mike Swantek

azure.yaml

@@ -18,7 +18,7 @@ hooks:
     # Integrated preprovision:
     # - Runs AI Landing Zone preprovision to generate deploy/ files and Template Specs
     # - Ensures our wrapper points to deploy/main.bicep (Template Spec-based) to avoid ARM 4MB template limit
-    # On Windows, `shell: sh` may not be available; fall back to the PowerShell script.
+    # On Windows, `shell: sh` may not be available; the PowerShell script is a fallback.    
     - shell: sh
       run: ./scripts/preprovision-integrated.sh
       interactive: false

scripts/preprovision-integrated.ps1

@@ -17,6 +17,74 @@ Write-Host " AI Landing Zone - Integrated Preprovision" -ForegroundColor Cyan
 Write-Host "================================================" -ForegroundColor Cyan
 Write-Host ""
 
+function Get-PreprovisionMarkerPath {
+    param(
+        [string]$RepoRoot
+    )
+
+    $envName = $env:AZURE_ENV_NAME
+    if ([string]::IsNullOrWhiteSpace($envName)) {
+        try { $envName = (& azd env get-value AZURE_ENV_NAME 2>$null).ToString().Trim() } catch { $envName = $null }
+    }
+    if ([string]::IsNullOrWhiteSpace($envName)) { $envName = 'default' }
+
+    $azureDir = Join-Path $RepoRoot '.azure'
+    return Join-Path $azureDir ("preprovision-integrated.$envName.ok")
+}
+
+function Test-PreprovisionAlreadyComplete {
+    param(
+        [string]$RepoRoot
+    )
+
+    $markerPath = Get-PreprovisionMarkerPath -RepoRoot $RepoRoot
+    if (-not (Test-Path $markerPath)) { return $false }
+
+    $deployDir = Join-Path $RepoRoot 'submodules' 'ai-landing-zone' 'bicep' 'deploy'
+    if (-not (Test-Path $deployDir)) { return $false }
+
+    $wrapperPath = Join-Path $RepoRoot 'infra' 'main.bicep'
+    if (-not (Test-Path $wrapperPath)) { return $false }
+
+    try {
+        $wrapperContent = Get-Content $wrapperPath -Raw
+        if ($wrapperContent -notmatch '/bicep/deploy/main\.bicep') { return $false }
+    } catch {
+        return $false
+    }
+
+    return $true
+}
+
+function Write-PreprovisionMarker {
+    param(
+        [string]$RepoRoot,
+        [string]$Location,
+        [string]$ResourceGroup,
+        [string]$SubscriptionId
+    )
+
+    $markerPath = Get-PreprovisionMarkerPath -RepoRoot $RepoRoot
+    $markerDir = Split-Path -Parent $markerPath
+    if (-not (Test-Path $markerDir)) {
+        New-Item -ItemType Directory -Path $markerDir -Force | Out-Null
+    }
+
+    $stamp = (Get-Date).ToString('s')
+    @(
+        "timestamp=$stamp",
+        "location=$Location",
+        "resourceGroup=$ResourceGroup",
+        "subscriptionId=$SubscriptionId"
+    ) | Set-Content -Path $markerPath -Encoding UTF8
+}
+
+$repoRootResolved = (Resolve-Path (Join-Path $PSScriptRoot '..')).Path
+if (Test-PreprovisionAlreadyComplete -RepoRoot $repoRootResolved) {
+    Write-Host "[i] Preprovision already completed by prior step; skipping PowerShell fallback." -ForegroundColor Yellow
+    exit 0
+}
+
 function Resolve-AzdEnvironmentValues {
     param(
         [string]$Location,
@@ -192,6 +260,13 @@ if ($wrapperContent -match $pattern) {
 
 Write-Host ""
 Write-Host "[OK] Preprovision complete!" -ForegroundColor Green
+
+try {
+    Write-PreprovisionMarker -RepoRoot $repoRootResolved -Location $Location -ResourceGroup $ResourceGroup -SubscriptionId $SubscriptionId
+} catch {
+    # Best-effort marker. Ignore failures so we don't block provisioning.
+}
+
 Write-Host ""
 Write-Host "    Template Specs created in resource group: $ResourceGroup" -ForegroundColor White
 Write-Host "    Deploy directory with Template Spec references ready" -ForegroundColor White

scripts/preprovision-integrated.sh

@@ -18,6 +18,32 @@ echo ""
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 
+# Marker to indicate preprovision succeeded for the currently selected azd environment.
+ENV_NAME="${AZURE_ENV_NAME:-}"
+if [ -z "$ENV_NAME" ] && command -v azd >/dev/null 2>&1; then
+    ENV_NAME="$(azd env get-value AZURE_ENV_NAME 2>/dev/null || true)"
+fi
+if [ -z "$ENV_NAME" ]; then
+    ENV_NAME="default"
+fi
+MARKER_DIR="$REPO_ROOT/.azure"
+MARKER_PATH="$MARKER_DIR/preprovision-integrated.${ENV_NAME}.ok"
+
+already_complete() {
+    local deploy_dir="$REPO_ROOT/submodules/ai-landing-zone/bicep/deploy"
+    local wrapper_path="$REPO_ROOT/infra/main.bicep"
+    [ -f "$MARKER_PATH" ] || return 1
+    [ -d "$deploy_dir" ] || return 1
+    [ -f "$wrapper_path" ] || return 1
+    grep -q "/bicep/deploy/main.bicep" "$wrapper_path" || return 1
+    return 0
+}
+
+if already_complete; then
+    echo "[i] Preprovision already completed by prior step; skipping."
+    exit 0
+fi
+
 # Try to populate AZURE_* variables from the currently selected azd environment
 if [ -z "${AZURE_LOCATION}" ] || [ -z "${AZURE_RESOURCE_GROUP}" ] || [ -z "${AZURE_SUBSCRIPTION_ID}" ]; then
     if command -v azd >/dev/null 2>&1; then
@@ -112,6 +138,15 @@ else
     echo "    [!] Warning: Wrapper file not found at $WRAPPER_PATH"
 fi
 
+# Write success marker (gitignored) so the PowerShell preprovision hook can no-op.
+mkdir -p "$MARKER_DIR"
+{
+    echo "timestamp=$(date -u +%Y-%m-%dT%H:%M:%SZ)"
+    echo "location=${AZURE_LOCATION}"
+    echo "resourceGroup=${AZURE_RESOURCE_GROUP}"
+    echo "subscriptionId=${AZURE_SUBSCRIPTION_ID}"
+} > "$MARKER_PATH"
+
 echo ""
 echo "[OK] Preprovision complete!"
 echo ""