remove the quota check validation

Author: Shreyas-Microsoft

scripts/validate_model_deployment_quota.ps1

@@ -4,93 +4,58 @@ param (
     [string]$ModelsParameter
 )
 
-$AiFoundryName = $env:AZURE_AIFOUNDRY_NAME
-$ResourceGroup = $env:AZURE_RESOURCE_GROUP
-
-# Validate required parameters
+# Verify all required parameters are provided
 $MissingParams = @()
-if (-not $SubscriptionId) { $MissingParams += "SubscriptionId" }
-if (-not $Location) { $MissingParams += "Location" }
-if (-not $ModelsParameter) { $MissingParams += "ModelsParameter" }
 
-if ($MissingParams.Count -gt 0) {
-    Write-Error "❌ ERROR: Missing required parameters: $($MissingParams -join ', ')"
-    Write-Host "Usage: validate_model_deployment_quota.ps1 -SubscriptionId <SUBSCRIPTION_ID> -Location <LOCATION> -ModelsParameter <MODELS_PARAMETER>"
-    exit 1
+if (-not $SubscriptionId) {
+    $MissingParams += "subscription"
 }
 
-# Load model deployments from parameter file
-$JsonContent = Get-Content -Path "./infra/main.parameters.json" -Raw | ConvertFrom-Json
-$aiModelDeployments = $JsonContent.parameters.$ModelsParameter.value
-if (-not $aiModelDeployments -or -not ($aiModelDeployments -is [System.Collections.IEnumerable])) {
-    Write-Error "❌ ERROR: Failed to parse main.parameters.json or missing '$ModelsParameter'"
-    exit 1
+if (-not $Location) {
+    $MissingParams += "location"
 }
 
-# Try to discover AI Foundry name if not set
-if (-not $AiFoundryName -and $ResourceGroup) {
-    $AiFoundryName = az cognitiveservices account list `
-        --resource-group $ResourceGroup `
-        --query "sort_by([?kind=='AIServices'], &name)[0].name" `
-        -o tsv 2>$null
+if (-not $ModelsParameter) {
+    $MissingParams += "models-parameter"
 }
 
-# Check if AI Foundry exists
-if ($AiFoundryName -and $ResourceGroup) {
-    $existing = az cognitiveservices account show `
-        --name $AiFoundryName `
-        --resource-group $ResourceGroup `
-        --query "name" --output tsv 2>$null
-
-    if ($existing) {
-        # adding into .env
-        azd env set AZURE_AIFOUNDRY_NAME $existing | Out-Null
+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
+}
 
-        $deployedModelsOutput = az cognitiveservices account deployment list `
-            --name $AiFoundryName `
-            --resource-group $ResourceGroup `
-            --query "[].name" --output tsv 2>$null
+$JsonContent = Get-Content -Path "./infra/main.parameters.json" -Raw | ConvertFrom-Json
 
-        $deployedModels = @()
-        if ($deployedModelsOutput -is [string]) {
-            $deployedModels += $deployedModelsOutput
-        } elseif ($deployedModelsOutput) {
-            $deployedModels = $deployedModelsOutput -split "`r?`n"
-        }
+if (-not $JsonContent) {
+    Write-Error "❌ ERROR: Failed to parse main.parameters.json. Ensure the JSON file is valid."
+    exit 1
+}
 
-        $requiredDeployments = $aiModelDeployments | ForEach-Object { $_.name }
-        $missingDeployments = $requiredDeployments | Where-Object { $_ -notin $deployedModels }
+$aiModelDeployments = $JsonContent.parameters.$ModelsParameter.value
 
-        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..."
-        }
-    }
+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
 }
 
-# Run quota validation
 az account set --subscription $SubscriptionId
 Write-Host "🎯 Active Subscription: $(az account show --query '[name, id]' --output tsv)"
 
 $QuotaAvailable = $true
-
 foreach ($deployment in $aiModelDeployments) {
     $name = if ($env:AZURE_ENV_MODEL_NAME) { $env:AZURE_ENV_MODEL_NAME } else { $deployment.name }
     $model = if ($env:AZURE_ENV_MODEL_NAME) { $env:AZURE_ENV_MODEL_NAME } else { $deployment.model.name }
     $type = if ($env:AZURE_ENV_MODEL_DEPLOYMENT_TYPE) { $env:AZURE_ENV_MODEL_DEPLOYMENT_TYPE } else { $deployment.sku.name }
     $capacity = if ($env:AZURE_ENV_MODEL_CAPACITY) { $env:AZURE_ENV_MODEL_CAPACITY } else { $deployment.sku.capacity }
 
-    Write-Host ""
-    Write-Host "🔍 Validating model deployment: $name ..."
+    Write-Host "`n🔍 Validating model deployment: $name ..."
     & .\scripts\validate_model_quota.ps1 -Location $Location -Model $model -Capacity $capacity -DeploymentType $type
     $exitCode = $LASTEXITCODE
 
     if ($exitCode -ne 0) {
         if ($exitCode -eq 2) {
+            # Quota error already printed inside the script, exit gracefully without reprinting
             exit 1
         }
         Write-Error "❌ ERROR: Quota validation failed for model deployment: $name"
@@ -99,9 +64,9 @@ foreach ($deployment in $aiModelDeployments) {
 }
 
 if (-not $QuotaAvailable) {
-    Write-Error "❌ ERROR: One or more model deployments failed quota validation."
+    Write-Error "❌ ERROR: One or more model deployments failed validation."
     exit 1
 } else {
     Write-Host "✅ All model deployments passed quota validation successfully."
     exit 0
-}
+}

scripts/validate_model_deployment_quota.sh

@@ -1,123 +1,87 @@
 #!/bin/bash
-
 SUBSCRIPTION_ID=""
 LOCATION=""
 MODELS_PARAMETER=""
 
 while [[ $# -gt 0 ]]; do
   case "$1" in
-    --SubscriptionId)
+    --subscription)
       SUBSCRIPTION_ID="$2"
       shift 2
       ;;
-    --Location)
+    --location)
       LOCATION="$2"
       shift 2
       ;;
-    --ModelsParameter)
+    --models-parameter)
       MODELS_PARAMETER="$2"
       shift 2
       ;;
     *)
-      echo "❌ ERROR: Unknown option: $1"
+      echo "Unknown option: $1"
       exit 1
       ;;
   esac
 done
 
-AIFOUNDRY_NAME="${AZURE_AIFOUNDRY_NAME}"
-RESOURCE_GROUP="${AZURE_RESOURCE_GROUP}"
-
-# Validate required parameters
+# Verify all required parameters are provided and echo missing ones
 MISSING_PARAMS=()
-[[ -z "$SUBSCRIPTION_ID" ]] && MISSING_PARAMS+=("SubscriptionId")
-[[ -z "$LOCATION" ]] && MISSING_PARAMS+=("Location")
-[[ -z "$MODELS_PARAMETER" ]] && MISSING_PARAMS+=("ModelsParameter")
 
-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
+if [[ -z "$SUBSCRIPTION_ID" ]]; then
+    MISSING_PARAMS+=("subscription")
 fi
 
-# 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
+if [[ -z "$LOCATION" ]]; then
+    MISSING_PARAMS+=("location")
 fi
 
-# Try to discover AI Foundry name if not set
-if [[ -z "$AIFOUNDRY_NAME" && -n "$RESOURCE_GROUP" ]]; then
-  AIFOUNDRY_NAME=$(az cognitiveservices account list --resource-group "$RESOURCE_GROUP" \
-    --query "sort_by([?kind=='AIServices'], &name)[0].name" -o tsv 2>/dev/null)
+if [[ -z "$MODELS_PARAMETER" ]]; then
+    MISSING_PARAMS+=("models-parameter")
 fi
 
-# Check if AI Foundry exists
-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)
-
-  if [[ -n "$existing" ]]; then
-    # adding into .env
-    azd env set AZURE_AIFOUNDRY_NAME "$existing" > /dev/null
-
-    # Check model deployments
-    existing_deployments=$(az cognitiveservices account deployment list \
-      --name "$AIFOUNDRY_NAME" \
-      --resource-group "$RESOURCE_GROUP" \
-      --query "[].name" --output tsv 2>/dev/null)
+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>"
+    exit 1
+fi
 
-    required_models=$(jq -r ".parameters.$MODELS_PARAMETER.value[].name" ./infra/main.parameters.json)
+aiModelDeployments=$(jq -c ".parameters.$MODELS_PARAMETER.value[]" ./infra/main.parameters.json)
 
-    missing_models=()
-    for model in $required_models; do
-      if ! grep -q -w "$model" <<< "$existing_deployments"; then
-        missing_models+=("$model")
-      fi
-    done
-
-    if [[ ${#missing_models[@]} -eq 0 ]]; then
-      echo "ℹ️ AI Foundry '$AIFOUNDRY_NAME' exists and all required model deployments are already provisioned."
-      echo "⏭️ Skipping quota validation."
-      exit 0
-    else
-      echo "🔍 AI Foundry exists, but the following model deployments are missing: ${missing_models[*]}"
-      echo "➡️ Proceeding with quota validation for missing models..."
-    fi
-  fi
+if [ $? -ne 0 ]; then
+  echo "Error: Failed to parse main.parameters.json. Ensure jq is installed and the JSON file 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)"
 
 quotaAvailable=true
 
 while IFS= read -r deployment; do
-  name=${AZURE_ENV_MODEL_NAME:-$(echo "$deployment" | jq -r '.name')}
-  model=${AZURE_ENV_MODEL_NAME:-$(echo "$deployment" | jq -r '.model.name')}
-  type=${AZURE_ENV_MODEL_DEPLOYMENT_TYPE:-$(echo "$deployment" | jq -r '.sku.name')}
-  capacity=${AZURE_ENV_MODEL_CAPACITY:-$(echo "$deployment" | jq -r '.sku.capacity')}
+ name=${AZURE_ENV_MODEL_NAME:-$(echo "$deployment" | jq -r '.name')}
+ model=${AZURE_ENV_MODEL_NAME:-$(echo "$deployment" | jq -r '.model.name')}
+ type=${AZURE_ENV_MODEL_DEPLOYMENT_TYPE:-$(echo "$deployment" | jq -r '.sku.name')}
+ capacity=${AZURE_ENV_MODEL_CAPACITY:-$(echo "$deployment" | jq -r '.sku.capacity')}
 
-  echo ""
   echo "🔍 Validating model deployment: $name ..."
-  ./scripts/validate_model_quota.sh --location "$LOCATION" --model "$model" --capacity "$capacity" --deployment-type "$type"
-  exit_code=$?
+    ./scripts/validate_model_quota.sh --location "$LOCATION" --model "$model" --capacity $capacity --deployment-type $type
 
-  if [[ $exit_code -ne 0 ]]; then
-    if [[ $exit_code -eq 2 ]]; then
-      exit 1
-    fi
-    echo "❌ ERROR: Quota validation failed for model deployment: $name"
-    quotaAvailable=false
+  # Check if the script failed
+  exit_code=$?
+  if [ $exit_code -ne 0 ]; then
+      if [ $exit_code -eq 2 ]; then
+          # Skip printing any quota validation error — already handled inside the validation script
+          exit 1
+      fi
+      echo "❌ ERROR: Quota validation failed for model deployment: $name"
+      quotaAvailable=false
   fi
 done <<< "$(echo "$aiModelDeployments")"
 
-if [[ "$quotaAvailable" = false ]]; then
-  echo "❌ ERROR: One or more model deployments failed quota validation."
-  exit 1
+if [ "$quotaAvailable" = false ]; then
+    echo "❌ ERROR: One or more model deployments failed validation."
+    exit 1
 else
-  echo "✅ All model deployments passed quota validation successfully."
-  exit 0
-fi
+    echo "✅ All model deployments passed quota validation successfully."
+    exit 0
+fi