Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions azure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ hooks:
Write-Host "Web app URL: "
Write-Host "$env:WEB_APP_URL" -ForegroundColor Cyan
Write-Host "`nRun the following command in your Bash terminal. It will grant the necessary permissions between resources and your user account, and also process and load the sample data into the application."
Write-Host "bash ./infra/scripts/process_sample_data.sh" -ForegroundColor Cyan
Write-Host "bash ./infra/scripts/process_sample_data.sh $env:AZURE_RESOURCE_GROUP" -ForegroundColor Cyan
shell: pwsh
continueOnError: false
interactive: true
Expand All @@ -26,7 +26,7 @@ hooks:
echo $WEB_APP_URL
echo ""
echo "Run the following command in your Bash terminal. It will grant the necessary permissions between resources and your user account, and also process and load the sample data into the application."
echo "bash ./infra/scripts/process_sample_data.sh"
echo "bash ./infra/scripts/process_sample_data.sh $env:AZURE_RESOURCE_GROUP"
shell: sh
continueOnError: false
interactive: true
2 changes: 1 addition & 1 deletion docs/AVMPostDeploymentGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This document provides guidance on post-deployment steps after deploying the Bui
2. Import Sample Data -Run bash command printed in the terminal. The bash command will look like the following:

```bash
./infra/scripts/process_sample_data.sh <resourceGroupName>
bash ./infra/scripts/process_sample_data.sh <resourceGroupName>
```
If the deployment does not exist or has been deleted – The script will prompt you to manually enter the required values

Expand Down
2 changes: 2 additions & 0 deletions infra/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -1382,3 +1382,5 @@ output USE_AI_PROJECT_CLIENT string = useAIProjectClientFlag
@description('Indicates whether the internal stream should be used.')
output USE_INTERNAL_STREAM string = useInternalStream

@description('The Azure Subscription ID where the resources are deployed.')
output AZURE_SUBSCRIPTION_ID string = subscription().subscriptionId
26 changes: 26 additions & 0 deletions infra/scripts/process_sample_data.sh
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,30 @@ if az deployment group show --resource-group "$resourceGroupName" --name "$deplo
--query "properties.outputs.managedidentitY_WEBAPP_NAME.value" -o tsv)
echo "Web App Managed Identity Display Name (from outputs): $webAppManagedIdentityDisplayName"

webAppManagedIdentityClientId=$(az deployment group show \
--name "$deploymentName" \
--resource-group "$resourceGroupName" \
--query "properties.outputs.managedidentitY_WEBAPP_CLIENTID.value" -o tsv)
echo "Web App Managed Identity Client ID (from outputs): $webAppManagedIdentityClientId"

SqlDatabaseName=$(az deployment group show \
--name "$deploymentName" \
--resource-group "$resourceGroupName" \
--query "properties.outputs.sqldB_DATABASE.value" -o tsv)
echo "SQL Database Name (from outputs): $SqlDatabaseName"

sqlManagedIdentityClientId=$(az deployment group show \
--name "$deploymentName" \
--resource-group "$resourceGroupName" \
--query "properties.outputs.managedidentitY_SQL_CLIENTID.value" -o tsv)
echo "SQL Managed Identity Client ID (from outputs): $sqlManagedIdentityClientId"

sqlManagedIdentityDisplayName=$(az deployment group show \
--name "$deploymentName" \
--resource-group "$resourceGroupName" \
--query "properties.outputs.managedidentitY_SQL_NAME.value" -o tsv)
echo "SQL Managed Identity Display Name (from outputs): $sqlManagedIdentityDisplayName"

aiSearchName=$(az deployment group show \
--name "$deploymentName" \
--resource-group "$resourceGroupName" \
Expand Down Expand Up @@ -360,6 +384,8 @@ else
read -rp "Enter Key Vault Name: " keyvaultName
read -rp "Enter Web App Managed Identity Display Name: " webAppManagedIdentityDisplayName
read -rp "Enter Web App Managed Identity Client ID: " webAppManagedIdentityClientId
read -rp "Enter SQL Managed Identity Display Name: " sqlManagedIdentityDisplayName
read -rp "Enter SQL Managed Identity Client ID: " sqlManagedIdentityClientId
read -rp "Enter AI Search Service Name: " aiSearchName
read -rp "Enter AI Foundry Resource ID: " aif_resource_id
read -rp "Enter Azure Subscription ID: " azSubscriptionId
Expand Down