refactor the quota auto validation script

Author: Abdul-Microsoft

infra/main.parameters.json

@@ -63,7 +63,7 @@
           },
           "sku": {
             "name": "GlobalStandard",
-            "capacity": 200
+            "capacity": 50
           }
         }
       ]

scripts/validate_model_deployment_quota.ps1

@@ -12,41 +12,40 @@ $MissingParams = @()
 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 ', ')"
     exit 1
 }
 
-# Load model deployment parameters
+# Load model deployments from parameter file
 $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 Foundry and model deployments already exist
-$existing = az cognitiveservices account show `
-    --name $AiFoundryName `
-    --resource-group $ResourceGroup `
-    --query "name" --output tsv 2>$null
+# Check if AI Foundry exists and has all required model deployments
+$existing = $null
+if ($AiFoundryName -and $ResourceGroup) {
+    $existing = az cognitiveservices account show `
+        --name $AiFoundryName `
+        --resource-group $ResourceGroup `
+        --query "name" --output tsv 2>$null
+}
 
 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
@@ -65,11 +64,9 @@ if ($existing) {
         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."
 }
 
-# Run quota validation
+# Run quota validation for all models
 az account set --subscription $SubscriptionId
 Write-Host "🎯 Active Subscription: $(az account show --query '[name, id]' --output tsv)"
 

scripts/validate_model_deployment_quota.sh

@@ -33,28 +33,33 @@ MISSING_PARAMS=()
 [[ -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 --SubscriptionId <SUBSCRIPTION_ID> --Location <LOCATION> --ModelsParameter <MODELS_PARAMETER>"
   exit 1
 fi
 
-# 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"
+# Load model definitions
+aiModelDeployments=$(jq -c ".parameters.$MODELS_PARAMETER.value[]" ./infra/main.parameters.json 2>/dev/null)
+if [[ $? -ne 0 || -z "$aiModelDeployments" ]]; then
+  echo "❌ ERROR: Failed to parse main.parameters.json or missing '$MODELS_PARAMETER'"
+  exit 1
+fi
 
-  existing_deployments=$(az cognitiveservices account deployment list --name "$AIFOUNDRY_NAME" --resource-group "$RESOURCE_GROUP" --query "[].name" --output tsv 2>/dev/null)
+# Check if AI Foundry exists and has all required model deployments
+existing=""
+if [[ -n "$AIFOUNDRY_NAME" && -n "$RESOURCE_GROUP" ]]; then
+  existing=$(az cognitiveservices account show --name "$AIFOUNDRY_NAME" --resource-group "$RESOURCE_GROUP" --query "name" --output tsv 2>/dev/null)
+fi
 
-  required_models=$(jq -r ".parameters.$MODELS_PARAMETER.value[].name" ./infra/main.parameters.json 2>/dev/null)
+if [[ -n "$existing" ]]; then
+  existing_deployments=$(az cognitiveservices account deployment list \
+    --name "$AIFOUNDRY_NAME" \
+    --resource-group "$RESOURCE_GROUP" \
+    --query "[].name" --output tsv 2>/dev/null)
 
-  if [[ -z "$required_models" ]]; then
-    echo "❌ ERROR: Failed to extract required model names from main.parameters.json"
-    exit 1
-  fi
+  required_models=$(jq -r ".parameters.$MODELS_PARAMETER.value[].name" ./infra/main.parameters.json)
 
   all_present=true
   for model in $required_models; do
@@ -69,19 +74,11 @@ if [[ -n "$existing" ]]; then
     echo "⏭️ Skipping quota validation."
     exit 0
   else
-    echo "🔍 AI Foundry exists, but some model deployments are missing — proceeding with quota validation."
+    echo "🔍 Some model deployments are missing — proceeding with quota validation."
   fi
-else
-  echo "❌ AI Foundry '$AIFOUNDRY_NAME' not found. Proceeding with quota validation."
-fi
-
-# 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."
-  exit 1
 fi
 
+# Run quota validation
 az account set --subscription "$SUBSCRIPTION_ID"
 echo "🎯 Active Subscription: $(az account show --query '[name, id]' --output tsv)"
 
@@ -95,11 +92,10 @@ while IFS= read -r deployment; do
 
   echo "🔍 Validating model deployment: $name ..."
   ./scripts/validate_model_quota.sh --location "$LOCATION" --model "$model" --capacity "$capacity" --deployment-type "$type"
-
   exit_code=$?
+
   if [[ $exit_code -ne 0 ]]; then
     if [[ $exit_code -eq 2 ]]; then
-      # Quota validation handled inside script — stop immediately
       exit 1
     fi
     echo "❌ ERROR: Quota validation failed for model deployment: $name"