Fix deploy to azure

Author: howieleung

README.md

@@ -25,8 +25,8 @@ The app code runs in Azure Container apps to process the user input and generate
 
 ### Quick Deploy
 
-| [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/Azure-Samples/get-started-with-ai-agents) | [![Open in Dev Containers](https://img.shields.io/static/v1?style=for-the-badge&label=Dev%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/Azure-Samples/get-started-with-ai-agents) | 
-|---|---|
+| [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/Azure-Samples/get-started-with-ai-agents) | [![Open in Dev Containers](https://img.shields.io/static/v1?style=for-the-badge&label=Dev%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/Azure-Samples/get-started-with-ai-agents) | [![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure-Samples%2Fget-started-with-ai-agents%2Frefs%2Fheads%2Fmain%2Finfra%2Fmain.json) |
+|---|---|---|
 
 Github Codespaces and Dev Containers both allow you to download and deploy the code for development. You can also continue with local development. Once you have selected your environment, follow the instructions below to customize and deploy your solution.    
 

infra/main.bicep

@@ -53,60 +53,58 @@ param aiSearchIndexName string = ''
 param storageAccountName string = ''
 @description('The log analytics workspace name. If ommited will be generated')
 param logAnalyticsWorkspaceName string = ''
-@description('Id of the user or app to assign application roles')
-param principalId string = ''
 
 // Chat completion model
 @description('Format of the chat model to deploy')
 @allowed(['Microsoft', 'OpenAI'])
-param agentModelFormat string
+param agentModelFormat string = 'OpenAI'
 @description('Name of agent to deploy')
-param agentName string
+param agentName string = 'agent-template-assistant'
 @description('ID of agent to deploy')
 param aiAgentID string = ''
 @description('Name of the chat model to deploy')
-param agentModelName string
+param agentModelName string = 'gpt-4o-mini'
 @description('Name of the model deployment')
-param agentDeploymentName string
+param agentDeploymentName string = 'gpt-4o-mini'
 
 @description('Version of the chat model to deploy')
 // See version availability in this table:
 // https://learn.microsoft.com/azure/ai-services/openai/concepts/models#global-standard-model-availability
-param agentModelVersion string
+param agentModelVersion string = '2024-07-18'
 
 @description('Sku of the chat deployment')
-param agentDeploymentSku string
+param agentDeploymentSku string = 'GlobalStandard'
 
 @description('Capacity of the chat deployment')
 // You can increase this, but capacity is limited per model/region, so you will get errors if you go over
 // https://learn.microsoft.com/en-us/azure/ai-services/openai/quotas-limits
-param agentDeploymentCapacity int
+param agentDeploymentCapacity int = 30
 
 // Embedding model
 @description('Format of the embedding model to deploy')
 @allowed(['Microsoft', 'OpenAI'])
-param embedModelFormat string
+param embedModelFormat string = 'OpenAI'
 
 @description('Name of the embedding model to deploy')
-param embedModelName string
+param embedModelName string = 'text-embedding-3-small'
 @description('Name of the embedding model deployment')
-param embeddingDeploymentName string
+param embeddingDeploymentName string = 'text-embedding-3-small'
 @description('Embedding model dimensionality')
-param embeddingDeploymentDimensions string
+param embeddingDeploymentDimensions string = '100'
 
 @description('Version of the embedding model to deploy')
 // See version availability in this table:
 // https://learn.microsoft.com/azure/ai-services/openai/concepts/models#embeddings-models
 @secure()
-param embedModelVersion string
+param embedModelVersion string = '1'
 
 @description('Sku of the embeddings model deployment')
-param embedDeploymentSku string
+param embedDeploymentSku string = 'Standard'
 
 @description('Capacity of the embedding deployment')
 // You can increase this, but capacity is limited per model/region, so you will get errors if you go over
 // https://learn.microsoft.com/azure/ai-services/openai/quotas-limits
-param embedDeploymentCapacity int
+param embedDeploymentCapacity int = 30
 
 param useContainerRegistry bool = true
 param useApplicationInsights bool = true
@@ -249,7 +247,7 @@ module userRoleAzureAIDeveloperBackendExistingProjectRG 'core/security/role.bice
   scope: existingProjectRG
   params: {
     principalId: api.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID
-    roleDefinitionId: '64702f94-c441-49e6-a78b-ef80e0188fee'
+    roleDefinitionId: '64702f94-c441-49e6-a78b-ef80e0188fee' 
   }
 }
 
@@ -297,47 +295,47 @@ module api 'api.bicep' = {
   }
 }
 
-module userAcrRolePush 'core/security/role.bicep' = if (!empty(principalId)) {
+module userAcrRolePush 'core/security/role.bicep' = {
   name: 'user-role-acr-push'
   scope: rg
   params: {
-    principalId: principalId
+    principalId: api.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID
     roleDefinitionId: '8311e382-0749-4cb8-b61a-304f252e45ec'
   }
 }
 
-module userAcrRolePull 'core/security/role.bicep' = if (!empty(principalId)) {
+module userAcrRolePull 'core/security/role.bicep' = {
   name: 'user-role-acr-pull'
   scope: rg
   params: {
-    principalId: principalId
+    principalId: api.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID
     roleDefinitionId: '7f951dda-4ed3-4680-a7ca-43fe172d538d'
   }
 }
 
-module userRoleDataScientist 'core/security/role.bicep' = if (!empty(principalId)) {
+module userRoleDataScientist 'core/security/role.bicep' = {
   name: 'user-role-data-scientist'
   scope: rg
   params: {
-    principalId: principalId
+    principalId: api.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID
     roleDefinitionId: 'f6c7c914-8db3-469d-8ca1-694a8f32e121'
   }
 }
 
-module userRoleSecretsReader 'core/security/role.bicep' = if (!empty(principalId)) {
+module userRoleSecretsReader 'core/security/role.bicep' = {
   name: 'user-role-secrets-reader'
   scope: rg
   params: {
-    principalId: principalId
+    principalId: api.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID
     roleDefinitionId: 'ea01e6af-a1c1-4350-9563-ad00f8c72ec5'
   }
 }
 
-module userRoleAzureAIDeveloper 'core/security/role.bicep' = if (!empty(principalId)) {
+module userRoleAzureAIDeveloper 'core/security/role.bicep' = {
   name: 'user-role-azureai-developer'
   scope: rg
   params: {
-    principalId: principalId
+    principalId: api.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID
     roleDefinitionId: '64702f94-c441-49e6-a78b-ef80e0188fee'
   }
 }
@@ -369,29 +367,29 @@ module backendRoleSearchServiceContributorRG 'core/security/role.bicep' = if (us
   }
 }
 
-module userRoleSearchIndexDataContributorRG 'core/security/role.bicep' = if (useSearchService && !empty(principalId)) {
+module userRoleSearchIndexDataContributorRG 'core/security/role.bicep' = if (useSearchService) {
   name: 'user-role-azure-index-data-contributor-rg'
   scope: rg
   params: {
-    principalId: principalId
+    principalId: api.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID
     roleDefinitionId: '8ebe5a00-799e-43f5-93ac-243d3dce84a7'
   }
 }
 
-module userRoleSearchIndexDataReaderRG 'core/security/role.bicep' = if (useSearchService && !empty(principalId)) {
+module userRoleSearchIndexDataReaderRG 'core/security/role.bicep' = if (useSearchService) {
   name: 'user-role-azure-index-data-reader-rg'
   scope: rg
   params: {
-    principalId: principalId
+    principalId: api.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID
     roleDefinitionId: '1407120a-92aa-4202-b7e9-c0e197c71c8f'
   }
 }
 
-module userRoleSearchServiceContributorRG 'core/security/role.bicep' = if (useSearchService && !empty(principalId)) {
+module userRoleSearchServiceContributorRG 'core/security/role.bicep' = if (useSearchService) {
   name: 'user-role-azure-search-service-contributor-rg'
   scope: rg
   params: {
-    principalId: principalId
+    principalId: api.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID
     roleDefinitionId: '7ca78c08-252a-4471-8644-bb5ff32d4ba0'
   }
 }