refactor: added required changes to skip quota check script if AI Foundry and models already exist

Abdul-Microsoft · Abdul-Microsoft · commit 2b5ccc33cc59 · 2025-06-11T15:57:47.000+05:30
diff --git a/azure.yaml b/azure.yaml
@@ -26,7 +26,7 @@ hooks:
     posix:
       shell: sh
       run: >
-        chmod u+r+x ./scripts/validate_model_deployment_quota.sh; chmod u+r+x ./scripts/validate_model_quota.sh; ./scripts/validate_model_deployment_quota.sh --subscription "$AZURE_SUBSCRIPTION_ID" --location "${AZURE_AISERVICE_LOCATION:-japaneast}" --models-parameter "aiModelDeployments"
+        chmod u+r+x ./scripts/validate_model_deployment_quota.sh; chmod u+r+x ./scripts/validate_model_quota.sh; ./scripts/validate_model_deployment_quota.sh --SubscriptionId "$AZURE_SUBSCRIPTION_ID" --Location "${AZURE_AISERVICE_LOCATION:-japaneast}" --ModelsParameter "aiModelDeployments"
       interactive: false
       continueOnError: false
 
diff --git a/infra/main.bicep b/infra/main.bicep
@@ -506,3 +506,5 @@ module deploymentScriptCLI 'br/public:avm/res/resources/deployment-script:0.5.1'
     scriptContent: cosmosAssignCli
   }
 }
+
+output AZURE_AIFOUNDRY_NAME string = azureAiServices.name
diff --git a/scripts/validate_model_deployment_quota.ps1 b/scripts/validate_model_deployment_quota.ps1
@@ -4,79 +4,72 @@ param (
     [string]$ModelsParameter
 )
 
-# Read from environment variables (do not pass in azure.yaml)
-$AiServiceName = $env:AZURE_AISERVICE_NAME
+$AiFoundryName = $env:AZURE_AIFOUNDRY_NAME
 $ResourceGroup = $env:AZURE_RESOURCE_GROUP
 
 # Validate required parameters
 $MissingParams = @()
-
-if (-not $SubscriptionId) {
-    $MissingParams += "subscription"
-}
-if (-not $Location) {
-    $MissingParams += "location"
-}
-if (-not $ModelsParameter) {
-    $MissingParams += "models-parameter"
-}
+if (-not $SubscriptionId) { $MissingParams += "SubscriptionId" }
+if (-not $Location) { $MissingParams += "Location" }
+if (-not $ModelsParameter) { $MissingParams += "ModelsParameter" }
+if (-not $AiFoundryName) { $MissingParams += "AZURE_AISERVICE_NAME" }
+if (-not $ResourceGroup) { $MissingParams += "AZURE_RESOURCE_GROUP" }
 
 if ($MissingParams.Count -gt 0) {
     Write-Error "❌ ERROR: Missing required parameters: $($MissingParams -join ', ')"
-    Write-Host "Usage: .\validate_model_deployment_quotas.ps1 -SubscriptionId <SUBSCRIPTION_ID> -Location <LOCATION> -ModelsParameter <MODELS_PARAMETER>"
     exit 1
 }
 
-# Load main.parameters.json
+# Load model deployment parameters
 $JsonContent = Get-Content -Path "./infra/main.parameters.json" -Raw | ConvertFrom-Json
 if (-not $JsonContent) {
     Write-Error "❌ ERROR: Failed to parse main.parameters.json. Ensure the JSON file is valid."
     exit 1
 }
 
 $aiModelDeployments = $JsonContent.parameters.$ModelsParameter.value
+
 if (-not $aiModelDeployments -or -not ($aiModelDeployments -is [System.Collections.IEnumerable])) {
     Write-Error "❌ ERROR: The specified property '$ModelsParameter' does not exist or is not an array."
     exit 1
 }
 
-# Check if AI resource + all deployments already exist
-if ($AiServiceName -and $ResourceGroup) {
-    $existing = az cognitiveservices account show `
-        --name $AiServiceName `
-        --resource-group $ResourceGroup `
-        --query "name" --output tsv 2>$null
-
-    if ($existing) {
-        $deployedModels = az cognitiveservices account deployment list `
-            --name $AiServiceName `
-            --resource-group $ResourceGroup `
-            --query "[].name" --output tsv 2>$null
+# Check if AI Foundry and model deployments already exist
+$existing = az cognitiveservices account show `
+    --name $AiFoundryName `
+    --resource-group $ResourceGroup `
+    --query "name" --output tsv 2>$null
 
-        $requiredDeployments = @()
-        foreach ($deployment in $aiModelDeployments) {
-            $requiredDeployments += $deployment.name
-        }
+if ($existing) {
+    $deployedModelsOutput = az cognitiveservices account deployment list `
+        --name $AiFoundryName `
+        --resource-group $ResourceGroup `
+        --query "[].name" --output tsv 2>$null
+
+    # Normalize output to array
+    $deployedModels = @()
+    if ($deployedModelsOutput -is [string]) {
+        $deployedModels += $deployedModelsOutput
+    } elseif ($deployedModelsOutput) {
+        $deployedModels = $deployedModelsOutput -split "`r?`n"
+    }
 
-        $missingDeployments = @()
-        foreach ($required in $requiredDeployments) {
-            if ($deployedModels -notcontains $required) {
-                $missingDeployments += $required
-            }
-        }
+    $requiredDeployments = $aiModelDeployments | ForEach-Object { $_.name }
+    $missingDeployments = $requiredDeployments | Where-Object { $_ -notin $deployedModels }
 
-        if ($missingDeployments.Count -eq 0) {
-            Write-Host "ℹ️ Azure AI service '$AiServiceName' exists and all required model deployments are provisioned."
-            Write-Host "⏭️ Skipping quota validation."
-            exit 0
-        } else {
-            Write-Host "🔍 AI service exists, but the following model deployments are missing: $($missingDeployments -join ', ')"
-            Write-Host "➡️ Proceeding with quota validation for missing models..."
-        }
+    if ($missingDeployments.Count -eq 0) {
+        Write-Host "ℹ️ AI Foundry '$AiFoundryName' exists and all required model deployments are already provisioned."
+        Write-Host "⏭️ Skipping quota validation."
+        exit 0
+    } else {
+        Write-Host "🔍 AI Foundry exists, but the following model deployments are missing: $($missingDeployments -join ', ')"
+        Write-Host "➡️ Proceeding with quota validation for missing models..."
     }
+} else {
+    Write-Host "❌ AI Foundry '$AiFoundryName' not found. Proceeding with quota validation."
 }
 
-# Start quota validation
+# Run quota validation
 az account set --subscription $SubscriptionId
 Write-Host "🎯 Active Subscription: $(az account show --query '[name, id]' --output tsv)"
 
@@ -94,17 +87,17 @@ foreach ($deployment in $aiModelDeployments) {
 
     if ($exitCode -ne 0) {
         if ($exitCode -eq 2) {
-            exit 1  # already printed, graceful
+            exit 1
         }
         Write-Error "❌ ERROR: Quota validation failed for model deployment: $name"
         $QuotaAvailable = $false
     }
 }
 
 if (-not $QuotaAvailable) {
-    Write-Error "❌ ERROR: One or more model deployments failed validation."
+    Write-Error "❌ ERROR: One or more model deployments failed quota validation."
     exit 1
 } else {
     Write-Host "✅ All model deployments passed quota validation successfully."
     exit 0
-}
+}
diff --git a/scripts/validate_model_deployment_quota.sh b/scripts/validate_model_deployment_quota.sh
@@ -6,15 +6,15 @@ MODELS_PARAMETER=""
 
 while [[ $# -gt 0 ]]; do
   case "$1" in
-    --subscription)
+    --SubscriptionId)
       SUBSCRIPTION_ID="$2"
       shift 2
       ;;
-    --location)
+    --Location)
       LOCATION="$2"
       shift 2
       ;;
-    --models-parameter)
+    --ModelsParameter)
       MODELS_PARAMETER="$2"
       shift 2
       ;;
@@ -25,57 +25,57 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
+AIFOUNDRY_NAME="${AZURE_AIFOUNDRY_NAME}"
+RESOURCE_GROUP="${AZURE_RESOURCE_GROUP}"
+
 # Validate required parameters
 MISSING_PARAMS=()
-[[ -z "$SUBSCRIPTION_ID" ]] && MISSING_PARAMS+=("subscription")
-[[ -z "$LOCATION" ]] && MISSING_PARAMS+=("location")
-[[ -z "$MODELS_PARAMETER" ]] && MISSING_PARAMS+=("models-parameter")
+[[ -z "$SUBSCRIPTION_ID" ]] && MISSING_PARAMS+=("SubscriptionId")
+[[ -z "$LOCATION" ]] && MISSING_PARAMS+=("Location")
+[[ -z "$MODELS_PARAMETER" ]] && MISSING_PARAMS+=("ModelsParameter")
+[[ -z "$AIFOUNDRY_NAME" ]] && MISSING_PARAMS+=("AZURE_AIFOUNDRY_NAME")
+[[ -z "$RESOURCE_GROUP" ]] && MISSING_PARAMS+=("AZURE_RESOURCE_GROUP")
 
 if [[ ${#MISSING_PARAMS[@]} -ne 0 ]]; then
   echo "❌ ERROR: Missing required parameters: ${MISSING_PARAMS[*]}"
-  echo "Usage: $0 --subscription <SUBSCRIPTION_ID> --location <LOCATION> --models-parameter <MODELS_PARAMETER>"
+  echo "Usage: $0 --SubscriptionId <SUBSCRIPTION_ID> --Location <LOCATION> --ModelsParameter <MODELS_PARAMETER>"
   exit 1
 fi
 
-# Read from environment
-AISERVICE_NAME="${AZURE_AISERVICE_NAME}"
-RESOURCE_GROUP="${AZURE_RESOURCE_GROUP}"
-
-# Check service and deployment existence
-if [[ -n "$AISERVICE_NAME" && -n "$RESOURCE_GROUP" ]]; then
-  existing=$(az cognitiveservices account show --name "$AISERVICE_NAME" --resource-group "$RESOURCE_GROUP" --query "name" --output tsv 2>/dev/null)
-  if [[ -n "$existing" ]]; then
-    echo "ℹ️ Found Azure AI service: $AISERVICE_NAME"
+# Check if AI Foundry exists and has required deployments
+existing=$(az cognitiveservices account show --name "$AIFOUNDRY_NAME" --resource-group "$RESOURCE_GROUP" --query "name" --output tsv 2>/dev/null)
+if [[ -n "$existing" ]]; then
+  echo "ℹ️ Found AI Foundry: $AIFOUNDRY_NAME"
 
-    existing_deployments=$(az cognitiveservices account deployment list --name "$AISERVICE_NAME" --resource-group "$RESOURCE_GROUP" --query "[].name" --output tsv 2>/dev/null)
+  existing_deployments=$(az cognitiveservices account deployment list --name "$AIFOUNDRY_NAME" --resource-group "$RESOURCE_GROUP" --query "[].name" --output tsv 2>/dev/null)
 
-    # Extract required model names
-    required_models=$(jq -r ".parameters.$MODELS_PARAMETER.value[].name" ./infra/main.parameters.json 2>/dev/null)
+  required_models=$(jq -r ".parameters.$MODELS_PARAMETER.value[].name" ./infra/main.parameters.json 2>/dev/null)
 
-    if [[ -z "$required_models" ]]; then
-      echo "❌ ERROR: Failed to extract required model names from main.parameters.json"
-      exit 1
-    fi
+  if [[ -z "$required_models" ]]; then
+    echo "❌ ERROR: Failed to extract required model names from main.parameters.json"
+    exit 1
+  fi
 
-    all_present=true
-    for model in $required_models; do
-      if ! grep -q -w "$model" <<< "$existing_deployments"; then
-        all_present=false
-        break
-      fi
-    done
-
-    if [[ "$all_present" == "true" ]]; then
-      echo "✅ All required model deployments already exist in AI service '$AISERVICE_NAME'."
-      echo "⏭️ Skipping quota validation."
-      exit 0
-    else
-      echo "🔍 AI service exists but some model deployments are missing — proceeding with quota validation."
+  all_present=true
+  for model in $required_models; do
+    if ! grep -q -w "$model" <<< "$existing_deployments"; then
+      all_present=false
+      break
     fi
+  done
+
+  if [[ "$all_present" == "true" ]]; then
+    echo "✅ All required model deployments already exist in AI Foundry '$AIFOUNDRY_NAME'."
+    echo "⏭️ Skipping quota validation."
+    exit 0
+  else
+    echo "🔍 AI Foundry exists, but some model deployments are missing — proceeding with quota validation."
   fi
+else
+  echo "❌ AI Foundry '$AIFOUNDRY_NAME' not found. Proceeding with quota validation."
 fi
 
-# If we reach here, continue with normal quota checks
+# Load deployment definitions
 aiModelDeployments=$(jq -c ".parameters.$MODELS_PARAMETER.value[]" ./infra/main.parameters.json)
 if [[ $? -ne 0 ]]; then
   echo "❌ ERROR: Failed to parse main.parameters.json. Ensure jq is installed and the JSON is valid."

Original file line number	Diff line number	Diff line change
`@@ -506,3 +506,5 @@ module deploymentScriptCLI 'br/public:avm/res/resources/deployment-script:0.5.1'`
`506`	`506`	`scriptContent: cosmosAssignCli`
`507`	`507`	`}`
`508`	`508`	`}`
	`509`	`+`
	`510`	`+output AZURE_AIFOUNDRY_NAME string = azureAiServices.name`