updates for existing AI Foundry in Bicep & scripts

Author: Ragini-Microsoft

docs/DeploymentGuide.md

@@ -175,7 +175,7 @@ Once you've opened the project in [Codespaces](#github-codespaces), [Dev Contain
     ```
     If you don't have azd env then you need to pass parameters along with the command. Then the command will look like the following:
     ```shell 
-    bash ./infra/scripts/process_sample_data.sh <Storage-Account-name> <Storage-Account-container-name> <Key-Vault-name> <CosmosDB-Account-name> <Resource-Group-name> <aiFoundryResourceName> <aiSearchResourceName>
+    bash ./infra/scripts/process_sample_data.sh <Storage-Account-name> <Storage-Account-container-name> <Key-Vault-name> <CosmosDB-Account-name> <Resource-Group-name> <AI-Foundry-Name> <AI-Foundry-Resource-Group-Name> <Search-Service-Name>
     ```
 
 6. Open the [Azure Portal](https://portal.azure.com/), go to the deployed resource group, find the App Service and get the app URL from `Default domain`.

infra/deploy_ai_foundry.bicep

@@ -112,6 +112,11 @@ resource applicationInsights 'Microsoft.Insights/components@2020-02-02' = {
   }
 }
 
+resource existingAiFoundry 'Microsoft.CognitiveServices/accounts@2025-04-01-preview' existing = if (!empty(azureExistingAIProjectResourceId)) {
+  name: existingAIFoundryName
+  scope: resourceGroup(existingAIServiceSubscription, existingAIServiceResourceGroup)
+}
+
 resource aiFoundry 'Microsoft.CognitiveServices/accounts@2025-04-01-preview' = if (empty(azureExistingAIProjectResourceId))  {
   name: aiFoundryName
   location: location
@@ -360,23 +365,27 @@ resource cogServiceEndpointEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-p
   parent: keyVault
   name: 'COG-SERVICES-ENDPOINT'
   properties: {
-    value: aiFoundry.properties.endpoint
+    value: !empty(existingOpenAIEndpoint)
+      ? existingOpenAIEndpoint
+      : aiFoundry.properties.endpoint
   }
 }
 
 resource cogServiceKeyEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
   parent: keyVault
   name: 'COG-SERVICES-KEY'
   properties: {
-    value: aiFoundry.listKeys().key1
+    value: !empty(existingOpenAIEndpoint)
+      ? existingAiFoundry.listKeys().key1
+      : aiFoundry.listKeys().key1
   }
 }
 
 resource cogServiceNameEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
   parent: keyVault
   name: 'COG-SERVICES-NAME'
   properties: {
-    value: aiFoundryName
+    value: !empty(existingAIFoundryName) ? existingAIFoundryName : aiFoundryName
   }
 }
 
@@ -407,9 +416,9 @@ resource azureLocatioEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview
 output keyvaultName string = keyvaultName
 output keyvaultId string = keyVault.id
 
-output aiServicesTarget string = aiFoundry.properties.endpoint //aiServices_m.properties.endpoint
-output aiServicesName string = aiFoundryName //aiServicesName_m
-output aiServicesId string = aiFoundry.id //aiServices_m.id
+// output aiServicesTarget string = aiFoundry.properties.endpoint //aiServices_m.properties.endpoint
+// output aiServicesName string = aiFoundryName //aiServicesName_m
+// output aiServicesId string = aiFoundry.id //aiServices_m.id
 
 output aiSearchName string = aiSearchName
 output aiSearchId string = aiSearch.id
@@ -426,6 +435,7 @@ output aoaiEndpoint string = !empty(existingOpenAIEndpoint)
   ? existingOpenAIEndpoint
   : aiFoundry.properties.endpoints['OpenAI Language Model Instance API']
 output aiFoundryName string = !empty(existingAIFoundryName) ? existingAIFoundryName : aiFoundryName
+output aiFoundryRgName string = !empty(existingAIServiceResourceGroup) ? existingAIServiceResourceGroup : resourceGroup().name
 
 output applicationInsightsId string = applicationInsights.id
 output logAnalyticsWorkspaceResourceName string = useExisting ? existingLogAnalyticsWorkspace.name : logAnalytics.name

infra/main.bicep

@@ -199,5 +199,6 @@ output KEY_VAULT_NAME string = kvault.outputs.keyvaultName
 output COSMOSDB_ACCOUNT_NAME string = cosmosDBModule.outputs.cosmosAccountName
 output RESOURCE_GROUP_NAME string = resourceGroup().name
 output AI_FOUNDRY_NAME string = aifoundry.outputs.aiFoundryName
+output AI_FOUNDRY_RG_NAME string = aifoundry.outputs.aiFoundryRgName
 output AI_SEARCH_SERVICE_NAME string = aifoundry.outputs.aiSearchService
 output AZURE_SEARCH_CONNECTION_NAME string = aifoundry.outputs.aiSearchConnectionName

infra/scripts/process_sample_data.sh

@@ -7,8 +7,9 @@ keyvaultName="$3"
 cosmosDbAccountName="$4"
 resourceGroupName="$5"
 aiFoundryName="$6"
-aiSearchName="$7"
-managedIdentityClientId="$8"
+aiFoundryRgName="$7"
+aiSearchName="$8"
+managedIdentityClientId="$9"
 
 # get parameters from azd env, if not provided
 if [ -z "$resourceGroupName" ]; then
@@ -35,15 +36,19 @@ if [ -z "$aiFoundryName" ]; then
     aiFoundryName=$(azd env get-value AI_FOUNDRY_NAME)
 fi
 
+if [ -z "$aiFoundryRgName" ]; then
+    aiFoundryRgName=$(azd env get-value AI_FOUNDRY_RG_NAME)
+fi
+
 if [ -z "$aiSearchName" ]; then
     aiSearchName=$(azd env get-value AI_SEARCH_SERVICE_NAME)
 fi
 
 azSubscriptionId=$(azd env get-value AZURE_SUBSCRIPTION_ID)
 
 # Check if all required arguments are provided
-if [ -z "$storageAccount" ] || [ -z "$fileSystem" ] || [ -z "$keyvaultName" ] || [ -z "$cosmosDbAccountName" ] || [ -z "$resourceGroupName" ] || [ -z "$aiFoundryName" ] || [ -z "$aiSearchName" ]; then
-    echo "Usage: $0 <storageAccount> <storageContainerName> <keyvaultName> <cosmosDbAccountName> <resourceGroupName> <aiFoundryName> <aiSearchName>"
+if [ -z "$storageAccount" ] || [ -z "$fileSystem" ] || [ -z "$keyvaultName" ] || [ -z "$cosmosDbAccountName" ] || [ -z "$resourceGroupName" ] || [ -z "$aiFoundryName" ] || [ -z "$aiFoundryRgName" ] || [ -z "$aiSearchName" ]; then
+    echo "Usage: $0 <storageAccount> <storageContainerName> <keyvaultName> <cosmosDbAccountName> <resourceGroupName> <aiFoundryName> <aiFoundryRgName> <aiSearchName>"
     exit 1
 fi
 
@@ -125,7 +130,7 @@ echo "copy_kb_files.sh completed successfully."
 
 # Call run_create_index_scripts.sh
 echo "Running run_create_index_scripts.sh"
-bash infra/scripts/run_create_index_scripts.sh "$keyvaultName" "$resourceGroupName" "$aiFoundryName" "$aiSearchName" "$managedIdentityClientId"
+bash infra/scripts/run_create_index_scripts.sh "$keyvaultName" "$resourceGroupName" "$aiFoundryName" "$aiFoundryRgName" "$aiSearchName" "$managedIdentityClientId"
 if [ $? -ne 0 ]; then
     echo "Error: run_create_index_scripts.sh failed."
     exit 1

infra/scripts/run_create_index_scripts.sh

@@ -5,8 +5,9 @@
 keyvaultName="$1"
 resourceGroupName="$2"
 aiFoundryName="$3"
-aiSearchName="$4"
-managedIdentityClientId="$5"
+aiFoundryRgName="$4"
+aiSearchName="$5"
+managedIdentityClientId="$6"
 # requirementFile="infra/scripts/index_scripts/requirements.txt"
 # requirementFileUrl=${baseUrl}"infra/scripts/index_scripts/requirements.txt"
 
@@ -66,7 +67,7 @@ fi
 ### Assign Azure AI User role to the signed in user ###
 
     echo "Getting Azure AI resource id"
-    aif_resource_id=$(az cognitiveservices account show --name $aiFoundryName --resource-group $resourceGroupName --query id --output tsv)
+    aif_resource_id=$(az cognitiveservices account show --name $aiFoundryName --resource-group $aiFoundryRgName --query id --output tsv)
 
     # Check if the user has the Azure AI User role
     echo "Checking if user has the Azure AI User role"