Merge pull request #119 from microsoft/quota-auto-validation

feat: Added Quota Auto Validation Scripts

Author: Roopan-Microsoft

azure.yaml

@@ -21,3 +21,19 @@ deployment:
     AzureAiServiceLocation: ${{ parameters.AzureAiServiceLocation }}
     Prefix: ${{ parameters.Prefix }}
     baseUrl: ${{ parameters.baseUrl }}
+hooks:
+  preprovision:
+    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"
+      interactive: false
+      continueOnError: false
+
+    windows:
+      shell: pwsh
+      run: >
+        $location = if ($env:AZURE_AISERVICE_LOCATION) { $env:AZURE_AISERVICE_LOCATION } else { "japaneast" };
+        ./scripts/validate_model_deployment_quota.ps1 -SubscriptionId $env:AZURE_SUBSCRIPTION_ID -Location $location -ModelsParameter "aiModelDeployments"
+      interactive: false
+      continueOnError: false

infra/main.bicep

@@ -4,28 +4,19 @@ param Prefix string
 var abbrs = loadJsonContent('./abbreviations.json')
 var safePrefix = length(Prefix) > 20 ? substring(Prefix, 0, 20) : Prefix
 
+@description('Required. Location for all Resources except AI Foundry.')
+param solutionLocation string = resourceGroup().location
+
 @allowed([
   'australiaeast'
-  'brazilsouth'
-  'canadacentral'
-  'canadaeast'
   'eastus'
   'eastus2'
   'francecentral'
-  'germanywestcentral'
   'japaneast'
-  'koreacentral'
-  'northcentralus'
   'norwayeast'
-  'polandcentral'
-  'southafricanorth'
-  'southcentralus'
   'southindia'
   'swedencentral'
-  'switzerlandnorth'
-  'uaenorth'
   'uksouth'
-  'westeurope'
   'westus'
   'westus3'
 ])
@@ -57,8 +48,6 @@ param gptModelVersion string = '2024-08-06'
 var uniqueId = toLower(uniqueString(subscription().id, safePrefix, resourceGroup().location))
 var UniquePrefix = 'cm${padLeft(take(uniqueId, 12), 12, '0')}'
 var ResourcePrefix = take('cm${safePrefix}${UniquePrefix}', 15)
-var location  = resourceGroup().location
-var dblocation  = resourceGroup().location
 var cosmosdbDatabase  = 'cmsadb'
 var cosmosdbBatchContainer  = 'cmsabatch'
 var cosmosdbFileContainer  = 'cmsafile'
@@ -85,7 +74,7 @@ var aiModelDeployments = [
 
 resource azureAiServices 'Microsoft.CognitiveServices/accounts@2024-04-01-preview' = {
   name: azureAiServicesName
-  location: location
+  location: AzureAiServiceLocation
   sku: {
     name: 'S0'
   }
@@ -121,7 +110,7 @@ module managedIdentityModule 'deploy_managed_identity.bicep' = {
   params: {
     miName:'${abbrs.security.managedIdentity}${ResourcePrefix}'
     solutionName: ResourcePrefix
-    solutionLocation: location 
+    solutionLocation: solutionLocation 
   }
   scope: resourceGroup(resourceGroup().name)
 }
@@ -133,7 +122,7 @@ module kvault 'deploy_keyvault.bicep' = {
   params: {
     keyvaultName: '${abbrs.security.keyVault}${ResourcePrefix}'
     solutionName: ResourcePrefix
-    solutionLocation: location
+    solutionLocation: solutionLocation
     managedIdentityObjectId:managedIdentityModule.outputs.managedIdentityOutput.objectId
   }
   scope: resourceGroup(resourceGroup().name)
@@ -162,7 +151,7 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.9.1
   params: {
     logAnalyticsWorkspaceResourceId: azureAifoundry.outputs.logAnalyticsId
     name: toLower('${ResourcePrefix}manenv')
-    location: location
+    location: solutionLocation
     zoneRedundant: false
     managedIdentities: managedIdentityModule
   }
@@ -175,7 +164,7 @@ module databaseAccount 'br/public:avm/res/document-db/database-account:0.9.0' =
     name: toLower('${abbrs.databases.cosmosDBDatabase}${ResourcePrefix}databaseAccount')
     // Non-required parameters
     enableAnalyticalStorage: true
-    location: dblocation
+    location: solutionLocation
     managedIdentities: {
       systemAssigned: true
       userAssignedResourceIds: [
@@ -193,7 +182,7 @@ module databaseAccount 'br/public:avm/res/document-db/database-account:0.9.0' =
       {
         failoverPriority: 0
         isZoneRedundant: false
-        locationName: dblocation
+        locationName: solutionLocation
       }
     ]
     sqlDatabases: [
@@ -268,14 +257,14 @@ module containerAppFrontend 'br/public:avm/res/app/container-app:0.13.0' = {
     environmentResourceId: containerAppsEnvironment.outputs.resourceId
     name: toLower('${abbrs.containers.containerApp}${ResourcePrefix}Frontend')
     // Non-required parameters
-    location: location
+    location: solutionLocation
   }
 }
 
 
 resource containerAppBackend 'Microsoft.App/containerApps@2023-05-01' = {
   name: toLower('${abbrs.containers.containerApp}${ResourcePrefix}Backend')
-  location: location
+  location: solutionLocation
   identity: {
     type: 'SystemAssigned'
   }
@@ -393,7 +382,7 @@ resource containerAppBackend 'Microsoft.App/containerApps@2023-05-01' = {
 }
 resource storageContianerApp 'Microsoft.Storage/storageAccounts@2022-09-01' = {
   name: storageContainerName
-  location: location
+  location: solutionLocation
   sku: {
     name: storageSkuName
   }

infra/main.bicepparam

@@ -1,7 +1,8 @@
 using './main.bicep'
 
 param Prefix = readEnvironmentVariable('AZURE_ENV_NAME','azdtemp')
-param AzureAiServiceLocation = readEnvironmentVariable('AZURE_LOCATION','japaneast')
+param solutionLocation = readEnvironmentVariable('AZURE_LOCATION', 'eastus2')
+param AzureAiServiceLocation = readEnvironmentVariable('AZURE_AISERVICE_LOCATION','japaneast')
 param capacity = int(readEnvironmentVariable('AZURE_ENV_MODEL_CAPACITY', '200'))
 param deploymentType = readEnvironmentVariable('AZURE_ENV_MODEL_DEPLOYMENT_TYPE', 'GlobalStandard')
 param llmModel = readEnvironmentVariable('AZURE_ENV_MODEL_NAME', 'gpt-4o')