Merge pull request microsoft#358 from microsoft/main

feat: down merge from main to dev

Author: Prajwal-Microsoft

docs/CustomizingAzdParameters.md

@@ -18,7 +18,7 @@ By default this template will use the environment name as the prefix to prevent
 | `AZURE_ENV_MODEL_CAPACITY`       | int | `150`      | Sets the GPT model capacity.                                                |
 | `AZURE_ENV_IMAGETAG`            | string | `latest`          | Docker image tag used for container deployments.                                                   |
 | `AZURE_ENV_ENABLE_TELEMETRY`    | bool   | `true`            | Enables telemetry for monitoring and diagnostics.                                                  |
-| `AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID` | string  | `<Existing Workspace Id>`     | Set this if you want to reuse an existing Log Analytics Workspace instead of creating a new one.     |
+| `AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID` | string  | Guide to get your [Existing Workspace ID](/docs/re-use-log-analytics.md) | Set this if you want to reuse an existing Log Analytics Workspace instead of creating a new one.     |
 ---
 
 ## How to Set a Parameter

infra/modules/role.bicep

@@ -29,6 +29,7 @@ resource aiUserAccessFoundry 'Microsoft.Authorization/roleAssignments@2022-04-01
   properties: {
     roleDefinitionId: aiUser.id
     principalId: principalId
+    principalType: 'ServicePrincipal'
   }
 }
 
@@ -38,6 +39,7 @@ resource aiDeveloperAccessFoundry 'Microsoft.Authorization/roleAssignments@2022-
   properties: {
     roleDefinitionId: aiDeveloper.id
     principalId: principalId
+    principalType: 'ServicePrincipal'
   }
 }
 
@@ -47,5 +49,6 @@ resource cognitiveServiceOpenAIUserAccessFoundry 'Microsoft.Authorization/roleAs
   properties: {
     roleDefinitionId: cognitiveServiceOpenAIUser.id
     principalId: principalId
+    principalType: 'ServicePrincipal'
   }
 }

infra/old/deploy_ai_foundry.bicep

@@ -169,6 +169,7 @@ resource aiDevelopertoAIProject 'Microsoft.Authorization/roleAssignments@2022-04
   properties: {
     roleDefinitionId: aiDeveloper.id
     principalId: aiHubProject.identity.principalId
+    principalType: 'ServicePrincipal'
   }
 }
 

infra/old/main.bicep

@@ -680,6 +680,7 @@ module aiFoundryStorageAccount 'br/public:avm/res/storage/storage-account:0.18.2
       {
         principalId: userAssignedIdentity.outputs.principalId
         roleDefinitionIdOrName: 'Storage Blob Data Contributor'
+        principalType: 'ServicePrincipal'
       }
     ]
   }
@@ -760,6 +761,7 @@ module aiFoundryAiProject 'br/public:avm/res/machine-learning-services/workspace
         principalId: containerApp.outputs.?systemAssignedMIPrincipalId!
         // Assigning the role with the role name instead of the role ID freezes the deployment at this point
         roleDefinitionIdOrName: '64702f94-c441-49e6-a78b-ef80e0188fee' //'Azure AI Developer'
+        principalType: 'ServicePrincipal'
       }
     ]
   }

infra/scripts/quota_check_params.sh

@@ -164,11 +164,7 @@ for REGION in "${REGIONS[@]}"; do
         FOUND=false
         INSUFFICIENT_QUOTA=false
 
-        if [ "$MODEL_NAME" = "text-embedding-ada-002" ]; then
-            MODEL_TYPES=("openai.standard.$MODEL_NAME")
-        else
-            MODEL_TYPES=("openai.standard.$MODEL_NAME" "openai.globalstandard.$MODEL_NAME")
-        fi
+        MODEL_TYPES=("openai.standard.$MODEL_NAME" "openai.globalstandard.$MODEL_NAME")
 
         for MODEL_TYPE in "${MODEL_TYPES[@]}"; do
             FOUND=false

infra/scripts/validate_model_quota.ps1

@@ -1,7 +1,7 @@
 param (
     [string]$Location,
     [string]$Model,
-    [string]$DeploymentType = "Standard",
+    [string]$DeploymentType = "GlobalStandard",
     [int]$Capacity
 )
 

infra/scripts/validate_model_quota.sh

@@ -2,7 +2,7 @@
 
 LOCATION=""
 MODEL=""
-DEPLOYMENT_TYPE="Standard"
+DEPLOYMENT_TYPE="GlobalStandard"
 CAPACITY=0
 
 ALL_REGIONS=('australiaeast' 'eastus2' 'francecentral' 'japaneast' 'norwayeast' 'swedencentral' 'uksouth' 'westus')