fixbug

Author: UtkarshMishra-Microsoft

infra/deploy_ai_foundry.bicep

@@ -436,7 +436,9 @@ 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 aiFoundryId string = !empty(azureExistingAIProjectResourceId)
+  ? existingAiFoundry.id
+  : aiFoundry.id
 
 output applicationInsightsId string = applicationInsights.id
 output logAnalyticsWorkspaceResourceName string = useExisting ? existingLogAnalyticsWorkspace.name : logAnalytics.name

infra/main.bicep

@@ -215,7 +215,6 @@ output STORAGE_CONTAINER_NAME string = storageAccount.outputs.storageContainer
 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_FOUNDRY_RESOURCE_ID string = aifoundry.outputs.aiFoundryId
 output AI_SEARCH_SERVICE_NAME string = aifoundry.outputs.aiSearchService
 output AZURE_SEARCH_CONNECTION_NAME string = aifoundry.outputs.aiSearchConnectionName

infra/main.json

@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.36.177.2456",
-      "templateHash": "8521527893631804786"
+      "templateHash": "1702044992104018188"
     }
   },
   "parameters": {
@@ -659,7 +659,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.36.177.2456",
-              "templateHash": "5405168643980957312"
+              "templateHash": "4676644507101240486"
             }
           },
           "parameters": {
@@ -1559,9 +1559,9 @@
               "type": "string",
               "value": "[if(not(empty(variables('existingAIFoundryName'))), variables('existingAIFoundryName'), variables('aiFoundryName'))]"
             },
-            "aiFoundryRgName": {
+            "aiFoundryId": {
               "type": "string",
-              "value": "[if(not(empty(variables('existingAIServiceResourceGroup'))), variables('existingAIServiceResourceGroup'), resourceGroup().name)]"
+              "value": "[if(not(empty(parameters('azureExistingAIProjectResourceId'))), extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('existingAIServiceSubscription'), variables('existingAIServiceResourceGroup')), 'Microsoft.CognitiveServices/accounts', variables('existingAIFoundryName')), resourceId('Microsoft.CognitiveServices/accounts', variables('aiFoundryName')))]"
             },
             "applicationInsightsId": {
               "type": "string",
@@ -1862,7 +1862,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.36.177.2456",
-              "templateHash": "7711665754275271950"
+              "templateHash": "5423105461678227247"
             }
           },
           "parameters": {
@@ -2721,13 +2721,9 @@
       "type": "string",
       "value": "[resourceGroup().name]"
     },
-    "AI_FOUNDRY_NAME": {
+    "AI_FOUNDRY_RESOURCE_ID": {
       "type": "string",
-      "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.aiFoundryName.value]"
-    },
-    "AI_FOUNDRY_RG_NAME": {
-      "type": "string",
-      "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.aiFoundryRgName.value]"
+      "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.aiFoundryId.value]"
     },
     "AI_SEARCH_SERVICE_NAME": {
       "type": "string",

infra/scripts/process_sample_data.sh

@@ -6,10 +6,9 @@ fileSystem="$2"
 keyvaultName="$3"
 cosmosDbAccountName="$4"
 resourceGroupName="$5"
-aiFoundryName="$6"
-aiFoundryRgName="$7"
-aiSearchName="$8"
-managedIdentityClientId="$9"
+aiSearchName="$6"
+managedIdentityClientId="$7"
+aif_resource_id="${8}"
 
 # get parameters from azd env, if not provided
 if [ -z "$resourceGroupName" ]; then
@@ -32,23 +31,19 @@ if [ -z "$keyvaultName" ]; then
     keyvaultName=$(azd env get-value KEY_VAULT_NAME)
 fi
 
-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
 
+if [ -z "$aif_resource_id" ]; then
+    aif_resource_id=$(azd env get-value AI_FOUNDRY_RESOURCE_ID)
+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 "$aiFoundryRgName" ] || [ -z "$aiSearchName" ]; then
-    echo "Usage: $0 <storageAccount> <storageContainerName> <keyvaultName> <cosmosDbAccountName> <resourceGroupName> <aiFoundryName> <aiFoundryRgName> <aiSearchName>"
+if [ -z "$storageAccount" ] || [ -z "$fileSystem" ] || [ -z "$keyvaultName" ] || [ -z "$cosmosDbAccountName" ] || [ -z "$resourceGroupName" ] || [ -z "$aif_resource_id" ] || [ -z "$aiSearchName" ]; then
+    echo "Usage: $0 <storageAccount> <storageContainerName> <keyvaultName> <cosmosDbAccountName> <resourceGroupName> <aiSearchName> <managedIdentityClientId> <aif_resource_id>"
     exit 1
 fi
 
@@ -130,7 +125,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" "$aiFoundryRgName" "$aiSearchName" "$managedIdentityClientId"
+bash infra/scripts/run_create_index_scripts.sh "$keyvaultName" "$resourceGroupName" "$aiSearchName" "$managedIdentityClientId" "$aif_resource_id"
 if [ $? -ne 0 ]; then
     echo "Error: run_create_index_scripts.sh failed."
     exit 1

infra/scripts/run_create_index_scripts.sh

@@ -4,10 +4,9 @@
 # baseUrl="$1"
 keyvaultName="$1"
 resourceGroupName="$2"
-aiFoundryName="$3"
-aiFoundryRgName="$4"
-aiSearchName="$5"
-managedIdentityClientId="$6"
+aiSearchName="$3"
+managedIdentityClientId="$4"
+aif_resource_id="$5"
 # requirementFile="infra/scripts/index_scripts/requirements.txt"
 # requirementFileUrl=${baseUrl}"infra/scripts/index_scripts/requirements.txt"
 
@@ -66,8 +65,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 $aiFoundryRgName --query id --output tsv)
+    echo "Using provided Azure AI resource id: $aif_resource_id"
 
     # Check if the user has the Azure AI User role
     echo "Checking if user has the Azure AI User role"