From 1fa77092d8c63f8ffa49b32b778ed7ed37a7d14b Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Tue, 26 Nov 2024 19:12:12 +0530 Subject: [PATCH 01/20] Updated Default values and removed Chat history flag from deployment --- infra/main.bicep | 12 +----------- infra/main.bicepparam | 1 - 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/infra/main.bicep b/infra/main.bicep index 76824326c..4cfc9bbf4 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -138,7 +138,7 @@ param azureOpenAIVisionModelCapacity int = 10 'langchain' 'prompt_flow' ]) -param orchestrationStrategy string = 'openai_function' +param orchestrationStrategy string = 'semantic_kernel' @description('Chat conversation type: custom or byod.') @allowed([ @@ -305,13 +305,6 @@ param azureCosmosDBAccountName string = 'cosmos-${resourceToken}' @description('Azure Postgres DB Account Name') param azurePostgresDBAccountName string = 'postgres-${resourceToken}' -@description('Whether or not to enable chat history') -@allowed([ - 'true' - 'false' -]) -param chatHistoryEnabled string = 'true' - var blobContainerName = 'documents' var queueName = 'doc-processing' var clientKey = '${uniqueString(guid(subscription().id, deployment().name))}${newGuidString}' @@ -745,7 +738,6 @@ module web_docker './app/web.bicep' = if (hostingModel == 'container') { ORCHESTRATION_STRATEGY: orchestrationStrategy CONVERSATION_FLOW: conversationFlow LOGLEVEL: logLevel - CHAT_HISTORY_ENABLED: chatHistoryEnabled // Add database type to settings AZURE_DATABASE_TYPE: databaseType @@ -830,7 +822,6 @@ module adminweb './app/adminweb.bicep' = if (hostingModel == 'code') { FUNCTION_KEY: clientKey ORCHESTRATION_STRATEGY: orchestrationStrategy LOGLEVEL: logLevel - CHAT_HISTORY_ENABLED: chatHistoryEnabled } } } @@ -904,7 +895,6 @@ module adminweb_docker './app/adminweb.bicep' = if (hostingModel == 'container') FUNCTION_KEY: clientKey ORCHESTRATION_STRATEGY: orchestrationStrategy LOGLEVEL: logLevel - CHAT_HISTORY_ENABLED: chatHistoryEnabled } } } diff --git a/infra/main.bicepparam b/infra/main.bicepparam index 02b7083c0..eba34779f 100644 --- a/infra/main.bicepparam +++ b/infra/main.bicepparam @@ -18,7 +18,6 @@ param orchestrationStrategy = readEnvironmentVariable('ORCHESTRATION_STRATEGY', param logLevel = readEnvironmentVariable('LOGLEVEL', 'INFO') param recognizedLanguages = readEnvironmentVariable('AZURE_SPEECH_RECOGNIZER_LANGUAGES', 'en-US,fr-FR,de-DE,it-IT') param conversationFlow = readEnvironmentVariable('CONVERSATION_FLOW', 'custom') -param chatHistoryEnabled = readEnvironmentVariable('CHAT_HISTORY_ENABLED', 'true') //Azure Search param azureSearchFieldId = readEnvironmentVariable('AZURE_SEARCH_FIELDS_ID', 'id') From 5aad9cb8faac8410074c22078fcef39354bb79c9 Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Wed, 27 Nov 2024 10:58:53 +0530 Subject: [PATCH 02/20] Default values set --- infra/main.json | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/infra/main.json b/infra/main.json index 466d4c68c..9a267531b 100644 --- a/infra/main.json +++ b/infra/main.json @@ -5,7 +5,7 @@ "_generator": { "name": "bicep", "version": "0.30.23.60470", - "templateHash": "16603120665121801714" + "templateHash": "9132274249307928589" } }, "parameters": { @@ -290,7 +290,7 @@ }, "orchestrationStrategy": { "type": "string", - "defaultValue": "openai_function", + "defaultValue": "semantic_kernel", "allowedValues": [ "openai_function", "semantic_kernel", @@ -600,6 +600,7 @@ }, "databaseType": { "type": "string", + "defaultValue": "cosmos", "allowedValues": [ "cosmos", "postgres" @@ -621,17 +622,6 @@ "metadata": { "description": "Azure Postgres DB Account Name" } - }, - "chatHistoryEnabled": { - "type": "string", - "defaultValue": "true", - "allowedValues": [ - "true", - "false" - ], - "metadata": { - "description": "Whether or not to enable chat history" - } } }, "variables": { @@ -3390,7 +3380,7 @@ "value": "[parameters('authType')]" }, "appSettings": { - "value": "[union(createObject('AZURE_COMPUTER_VISION_ENDPOINT', if(parameters('useAdvancedImageProcessing'), reference(resourceId('Microsoft.Resources/deployments', 'computerVision'), '2022-09-01').outputs.endpoint.value, ''), 'AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_API_VERSION', parameters('computerVisionVectorizeImageApiVersion'), 'AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_MODEL_VERSION', parameters('computerVisionVectorizeImageModelVersion'), 'AZURE_CONTENT_SAFETY_ENDPOINT', reference(resourceId('Microsoft.Resources/deployments', parameters('contentSafetyName')), '2022-09-01').outputs.endpoint.value, 'AZURE_OPENAI_RESOURCE', parameters('azureOpenAIResourceName'), 'AZURE_OPENAI_MODEL_INFO', variables('azureOpenAIModelInfo'), 'AZURE_OPENAI_TEMPERATURE', parameters('azureOpenAITemperature'), 'AZURE_OPENAI_TOP_P', parameters('azureOpenAITopP'), 'AZURE_OPENAI_MAX_TOKENS', parameters('azureOpenAIMaxTokens'), 'AZURE_OPENAI_STOP_SEQUENCE', parameters('azureOpenAIStopSequence'), 'AZURE_OPENAI_SYSTEM_MESSAGE', parameters('azureOpenAISystemMessage'), 'AZURE_OPENAI_API_VERSION', parameters('azureOpenAIApiVersion'), 'AZURE_OPENAI_STREAM', parameters('azureOpenAIStream'), 'AZURE_OPENAI_EMBEDDING_MODEL_INFO', variables('azureOpenAIEmbeddingModelInfo'), 'AZURE_SEARCH_USE_SEMANTIC_SEARCH', parameters('azureSearchUseSemanticSearch'), 'AZURE_SEARCH_SERVICE', format('https://{0}.search.windows.net', parameters('azureAISearchName')), 'AZURE_SEARCH_INDEX', parameters('azureSearchIndex'), 'AZURE_SEARCH_CONVERSATIONS_LOG_INDEX', parameters('azureSearchConversationLogIndex'), 'AZURE_SEARCH_SEMANTIC_SEARCH_CONFIG', parameters('azureSearchSemanticSearchConfig'), 'AZURE_SEARCH_INDEX_IS_PRECHUNKED', parameters('azureSearchIndexIsPrechunked'), 'AZURE_SEARCH_TOP_K', parameters('azureSearchTopK'), 'AZURE_SEARCH_ENABLE_IN_DOMAIN', parameters('azureSearchEnableInDomain'), 'AZURE_SEARCH_FILENAME_COLUMN', parameters('azureSearchFilenameColumn'), 'AZURE_SEARCH_FILTER', parameters('azureSearchFilter'), 'AZURE_SEARCH_FIELDS_ID', parameters('azureSearchFieldId'), 'AZURE_SEARCH_CONTENT_COLUMN', parameters('azureSearchContentColumn'), 'AZURE_SEARCH_CONTENT_VECTOR_COLUMN', parameters('azureSearchVectorColumn'), 'AZURE_SEARCH_TITLE_COLUMN', parameters('azureSearchTitleColumn'), 'AZURE_SEARCH_FIELDS_METADATA', parameters('azureSearchFieldsMetadata'), 'AZURE_SEARCH_SOURCE_COLUMN', parameters('azureSearchSourceColumn'), 'AZURE_SEARCH_CHUNK_COLUMN', parameters('azureSearchChunkColumn'), 'AZURE_SEARCH_OFFSET_COLUMN', parameters('azureSearchOffsetColumn'), 'AZURE_SEARCH_URL_COLUMN', parameters('azureSearchUrlColumn'), 'AZURE_SEARCH_USE_INTEGRATED_VECTORIZATION', parameters('azureSearchUseIntegratedVectorization'), 'AZURE_SPEECH_SERVICE_NAME', parameters('speechServiceName'), 'AZURE_SPEECH_SERVICE_REGION', variables('location'), 'AZURE_SPEECH_RECOGNIZER_LANGUAGES', parameters('recognizedLanguages'), 'USE_ADVANCED_IMAGE_PROCESSING', parameters('useAdvancedImageProcessing'), 'ADVANCED_IMAGE_PROCESSING_MAX_IMAGES', parameters('advancedImageProcessingMaxImages'), 'ORCHESTRATION_STRATEGY', parameters('orchestrationStrategy'), 'CONVERSATION_FLOW', parameters('conversationFlow'), 'LOGLEVEL', parameters('logLevel'), 'CHAT_HISTORY_ENABLED', parameters('chatHistoryEnabled'), 'AZURE_DATABASE_TYPE', parameters('databaseType')), if(equals(parameters('databaseType'), 'cosmos'), createObject('AZURE_COSMOSDB_INFO', string(createObject('accountName', if(equals(parameters('databaseType'), 'cosmos'), reference(resourceId('Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosAccountName, ''), 'databaseName', if(equals(parameters('databaseType'), 'cosmos'), reference(resourceId('Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosDatabaseName, ''), 'containerName', if(equals(parameters('databaseType'), 'cosmos'), reference(resourceId('Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosContainerName, ''))), 'AZURE_COSMOSDB_ENABLE_FEEDBACK', true()), if(equals(parameters('databaseType'), 'postgres'), createObject('AZURE_POSTGRESDB_INFO', string(createObject('serverName', format('{0}.postgres.database.azure.com', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLServerName), 'databaseName', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLDatabaseName, 'userName', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLDbUser, 'password', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLDbPwd))), createObject())))]" + "value": "[union(createObject('AZURE_COMPUTER_VISION_ENDPOINT', if(parameters('useAdvancedImageProcessing'), reference(resourceId('Microsoft.Resources/deployments', 'computerVision'), '2022-09-01').outputs.endpoint.value, ''), 'AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_API_VERSION', parameters('computerVisionVectorizeImageApiVersion'), 'AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_MODEL_VERSION', parameters('computerVisionVectorizeImageModelVersion'), 'AZURE_CONTENT_SAFETY_ENDPOINT', reference(resourceId('Microsoft.Resources/deployments', parameters('contentSafetyName')), '2022-09-01').outputs.endpoint.value, 'AZURE_OPENAI_RESOURCE', parameters('azureOpenAIResourceName'), 'AZURE_OPENAI_MODEL_INFO', variables('azureOpenAIModelInfo'), 'AZURE_OPENAI_TEMPERATURE', parameters('azureOpenAITemperature'), 'AZURE_OPENAI_TOP_P', parameters('azureOpenAITopP'), 'AZURE_OPENAI_MAX_TOKENS', parameters('azureOpenAIMaxTokens'), 'AZURE_OPENAI_STOP_SEQUENCE', parameters('azureOpenAIStopSequence'), 'AZURE_OPENAI_SYSTEM_MESSAGE', parameters('azureOpenAISystemMessage'), 'AZURE_OPENAI_API_VERSION', parameters('azureOpenAIApiVersion'), 'AZURE_OPENAI_STREAM', parameters('azureOpenAIStream'), 'AZURE_OPENAI_EMBEDDING_MODEL_INFO', variables('azureOpenAIEmbeddingModelInfo'), 'AZURE_SEARCH_USE_SEMANTIC_SEARCH', parameters('azureSearchUseSemanticSearch'), 'AZURE_SEARCH_SERVICE', format('https://{0}.search.windows.net', parameters('azureAISearchName')), 'AZURE_SEARCH_INDEX', parameters('azureSearchIndex'), 'AZURE_SEARCH_CONVERSATIONS_LOG_INDEX', parameters('azureSearchConversationLogIndex'), 'AZURE_SEARCH_SEMANTIC_SEARCH_CONFIG', parameters('azureSearchSemanticSearchConfig'), 'AZURE_SEARCH_INDEX_IS_PRECHUNKED', parameters('azureSearchIndexIsPrechunked'), 'AZURE_SEARCH_TOP_K', parameters('azureSearchTopK'), 'AZURE_SEARCH_ENABLE_IN_DOMAIN', parameters('azureSearchEnableInDomain'), 'AZURE_SEARCH_FILENAME_COLUMN', parameters('azureSearchFilenameColumn'), 'AZURE_SEARCH_FILTER', parameters('azureSearchFilter'), 'AZURE_SEARCH_FIELDS_ID', parameters('azureSearchFieldId'), 'AZURE_SEARCH_CONTENT_COLUMN', parameters('azureSearchContentColumn'), 'AZURE_SEARCH_CONTENT_VECTOR_COLUMN', parameters('azureSearchVectorColumn'), 'AZURE_SEARCH_TITLE_COLUMN', parameters('azureSearchTitleColumn'), 'AZURE_SEARCH_FIELDS_METADATA', parameters('azureSearchFieldsMetadata'), 'AZURE_SEARCH_SOURCE_COLUMN', parameters('azureSearchSourceColumn'), 'AZURE_SEARCH_CHUNK_COLUMN', parameters('azureSearchChunkColumn'), 'AZURE_SEARCH_OFFSET_COLUMN', parameters('azureSearchOffsetColumn'), 'AZURE_SEARCH_URL_COLUMN', parameters('azureSearchUrlColumn'), 'AZURE_SEARCH_USE_INTEGRATED_VECTORIZATION', parameters('azureSearchUseIntegratedVectorization'), 'AZURE_SPEECH_SERVICE_NAME', parameters('speechServiceName'), 'AZURE_SPEECH_SERVICE_REGION', variables('location'), 'AZURE_SPEECH_RECOGNIZER_LANGUAGES', parameters('recognizedLanguages'), 'USE_ADVANCED_IMAGE_PROCESSING', parameters('useAdvancedImageProcessing'), 'ADVANCED_IMAGE_PROCESSING_MAX_IMAGES', parameters('advancedImageProcessingMaxImages'), 'ORCHESTRATION_STRATEGY', parameters('orchestrationStrategy'), 'CONVERSATION_FLOW', parameters('conversationFlow'), 'LOGLEVEL', parameters('logLevel'), 'AZURE_DATABASE_TYPE', parameters('databaseType')), if(equals(parameters('databaseType'), 'cosmos'), createObject('AZURE_COSMOSDB_INFO', string(createObject('accountName', if(equals(parameters('databaseType'), 'cosmos'), reference(resourceId('Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosAccountName, ''), 'databaseName', if(equals(parameters('databaseType'), 'cosmos'), reference(resourceId('Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosDatabaseName, ''), 'containerName', if(equals(parameters('databaseType'), 'cosmos'), reference(resourceId('Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosContainerName, ''))), 'AZURE_COSMOSDB_ENABLE_FEEDBACK', true()), if(equals(parameters('databaseType'), 'postgres'), createObject('AZURE_POSTGRESDB_INFO', string(createObject('serverName', format('{0}.postgres.database.azure.com', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLServerName), 'databaseName', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLDatabaseName, 'userName', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLDbUser, 'password', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLDbPwd))), createObject())))]" } }, "template": { @@ -4359,8 +4349,7 @@ "DOCUMENT_PROCESSING_QUEUE_NAME": "[variables('queueName')]", "FUNCTION_KEY": "[variables('clientKey')]", "ORCHESTRATION_STRATEGY": "[parameters('orchestrationStrategy')]", - "LOGLEVEL": "[parameters('logLevel')]", - "CHAT_HISTORY_ENABLED": "[parameters('chatHistoryEnabled')]" + "LOGLEVEL": "[parameters('logLevel')]" } } }, @@ -5306,8 +5295,7 @@ "DOCUMENT_PROCESSING_QUEUE_NAME": "[variables('queueName')]", "FUNCTION_KEY": "[variables('clientKey')]", "ORCHESTRATION_STRATEGY": "[parameters('orchestrationStrategy')]", - "LOGLEVEL": "[parameters('logLevel')]", - "CHAT_HISTORY_ENABLED": "[parameters('chatHistoryEnabled')]" + "LOGLEVEL": "[parameters('logLevel')]" } } }, From 84f56b98e1a686fb11024a31dd5c153c7999315f Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Wed, 27 Nov 2024 14:50:49 +0530 Subject: [PATCH 03/20] Added changes for running Python script --- .../database/deploy_create_table_script.bicep | 26 +++++++++++ infra/core/security/managed-identity.bicep | 43 +++++++++++++++++++ infra/main.bicep | 22 ++++++++++ .../data_scripts/create_postgres_tables.py | 14 +++--- scripts/run_create_table_script.sh | 25 +++++++++++ 5 files changed, 124 insertions(+), 6 deletions(-) create mode 100644 infra/core/database/deploy_create_table_script.bicep create mode 100644 infra/core/security/managed-identity.bicep create mode 100644 scripts/run_create_table_script.sh diff --git a/infra/core/database/deploy_create_table_script.bicep b/infra/core/database/deploy_create_table_script.bicep new file mode 100644 index 000000000..6edfe6d40 --- /dev/null +++ b/infra/core/database/deploy_create_table_script.bicep @@ -0,0 +1,26 @@ +@description('Specifies the location for resources.') +param solutionLocation string + +param baseUrl string +param keyVaultName string +param identity string + +resource create_index 'Microsoft.Resources/deploymentScripts@2020-10-01' = { + kind:'AzureCLI' + name: 'create_postgres_table' + location: solutionLocation // Replace with your desired location + identity: { + type: 'UserAssigned' + userAssignedIdentities: { + '${identity}' : {} + } + } + properties: { + azCliVersion: '2.52.0' + primaryScriptUri: '${baseUrl}scripts/run_create_table_script.sh' + arguments: '${baseUrl} ${keyVaultName}' // Specify any arguments for the script + timeout: 'PT1H' // Specify the desired timeout duration + retentionInterval: 'PT1H' // Specify the desired retention interval + cleanupPreference:'OnSuccess' + } +} diff --git a/infra/core/security/managed-identity.bicep b/infra/core/security/managed-identity.bicep new file mode 100644 index 000000000..ba7176b80 --- /dev/null +++ b/infra/core/security/managed-identity.bicep @@ -0,0 +1,43 @@ +// ========== Managed Identity ========== // +targetScope = 'resourceGroup' + +@minLength(3) +@maxLength(15) +@description('Solution Name') +param solutionName string + +@description('Solution Location') +param solutionLocation string + +@description('Name') +param miName string = '${ solutionName }-managed-identity' + +resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { + name: miName + location: solutionLocation + tags: { + app: solutionName + location: solutionLocation + } +} + +@description('This is the built-in owner role. See https://docs.microsoft.com/azure/role-based-access-control/built-in-roles#owner') +resource ownerRoleDefinition 'Microsoft.Authorization/roleDefinitions@2018-01-01-preview' existing = { + scope: resourceGroup() + name: '8e3af657-a8ff-443c-a75c-2fe8c4bcb635' +} + +resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { + name: guid(resourceGroup().id, managedIdentity.id, ownerRoleDefinition.id) + properties: { + principalId: managedIdentity.properties.principalId + roleDefinitionId: ownerRoleDefinition.id + principalType: 'ServicePrincipal' + } +} + +output managedIdentityOutput object = { + id: managedIdentity.id + objectId: managedIdentity.properties.principalId + name: miName +} diff --git a/infra/main.bicep b/infra/main.bicep index 4cfc9bbf4..ae87e5e75 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -313,6 +313,7 @@ var resourceGroupName = resourceGroup().name var tags = { 'azd-env-name': resourceGroupName } var location = resourceGroup().location var keyVaultName = 'kv-${resourceToken}' +var baseUrl = 'https://raw.githubusercontent.com/Fr4nc3/chat-with-your-data-solution-accelerator/bicepdefaults/' var azureOpenAIModelInfo = string({ model: azureOpenAIModel modelName: azureOpenAIModelName @@ -324,6 +325,16 @@ var azureOpenAIEmbeddingModelInfo = string({ modelVersion: azureOpenAIEmbeddingModelVersion }) +// ========== Managed Identity ========== // +module managedIdentityModule './core/security/managed-identity.bicep' = if (databaseType == 'postgres') { + name: 'deploy_managed_identity' + params: { + solutionName: resourceToken + solutionLocation: location + } + scope: resourceGroup(resourceGroup().name) +} + module cosmosDBModule './core/database/cosmosdb.bicep' = if (databaseType == 'cosmos') { name: 'deploy_cosmos_db' params: { @@ -1196,6 +1207,17 @@ module machineLearning 'app/machinelearning.bicep' = if (orchestrationStrategy = } } +module createIndex './core/database/deploy_create_table_script.bicep' = { + name : 'deploy_create_table_script' + params:{ + solutionLocation: resourceToken + identity:managedIdentityModule.outputs.managedIdentityOutput.id + baseUrl:baseUrl + keyVaultName:keyvault.outputs.name + } + dependsOn:[keyvault] +} + output APPLICATIONINSIGHTS_CONNECTION_STRING string = monitoring.outputs.applicationInsightsConnectionString output AZURE_APP_SERVICE_HOSTING_MODEL string = hostingModel output AZURE_BLOB_STORAGE_INFO string = replace(azureBlobStorageInfo, '$STORAGE_ACCOUNT_KEY','') diff --git a/scripts/data_scripts/create_postgres_tables.py b/scripts/data_scripts/create_postgres_tables.py index 4c393f1d4..92df9fa93 100644 --- a/scripts/data_scripts/create_postgres_tables.py +++ b/scripts/data_scripts/create_postgres_tables.py @@ -1,21 +1,23 @@ +import json from azure.keyvault.secrets import SecretClient from azure.identity import DefaultAzureCredential import psycopg2 key_vault_name = "kv_to-be-replaced" - def get_secrets_from_kv(kv_name, secret_name): credential = DefaultAzureCredential() secret_client = SecretClient( - vault_url=f"https://{kv_name}.vault.azure.net/", credential=credential + vault_url=f"https://{key_vault_name}.vault.azure.net/", credential=credential ) # Create a secret client object using the credential and Key Vault name return secret_client.get_secret(secret_name).value -host = get_secrets_from_kv(key_vault_name, "POSTGRESQL-HOST") -user = get_secrets_from_kv(key_vault_name, "POSTGRESQL-USERNAME") -dbname = get_secrets_from_kv(key_vault_name, "POSTGRESQL-DBNAME") +postgres_details = json.loads(get_secrets_from_kv(key_vault_name, "AZURE-POSTGRESQL-INFO")) +host = postgres_details.get("host", "") +user = postgres_details.get("user", "") +dbname = postgres_details.get("dbname", "") +password = postgres_details.get("password", "") # Acquire the access token cred = DefaultAzureCredential() @@ -23,7 +25,7 @@ def get_secrets_from_kv(kv_name, secret_name): # Combine the token with the connection string to establish the connection. conn_string = "host={0} user={1} dbname={2} password={3}".format( - host, user, dbname, access_token.token + host, user, dbname, password ) conn = psycopg2.connect(conn_string) cursor = conn.cursor() diff --git a/scripts/run_create_table_script.sh b/scripts/run_create_table_script.sh new file mode 100644 index 000000000..02858c0ee --- /dev/null +++ b/scripts/run_create_table_script.sh @@ -0,0 +1,25 @@ +#!/bin/bash +echo "started the script" + +# Variables +baseUrl="$1" +keyvaultName="$2" +requirementFile="requirements.txt" +requirementFileUrl=${baseUrl}"scripts/data_scripts/requirements.txt" + +echo "Script Started" + +# Download the create table python file +curl --output "create_postgres_tables.py" ${baseUrl}"scripts/data_scripts/create_postgres_tables.py" + +# Download the requirement file +curl --output "$requirementFile" "$requirementFileUrl" + +echo "Download completed" + +#Replace key vault name +sed -i "s/kv_to-be-replaced/${keyvaultName}/g" "create_postgres_tables.py" + +pip install -r requirements.txt + +python create_postgres_tables.py From 658cf3c5cb2a1dff7d1c61f6412f1f2032bf0151 Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Wed, 27 Nov 2024 15:38:02 +0530 Subject: [PATCH 04/20] Added requirements.txt --- scripts/data_scripts/requirements.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 scripts/data_scripts/requirements.txt diff --git a/scripts/data_scripts/requirements.txt b/scripts/data_scripts/requirements.txt new file mode 100644 index 000000000..be1b9187e --- /dev/null +++ b/scripts/data_scripts/requirements.txt @@ -0,0 +1,5 @@ +azure_storage==0.37.0 +psycopg2==2.9.10 +azure-identity +azure-keyvault-secrets +json From 5379ef1e485ba3f010971c89fe544a5c6d3b4872 Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Wed, 27 Nov 2024 15:48:26 +0530 Subject: [PATCH 05/20] Updated requirements.txt --- scripts/data_scripts/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/data_scripts/requirements.txt b/scripts/data_scripts/requirements.txt index be1b9187e..8fcba8dea 100644 --- a/scripts/data_scripts/requirements.txt +++ b/scripts/data_scripts/requirements.txt @@ -1,4 +1,3 @@ -azure_storage==0.37.0 psycopg2==2.9.10 azure-identity azure-keyvault-secrets From a7a4bbba3cfa5efeac0772e3a0425ad9d7225f91 Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Wed, 27 Nov 2024 16:06:19 +0530 Subject: [PATCH 06/20] Updated requirements.txt --- scripts/data_scripts/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/data_scripts/requirements.txt b/scripts/data_scripts/requirements.txt index 8fcba8dea..3f4852498 100644 --- a/scripts/data_scripts/requirements.txt +++ b/scripts/data_scripts/requirements.txt @@ -1,4 +1,4 @@ -psycopg2==2.9.10 -azure-identity -azure-keyvault-secrets +psycopg2-binary=2.9.10 +azure-identity=1.19.0 +azure-keyvault-secrets=4.9.0 json From 3f1cacf51c58a954cab0b34ab523aef166680b1d Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Wed, 27 Nov 2024 16:20:24 +0530 Subject: [PATCH 07/20] Updated requiremnts.txt --- scripts/data_scripts/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/data_scripts/requirements.txt b/scripts/data_scripts/requirements.txt index 3f4852498..f08e2d912 100644 --- a/scripts/data_scripts/requirements.txt +++ b/scripts/data_scripts/requirements.txt @@ -1,4 +1,4 @@ -psycopg2-binary=2.9.10 -azure-identity=1.19.0 -azure-keyvault-secrets=4.9.0 +psycopg2-binary==2.9.10 +azure-identity==1.19.0 +azure-keyvault-secrets==4.9.0 json From 2b1670e3423252df6f894467a0c4b00f7676e55a Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Wed, 27 Nov 2024 16:27:36 +0530 Subject: [PATCH 08/20] Updated script --- scripts/run_create_table_script.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/run_create_table_script.sh b/scripts/run_create_table_script.sh index 02858c0ee..0f80a56fd 100644 --- a/scripts/run_create_table_script.sh +++ b/scripts/run_create_table_script.sh @@ -22,4 +22,6 @@ sed -i "s/kv_to-be-replaced/${keyvaultName}/g" "create_postgres_tables.py" pip install -r requirements.txt +pip show azure-identity + python create_postgres_tables.py From baaacd86607c1d304011d0fe7472366f16e582aa Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Wed, 27 Nov 2024 16:32:38 +0530 Subject: [PATCH 09/20] Updated requirements.txt --- scripts/data_scripts/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/data_scripts/requirements.txt b/scripts/data_scripts/requirements.txt index f08e2d912..3cb4d1b3e 100644 --- a/scripts/data_scripts/requirements.txt +++ b/scripts/data_scripts/requirements.txt @@ -1,4 +1,3 @@ psycopg2-binary==2.9.10 azure-identity==1.19.0 azure-keyvault-secrets==4.9.0 -json From 6a73dd136c491306e36537ec70a06cba38baa686 Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Wed, 27 Nov 2024 20:57:29 +0530 Subject: [PATCH 10/20] Added IP whitelisting of depliyment environment --- scripts/run_create_table_script.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/run_create_table_script.sh b/scripts/run_create_table_script.sh index 0f80a56fd..0862165b0 100644 --- a/scripts/run_create_table_script.sh +++ b/scripts/run_create_table_script.sh @@ -7,8 +7,18 @@ keyvaultName="$2" requirementFile="requirements.txt" requirementFileUrl=${baseUrl}"scripts/data_scripts/requirements.txt" +# PostgreSQL server name and resource group +$serverName = "postgres-3ygkwbdjmavwa-postgres" +$resourceGroup = "rg-prdc-pgsql-py4" + echo "Script Started" +# Get the public IP address of the machine running the script +$publicIp = Invoke-RestMethod -Uri "https://api.ipify.org" + +# Use Azure CLI to add the public IP to the PostgreSQL firewall rule +az postgres server firewall-rule create --resource-group $resourceGroup --server-name $serverName --name "allowScriptIp" --start-ip-address $publicIp --end-ip-address $publicIp + # Download the create table python file curl --output "create_postgres_tables.py" ${baseUrl}"scripts/data_scripts/create_postgres_tables.py" From ef034f5a3b56d7d3bd5dd5f688034cc4a0a282fb Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Wed, 27 Nov 2024 21:13:15 +0530 Subject: [PATCH 11/20] Updated script --- scripts/run_create_table_script.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/run_create_table_script.sh b/scripts/run_create_table_script.sh index 0862165b0..fb4117f6f 100644 --- a/scripts/run_create_table_script.sh +++ b/scripts/run_create_table_script.sh @@ -6,16 +6,17 @@ baseUrl="$1" keyvaultName="$2" requirementFile="requirements.txt" requirementFileUrl=${baseUrl}"scripts/data_scripts/requirements.txt" - -# PostgreSQL server name and resource group -$serverName = "postgres-3ygkwbdjmavwa-postgres" -$resourceGroup = "rg-prdc-pgsql-py4" +serverName="postgres-3ygkwbdjmavwa-postgres" +resourceGroup="rg-prdc-pgsql-py4" echo "Script Started" # Get the public IP address of the machine running the script $publicIp = Invoke-RestMethod -Uri "https://api.ipify.org" +echo "Publis Ip is" +echo $publicIp + # Use Azure CLI to add the public IP to the PostgreSQL firewall rule az postgres server firewall-rule create --resource-group $resourceGroup --server-name $serverName --name "allowScriptIp" --start-ip-address $publicIp --end-ip-address $publicIp From b2d6fcdb1ef678243a027a2171f6b4bef53da44d Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Wed, 27 Nov 2024 21:25:45 +0530 Subject: [PATCH 12/20] Updated the command to get IP --- scripts/run_create_table_script.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/run_create_table_script.sh b/scripts/run_create_table_script.sh index fb4117f6f..8c3f2df1e 100644 --- a/scripts/run_create_table_script.sh +++ b/scripts/run_create_table_script.sh @@ -12,10 +12,7 @@ resourceGroup="rg-prdc-pgsql-py4" echo "Script Started" # Get the public IP address of the machine running the script -$publicIp = Invoke-RestMethod -Uri "https://api.ipify.org" - -echo "Publis Ip is" -echo $publicIp +publicIp=$(curl -s https://api.ipify.org) # Use Azure CLI to add the public IP to the PostgreSQL firewall rule az postgres server firewall-rule create --resource-group $resourceGroup --server-name $serverName --name "allowScriptIp" --start-ip-address $publicIp --end-ip-address $publicIp From f8d6a9bfa72e71e484f32b4d11bb4559c58ad787 Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Wed, 27 Nov 2024 21:36:49 +0530 Subject: [PATCH 13/20] Updated the Script to add ip --- scripts/run_create_table_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run_create_table_script.sh b/scripts/run_create_table_script.sh index 8c3f2df1e..63b3ca593 100644 --- a/scripts/run_create_table_script.sh +++ b/scripts/run_create_table_script.sh @@ -15,7 +15,7 @@ echo "Script Started" publicIp=$(curl -s https://api.ipify.org) # Use Azure CLI to add the public IP to the PostgreSQL firewall rule -az postgres server firewall-rule create --resource-group $resourceGroup --server-name $serverName --name "allowScriptIp" --start-ip-address $publicIp --end-ip-address $publicIp +az postgres flexible-server firewall-rule create --resource-group $resourceGroup --name $serverName --start-ip-address $publicIp --end-ip-address $publicIp # Download the create table python file curl --output "create_postgres_tables.py" ${baseUrl}"scripts/data_scripts/create_postgres_tables.py" From c5d94f3c6edbfcaff9cacee907b9526e08444314 Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Wed, 27 Nov 2024 21:48:13 +0530 Subject: [PATCH 14/20] Added the rule name --- scripts/run_create_table_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run_create_table_script.sh b/scripts/run_create_table_script.sh index 63b3ca593..745f071b9 100644 --- a/scripts/run_create_table_script.sh +++ b/scripts/run_create_table_script.sh @@ -15,7 +15,7 @@ echo "Script Started" publicIp=$(curl -s https://api.ipify.org) # Use Azure CLI to add the public IP to the PostgreSQL firewall rule -az postgres flexible-server firewall-rule create --resource-group $resourceGroup --name $serverName --start-ip-address $publicIp --end-ip-address $publicIp +az postgres flexible-server firewall-rule create --resource-group $resourceGroup --name $serverName --rule-name "AllowScriptIp" --start-ip-address "$publicIp" --end-ip-address "$publicIp" # Download the create table python file curl --output "create_postgres_tables.py" ${baseUrl}"scripts/data_scripts/create_postgres_tables.py" From 62679982f1e859c6c6f2d547106c411d51bae5a2 Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Wed, 27 Nov 2024 23:14:15 +0530 Subject: [PATCH 15/20] Updated the Script with correct values --- scripts/run_create_table_script.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/run_create_table_script.sh b/scripts/run_create_table_script.sh index 745f071b9..1d3bd2063 100644 --- a/scripts/run_create_table_script.sh +++ b/scripts/run_create_table_script.sh @@ -6,8 +6,8 @@ baseUrl="$1" keyvaultName="$2" requirementFile="requirements.txt" requirementFileUrl=${baseUrl}"scripts/data_scripts/requirements.txt" -serverName="postgres-3ygkwbdjmavwa-postgres" -resourceGroup="rg-prdc-pgsql-py4" +resourceGroup="$3" +serverName="$4" echo "Script Started" From e9f7c9d62ca41e6e40aeb8aa9052ed3987344653 Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Wed, 27 Nov 2024 23:44:16 +0530 Subject: [PATCH 16/20] Added code to run the Postgre SQL script --- infra/app/storekeys.bicep | 2 +- .../database/deploy_create_table_script.bicep | 3 +- infra/core/database/postgresdb.bicep | 57 +++- infra/core/security/keyvault.bicep | 46 ++- infra/main.bicep | 10 +- infra/main.json | 262 +++++++++++++++++- 6 files changed, 349 insertions(+), 31 deletions(-) diff --git a/infra/app/storekeys.bicep b/infra/app/storekeys.bicep index b3ae8b480..deca84872 100644 --- a/infra/app/storekeys.bicep +++ b/infra/app/storekeys.bicep @@ -110,7 +110,7 @@ resource postgresInfoSecret 'Microsoft.KeyVault/vaults/secrets@2022-07-01' = if ? string({ user: postgresDatabaseAdminUserName dbname: postgresDatabaseName - host: '${postgresServerName}.postgres.database.azure.com' + host: postgresServerName password: postgresDatabaseAdminPassword }) : '' diff --git a/infra/core/database/deploy_create_table_script.bicep b/infra/core/database/deploy_create_table_script.bicep index 6edfe6d40..b1fc012df 100644 --- a/infra/core/database/deploy_create_table_script.bicep +++ b/infra/core/database/deploy_create_table_script.bicep @@ -4,6 +4,7 @@ param solutionLocation string param baseUrl string param keyVaultName string param identity string +param postgresSqlServerName string resource create_index 'Microsoft.Resources/deploymentScripts@2020-10-01' = { kind:'AzureCLI' @@ -18,7 +19,7 @@ resource create_index 'Microsoft.Resources/deploymentScripts@2020-10-01' = { properties: { azCliVersion: '2.52.0' primaryScriptUri: '${baseUrl}scripts/run_create_table_script.sh' - arguments: '${baseUrl} ${keyVaultName}' // Specify any arguments for the script + arguments: '${baseUrl} ${keyVaultName} ${resourceGroup().name} ${postgresSqlServerName}' // Specify any arguments for the script timeout: 'PT1H' // Specify the desired timeout duration retentionInterval: 'PT1H' // Specify the desired retention interval cleanupPreference:'OnSuccess' diff --git a/infra/core/database/postgresdb.bicep b/infra/core/database/postgresdb.bicep index a9c39fa0a..bd6ea5464 100644 --- a/infra/core/database/postgresdb.bicep +++ b/infra/core/database/postgresdb.bicep @@ -1,5 +1,7 @@ param solutionName string param solutionLocation string +param managedIdentityObjectId string +param managedIdentityObjectName string @description('The name of the SQL logical server.') param serverName string = '${solutionName}-postgres' @@ -35,7 +37,11 @@ resource serverName_resource 'Microsoft.DBforPostgreSQL/flexibleServers@2023-12- version: version administratorLogin: administratorLogin administratorLoginPassword: administratorLoginPassword - + authConfig: { + tenantId: subscription().tenantId + activeDirectoryAuth: 'Enabled' + passwordAuth: 'Enabled' + } highAvailability: { mode: 'Disabled' } @@ -53,6 +59,47 @@ resource serverName_resource 'Microsoft.DBforPostgreSQL/flexibleServers@2023-12- } } +resource delayScript 'Microsoft.Resources/deploymentScripts@2020-10-01' = { + name: 'waitForServerReady' + location: resourceGroup().location + kind: 'AzureCLI' + dependsOn: [ + serverName_resource + ] + properties: { + azCliVersion: '2.38.0' // Adjust version if needed + timeout: 'PT5M' // 5 minutes timeout + scriptContent: ''' + echo "Waiting for PostgreSQL server to be ready..." + for i in {1..30}; do + state=$(az postgres flexible-server show --name ${serverName_resource.name} --resource-group ${resourceGroup().name} --query state -o tsv) + if [ "$state" == "Ready" ]; then + echo "Server is ready!" + exit 0 + fi + echo "Server state: $state. Retrying in 10 seconds..." + sleep 10 + done + echo "Server did not become ready in time." + exit 1 + ''' + retentionInterval: 'P1D' // Retain script logs for 1 day + } +} + +resource azureADAdministrator 'Microsoft.DBforPostgreSQL/flexibleServers/administrators@2022-12-01' = { + parent: serverName_resource + name: managedIdentityObjectId + properties: { + principalType: 'SERVICEPRINCIPAL' + principalName: managedIdentityObjectName + tenantId: subscription().tenantId + } + dependsOn: [ + delayScript + ] +} + // resource serverName_firewallrules 'Microsoft.DBforPostgreSQL/flexibleServers/firewallRules@2021-06-01' = [for rule in firewallrules: { // parent: serverName_resource // name: rule.Name @@ -71,7 +118,7 @@ resource firewall_all 'Microsoft.DBforPostgreSQL/flexibleServers/firewallRules@2 endIpAddress: '255.255.255.255' } dependsOn: [ - serverName_resource + delayScript ] } @@ -83,7 +130,7 @@ resource firewall_azure 'Microsoft.DBforPostgreSQL/flexibleServers/firewallRules endIpAddress: '0.0.0.0' } dependsOn: [ - firewall_all + delayScript ] } @@ -91,7 +138,7 @@ resource configurations 'Microsoft.DBforPostgreSQL/flexibleServers/configuration name: 'azure.extensions' parent: serverName_resource properties: { - value: 'vector' + value: 'pg_diskann' source: 'user-override' } dependsOn: [ @@ -102,7 +149,7 @@ resource configurations 'Microsoft.DBforPostgreSQL/flexibleServers/configuration output postgresDbOutput object = { postgresSQLName: serverName_resource.name - postgreSQLServerName: serverName_resource.name + postgreSQLServerName: '${serverName_resource.name}.postgres.database.azure.com' postgreSQLDatabaseName: 'postgres' postgreSQLDbUser: administratorLogin postgreSQLDbPwd: administratorLoginPassword diff --git a/infra/core/security/keyvault.bicep b/infra/core/security/keyvault.bicep index 3920c3b3a..491744904 100644 --- a/infra/core/security/keyvault.bicep +++ b/infra/core/security/keyvault.bicep @@ -2,6 +2,7 @@ metadata description = 'Creates an Azure Key Vault.' param name string param location string = resourceGroup().location param tags object = {} +param managedIdentityObjectId string param principalId string = '' @@ -12,18 +13,43 @@ resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' = { properties: { tenantId: subscription().tenantId sku: { family: 'A', name: 'standard' } - accessPolicies: !empty(principalId) - ? [ - { - objectId: principalId - permissions: { secrets: [ 'get', 'list' ] } - tenantId: subscription().tenantId - } - ] - : [] + accessPolicies: !empty(principalId) + ? [ + { + objectId: principalId + permissions: { secrets: [ 'get', 'list' ] } + tenantId: subscription().tenantId + }, { + objectId: managedIdentityObjectId + permissions: { secrets: [ 'get', 'list' ] } + tenantId: subscription().tenantId + } + ] + : [ + { + objectId: managedIdentityObjectId + permissions: { secrets: [ 'get', 'list' ] } + tenantId: subscription().tenantId + } + ] } } +// @description('This is the built-in Key Vault Administrator role.') +// resource kvAdminRole 'Microsoft.Authorization/roleDefinitions@2018-01-01-preview' existing = { +// scope: resourceGroup() +// name: '00482a5a-887f-4fb3-b363-3b7fe8e74483' +// } + +// resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { +// name: guid(resourceGroup().id, managedIdentityObjectId, kvAdminRole.id) +// properties: { +// principalId: managedIdentityObjectId +// roleDefinitionId:kvAdminRole.id +// principalType: 'ServicePrincipal' +// } +// } + output endpoint string = keyVault.properties.vaultUri output name string = keyVault.name -output id string = keyVault.id \ No newline at end of file +output id string = keyVault.id diff --git a/infra/main.bicep b/infra/main.bicep index ae87e5e75..73262700b 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -349,6 +349,8 @@ module postgresDBModule './core/database/postgresdb.bicep' = if (databaseType == params: { solutionName: azurePostgresDBAccountName solutionLocation: 'eastus2' + managedIdentityObjectId: managedIdentityModule.outputs.managedIdentityOutput.objectId + managedIdentityObjectName: managedIdentityModule.outputs.managedIdentityOutput.name } scope: resourceGroup(resourceGroup().name) } @@ -362,6 +364,7 @@ module keyvault './core/security/keyvault.bicep' = if (useKeyVault || authType = location: location tags: tags principalId: principalId + managedIdentityObjectId: managedIdentityModule.outputs.managedIdentityOutput.objectId } } @@ -1207,15 +1210,16 @@ module machineLearning 'app/machinelearning.bicep' = if (orchestrationStrategy = } } -module createIndex './core/database/deploy_create_table_script.bicep' = { +module createIndex './core/database/deploy_create_table_script.bicep' = if (databaseType == 'postgres') { name : 'deploy_create_table_script' params:{ - solutionLocation: resourceToken + solutionLocation: location identity:managedIdentityModule.outputs.managedIdentityOutput.id baseUrl:baseUrl keyVaultName:keyvault.outputs.name + postgresSqlServerName: postgresDBModule.outputs.postgresDbOutput.postgresSQLName } - dependsOn:[keyvault] + dependsOn:[keyvault, postgresDBModule, storekeys] } output APPLICATIONINSIGHTS_CONNECTION_STRING string = monitoring.outputs.applicationInsightsConnectionString diff --git a/infra/main.json b/infra/main.json index 9a267531b..8e0fbb96c 100644 --- a/infra/main.json +++ b/infra/main.json @@ -5,7 +5,7 @@ "_generator": { "name": "bicep", "version": "0.30.23.60470", - "templateHash": "9132274249307928589" + "templateHash": "106067340422892734" } }, "parameters": { @@ -635,6 +635,7 @@ }, "location": "[resourceGroup().location]", "keyVaultName": "[format('kv-{0}', parameters('resourceToken'))]", + "baseUrl": "https://raw.githubusercontent.com/Fr4nc3/chat-with-your-data-solution-accelerator/bicepdefaults/", "azureOpenAIModelInfo": "[string(createObject('model', parameters('azureOpenAIModel'), 'modelName', parameters('azureOpenAIModelName'), 'modelVersion', parameters('azureOpenAIModelVersion')))]", "azureOpenAIEmbeddingModelInfo": "[string(createObject('model', parameters('azureOpenAIEmbeddingModel'), 'modelName', parameters('azureOpenAIEmbeddingModelName'), 'modelVersion', parameters('azureOpenAIEmbeddingModelVersion')))]", "defaultOpenAiDeployments": [ @@ -666,6 +667,96 @@ "openAiDeployments": "[concat(variables('defaultOpenAiDeployments'), if(parameters('useAdvancedImageProcessing'), createArray(createObject('name', parameters('azureOpenAIVisionModel'), 'model', createObject('format', 'OpenAI', 'name', parameters('azureOpenAIVisionModelName'), 'version', parameters('azureOpenAIVisionModelVersion')), 'sku', createObject('name', 'Standard', 'capacity', parameters('azureOpenAIVisionModelCapacity')))), createArray()))]" }, "resources": [ + { + "condition": "[equals(parameters('databaseType'), 'postgres')]", + "type": "Microsoft.Resources/deployments", + "apiVersion": "2022-09-01", + "name": "deploy_managed_identity", + "resourceGroup": "[resourceGroup().name]", + "properties": { + "expressionEvaluationOptions": { + "scope": "inner" + }, + "mode": "Incremental", + "parameters": { + "solutionName": { + "value": "[parameters('resourceToken')]" + }, + "solutionLocation": { + "value": "[variables('location')]" + } + }, + "template": { + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "metadata": { + "_generator": { + "name": "bicep", + "version": "0.30.23.60470", + "templateHash": "8775325455752085588" + } + }, + "parameters": { + "solutionName": { + "type": "string", + "minLength": 3, + "maxLength": 15, + "metadata": { + "description": "Solution Name" + } + }, + "solutionLocation": { + "type": "string", + "metadata": { + "description": "Solution Location" + } + }, + "miName": { + "type": "string", + "defaultValue": "[format('{0}-managed-identity', parameters('solutionName'))]", + "metadata": { + "description": "Name" + } + } + }, + "resources": [ + { + "type": "Microsoft.ManagedIdentity/userAssignedIdentities", + "apiVersion": "2023-01-31", + "name": "[parameters('miName')]", + "location": "[parameters('solutionLocation')]", + "tags": { + "app": "[parameters('solutionName')]", + "location": "[parameters('solutionLocation')]" + } + }, + { + "type": "Microsoft.Authorization/roleAssignments", + "apiVersion": "2022-04-01", + "name": "[guid(resourceGroup().id, resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', parameters('miName')), resourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635'))]", + "properties": { + "principalId": "[reference(resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', parameters('miName')), '2023-01-31').principalId]", + "roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')]", + "principalType": "ServicePrincipal" + }, + "dependsOn": [ + "[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', parameters('miName'))]" + ] + } + ], + "outputs": { + "managedIdentityOutput": { + "type": "object", + "value": { + "id": "[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', parameters('miName'))]", + "objectId": "[reference(resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', parameters('miName')), '2023-01-31').principalId]", + "name": "[parameters('miName')]" + } + } + } + } + } + }, { "condition": "[equals(parameters('databaseType'), 'cosmos')]", "type": "Microsoft.Resources/deployments", @@ -842,6 +933,12 @@ }, "solutionLocation": { "value": "eastus2" + }, + "managedIdentityObjectId": { + "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity'), '2022-09-01').outputs.managedIdentityOutput.value.objectId]" + }, + "managedIdentityObjectName": { + "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity'), '2022-09-01').outputs.managedIdentityOutput.value.name]" } }, "template": { @@ -851,7 +948,7 @@ "_generator": { "name": "bicep", "version": "0.30.23.60470", - "templateHash": "17825575027061010483" + "templateHash": "1846653496210046668" } }, "parameters": { @@ -861,6 +958,12 @@ "solutionLocation": { "type": "string" }, + "managedIdentityObjectId": { + "type": "string" + }, + "managedIdentityObjectName": { + "type": "string" + }, "serverName": { "type": "string", "defaultValue": "[format('{0}-postgres', parameters('solutionName'))]", @@ -930,6 +1033,11 @@ "version": "[parameters('version')]", "administratorLogin": "[parameters('administratorLogin')]", "administratorLoginPassword": "[parameters('administratorLoginPassword')]", + "authConfig": { + "tenantId": "[subscription().tenantId]", + "activeDirectoryAuth": "Enabled", + "passwordAuth": "Enabled" + }, "highAvailability": { "mode": "Disabled" }, @@ -946,6 +1054,36 @@ "availabilityZone": "[parameters('availabilityZone')]" } }, + { + "type": "Microsoft.Resources/deploymentScripts", + "apiVersion": "2020-10-01", + "name": "waitForServerReady", + "location": "[resourceGroup().location]", + "kind": "AzureCLI", + "properties": { + "azCliVersion": "2.38.0", + "timeout": "PT5M", + "scriptContent": " echo \"Waiting for PostgreSQL server to be ready...\"\n for i in {1..30}; do\n state=$(az postgres flexible-server show --name ${serverName_resource.name} --resource-group ${resourceGroup().name} --query userVisibleState -o tsv)\n if [ \"$state\" == \"Ready\" ]; then\n echo \"Server is ready!\"\n exit 0\n fi\n echo \"Server state: $state. Retrying in 10 seconds...\"\n sleep 10\n done\n echo \"Server did not become ready in time.\"\n exit 1\n ", + "retentionInterval": "P1D" + }, + "dependsOn": [ + "[resourceId('Microsoft.DBforPostgreSQL/flexibleServers', parameters('serverName'))]" + ] + }, + { + "type": "Microsoft.DBforPostgreSQL/flexibleServers/administrators", + "apiVersion": "2022-12-01", + "name": "[format('{0}/{1}', parameters('serverName'), parameters('managedIdentityObjectId'))]", + "properties": { + "principalType": "SERVICEPRINCIPAL", + "principalName": "[parameters('managedIdentityObjectName')]", + "tenantId": "[subscription().tenantId]" + }, + "dependsOn": [ + "[resourceId('Microsoft.Resources/deploymentScripts', 'waitForServerReady')]", + "[resourceId('Microsoft.DBforPostgreSQL/flexibleServers', parameters('serverName'))]" + ] + }, { "condition": "[parameters('allowAllIPsFirewall')]", "type": "Microsoft.DBforPostgreSQL/flexibleServers/firewallRules", @@ -956,6 +1094,7 @@ "endIpAddress": "255.255.255.255" }, "dependsOn": [ + "[resourceId('Microsoft.Resources/deploymentScripts', 'waitForServerReady')]", "[resourceId('Microsoft.DBforPostgreSQL/flexibleServers', parameters('serverName'))]" ] }, @@ -969,7 +1108,7 @@ "endIpAddress": "0.0.0.0" }, "dependsOn": [ - "[resourceId('Microsoft.DBforPostgreSQL/flexibleServers/firewallRules', parameters('serverName'), 'allow-all-IPs')]", + "[resourceId('Microsoft.Resources/deploymentScripts', 'waitForServerReady')]", "[resourceId('Microsoft.DBforPostgreSQL/flexibleServers', parameters('serverName'))]" ] }, @@ -978,7 +1117,7 @@ "apiVersion": "2023-12-01-preview", "name": "[format('{0}/{1}', parameters('serverName'), 'azure.extensions')]", "properties": { - "value": "vector", + "value": "pg_diskann", "source": "user-override" }, "dependsOn": [ @@ -993,7 +1132,7 @@ "type": "object", "value": { "postgresSQLName": "[parameters('serverName')]", - "postgreSQLServerName": "[parameters('serverName')]", + "postgreSQLServerName": "[format('{0}.postgres.database.azure.com', parameters('serverName'))]", "postgreSQLDatabaseName": "postgres", "postgreSQLDbUser": "[parameters('administratorLogin')]", "postgreSQLDbPwd": "[parameters('administratorLoginPassword')]", @@ -1002,7 +1141,10 @@ } } } - } + }, + "dependsOn": [ + "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity')]" + ] }, { "condition": "[or(parameters('useKeyVault'), equals(parameters('authType'), 'rbac'))]", @@ -1026,6 +1168,9 @@ }, "principalId": { "value": "[parameters('principalId')]" + }, + "managedIdentityObjectId": { + "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity'), '2022-09-01').outputs.managedIdentityOutput.value.objectId]" } }, "template": { @@ -1035,7 +1180,7 @@ "_generator": { "name": "bicep", "version": "0.30.23.60470", - "templateHash": "12121357715793816510" + "templateHash": "12623823360057072578" }, "description": "Creates an Azure Key Vault." }, @@ -1051,6 +1196,9 @@ "type": "object", "defaultValue": {} }, + "managedIdentityObjectId": { + "type": "string" + }, "principalId": { "type": "string", "defaultValue": "" @@ -1069,7 +1217,7 @@ "family": "A", "name": "standard" }, - "accessPolicies": "[if(not(empty(parameters('principalId'))), createArray(createObject('objectId', parameters('principalId'), 'permissions', createObject('secrets', createArray('get', 'list')), 'tenantId', subscription().tenantId)), createArray())]" + "accessPolicies": "[if(not(empty(parameters('principalId'))), createArray(createObject('objectId', parameters('principalId'), 'permissions', createObject('secrets', createArray('get', 'list')), 'tenantId', subscription().tenantId), createObject('objectId', parameters('managedIdentityObjectId'), 'permissions', createObject('secrets', createArray('get', 'list')), 'tenantId', subscription().tenantId)), createArray(createObject('objectId', parameters('managedIdentityObjectId'), 'permissions', createObject('secrets', createArray('get', 'list')), 'tenantId', subscription().tenantId)))]" } } ], @@ -1088,7 +1236,10 @@ } } } - } + }, + "dependsOn": [ + "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity')]" + ] }, { "type": "Microsoft.Resources/deployments", @@ -1882,7 +2033,7 @@ "_generator": { "name": "bicep", "version": "0.30.23.60470", - "templateHash": "9414716950134790266" + "templateHash": "4301444608123274670" } }, "parameters": { @@ -2043,7 +2194,7 @@ "apiVersion": "2022-07-01", "name": "[format('{0}/{1}', parameters('keyVaultName'), parameters('postgresInfoName'))]", "properties": { - "value": "[if(not(equals(parameters('postgresServerName'), '')), string(createObject('user', parameters('postgresDatabaseAdminUserName'), 'dbname', parameters('postgresDatabaseName'), 'host', format('{0}.postgres.database.azure.com', parameters('postgresServerName')), 'password', parameters('postgresDatabaseAdminPassword'))), '')]" + "value": "[if(not(equals(parameters('postgresServerName'), '')), string(createObject('user', parameters('postgresDatabaseAdminUserName'), 'dbname', parameters('postgresDatabaseName'), 'host', parameters('postgresServerName'), 'password', parameters('postgresDatabaseAdminPassword'))), '')]" } }, { @@ -11433,6 +11584,95 @@ "[resourceId('Microsoft.Resources/deployments', parameters('azureAISearchName'))]", "[resourceId('Microsoft.Resources/deployments', parameters('storageAccountName'))]" ] + }, + { + "condition": "[equals(parameters('databaseType'), 'postgres')]", + "type": "Microsoft.Resources/deployments", + "apiVersion": "2022-09-01", + "name": "deploy_create_table_script", + "properties": { + "expressionEvaluationOptions": { + "scope": "inner" + }, + "mode": "Incremental", + "parameters": { + "solutionLocation": { + "value": "[variables('location')]" + }, + "identity": { + "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity'), '2022-09-01').outputs.managedIdentityOutput.value.id]" + }, + "baseUrl": { + "value": "[variables('baseUrl')]" + }, + "keyVaultName": { + "value": "[reference(resourceId('Microsoft.Resources/deployments', 'keyvault'), '2022-09-01').outputs.name.value]" + }, + "postgresSqlServerName": { + "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgresSQLName]" + } + }, + "template": { + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "metadata": { + "_generator": { + "name": "bicep", + "version": "0.30.23.60470", + "templateHash": "754015545513025215" + } + }, + "parameters": { + "solutionLocation": { + "type": "string", + "metadata": { + "description": "Specifies the location for resources." + } + }, + "baseUrl": { + "type": "string" + }, + "keyVaultName": { + "type": "string" + }, + "identity": { + "type": "string" + }, + "postgresSqlServerName": { + "type": "string" + } + }, + "resources": [ + { + "type": "Microsoft.Resources/deploymentScripts", + "apiVersion": "2020-10-01", + "name": "create_postgres_table", + "kind": "AzureCLI", + "location": "[parameters('solutionLocation')]", + "identity": { + "type": "UserAssigned", + "userAssignedIdentities": { + "[format('{0}', parameters('identity'))]": {} + } + }, + "properties": { + "azCliVersion": "2.52.0", + "primaryScriptUri": "[format('{0}scripts/run_create_table_script.sh', parameters('baseUrl'))]", + "arguments": "[format('{0} {1} {2} {3}', parameters('baseUrl'), parameters('keyVaultName'), resourceGroup().name, parameters('postgresSqlServerName'))]", + "timeout": "PT1H", + "retentionInterval": "PT1H", + "cleanupPreference": "OnSuccess" + } + } + ] + } + }, + "dependsOn": [ + "[resourceId('Microsoft.Resources/deployments', 'keyvault')]", + "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity')]", + "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_postgres_sql')]", + "[resourceId('Microsoft.Resources/deployments', 'storekeys')]" + ] } ], "outputs": { From e3eb512044e56babea890e7987687691811f1807 Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Thu, 28 Nov 2024 10:06:55 +0530 Subject: [PATCH 17/20] Updated the Wai function --- infra/core/database/postgresdb.bicep | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/infra/core/database/postgresdb.bicep b/infra/core/database/postgresdb.bicep index bd6ea5464..32a2af714 100644 --- a/infra/core/database/postgresdb.bicep +++ b/infra/core/database/postgresdb.bicep @@ -62,29 +62,16 @@ resource serverName_resource 'Microsoft.DBforPostgreSQL/flexibleServers@2023-12- resource delayScript 'Microsoft.Resources/deploymentScripts@2020-10-01' = { name: 'waitForServerReady' location: resourceGroup().location - kind: 'AzureCLI' + kind: 'AzurePowerShell' + properties: { + azPowerShellVersion: '3.0' + scriptContent: 'start-sleep -Seconds 180' + cleanupPreference: 'Always' + retentionInterval: 'PT1H' + } dependsOn: [ serverName_resource ] - properties: { - azCliVersion: '2.38.0' // Adjust version if needed - timeout: 'PT5M' // 5 minutes timeout - scriptContent: ''' - echo "Waiting for PostgreSQL server to be ready..." - for i in {1..30}; do - state=$(az postgres flexible-server show --name ${serverName_resource.name} --resource-group ${resourceGroup().name} --query state -o tsv) - if [ "$state" == "Ready" ]; then - echo "Server is ready!" - exit 0 - fi - echo "Server state: $state. Retrying in 10 seconds..." - sleep 10 - done - echo "Server did not become ready in time." - exit 1 - ''' - retentionInterval: 'P1D' // Retain script logs for 1 day - } } resource azureADAdministrator 'Microsoft.DBforPostgreSQL/flexibleServers/administrators@2022-12-01' = { From 4019078c6ecb1f39a0af3464e4f416cd5863c667 Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Thu, 28 Nov 2024 10:12:10 +0530 Subject: [PATCH 18/20] Updated the main.json with latest changes --- infra/main.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/infra/main.json b/infra/main.json index 8e0fbb96c..62788211f 100644 --- a/infra/main.json +++ b/infra/main.json @@ -5,7 +5,7 @@ "_generator": { "name": "bicep", "version": "0.30.23.60470", - "templateHash": "106067340422892734" + "templateHash": "6490762584259163057" } }, "parameters": { @@ -948,7 +948,7 @@ "_generator": { "name": "bicep", "version": "0.30.23.60470", - "templateHash": "1846653496210046668" + "templateHash": "7878676541226628436" } }, "parameters": { @@ -1059,12 +1059,12 @@ "apiVersion": "2020-10-01", "name": "waitForServerReady", "location": "[resourceGroup().location]", - "kind": "AzureCLI", + "kind": "AzurePowerShell", "properties": { - "azCliVersion": "2.38.0", - "timeout": "PT5M", - "scriptContent": " echo \"Waiting for PostgreSQL server to be ready...\"\n for i in {1..30}; do\n state=$(az postgres flexible-server show --name ${serverName_resource.name} --resource-group ${resourceGroup().name} --query userVisibleState -o tsv)\n if [ \"$state\" == \"Ready\" ]; then\n echo \"Server is ready!\"\n exit 0\n fi\n echo \"Server state: $state. Retrying in 10 seconds...\"\n sleep 10\n done\n echo \"Server did not become ready in time.\"\n exit 1\n ", - "retentionInterval": "P1D" + "azPowerShellVersion": "3.0", + "scriptContent": "start-sleep -Seconds 180", + "cleanupPreference": "Always", + "retentionInterval": "PT1H" }, "dependsOn": [ "[resourceId('Microsoft.DBforPostgreSQL/flexibleServers', parameters('serverName'))]" From 9a173fda2ebdd697dd00e9bdf25cfb09cf0b75e8 Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Thu, 28 Nov 2024 13:44:49 +0530 Subject: [PATCH 19/20] Merge issue fix --- infra/main.bicep | 5 +- infra/main.json | 1004 ++++++++++++++++++++++++++++++---------------- 2 files changed, 656 insertions(+), 353 deletions(-) diff --git a/infra/main.bicep b/infra/main.bicep index 7b1ce6c5d..f4696a2a9 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -351,7 +351,7 @@ module managedIdentityModule './core/security/managed-identity.bicep' = if (data solutionName: resourceToken solutionLocation: location } - scope: resourceGroup(resourceGroup().name) + scope: rg } module cosmosDBModule './core/database/cosmosdb.bicep' = if (databaseType == 'cosmos') { @@ -371,7 +371,7 @@ module postgresDBModule './core/database/postgresdb.bicep' = if (databaseType == managedIdentityObjectId: managedIdentityModule.outputs.managedIdentityOutput.objectId managedIdentityObjectName: managedIdentityModule.outputs.managedIdentityOutput.name } - scope: resourceGroup(resourceGroup().name) + scope: rg } // Store secrets in a keyvault @@ -1239,6 +1239,7 @@ module createIndex './core/database/deploy_create_table_script.bicep' = if (dat keyVaultName:keyvault.outputs.name postgresSqlServerName: postgresDBModule.outputs.postgresDbOutput.postgresSQLName } + scope: rg dependsOn:[keyvault, postgresDBModule, storekeys] } diff --git a/infra/main.json b/infra/main.json index d7d96051c..314c1f8d3 100644 --- a/infra/main.json +++ b/infra/main.json @@ -4,8 +4,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "9243131736696562084" + "version": "0.30.23.60470", + "templateHash": "16387401552448615008" } }, "parameters": { @@ -612,6 +612,17 @@ "description": "Azure Machine Learning Name" } }, + "databaseType": { + "type": "string", + "defaultValue": "cosmos", + "allowedValues": [ + "cosmos", + "postgres" + ], + "metadata": { + "description": "The type of database to deploy (cosmos or postgres)" + } + }, "azureCosmosDBAccountName": { "type": "string", "defaultValue": "[format('cosmos-{0}', parameters('resourceToken'))]", @@ -619,15 +630,11 @@ "description": "Azure Cosmos DB Account Name" } }, - "chatHistoryEnabled": { + "azurePostgresDBAccountName": { "type": "string", - "defaultValue": "true", - "allowedValues": [ - "true", - "false" - ], + "defaultValue": "[format('postgres-{0}', parameters('resourceToken'))]", "metadata": { - "description": "Whether or not to enable chat history" + "description": "Azure Postgres DB Account Name" } } }, @@ -683,6 +690,100 @@ "tags": "[variables('tags')]" }, { + "condition": "[equals(parameters('databaseType'), 'postgres')]", + "type": "Microsoft.Resources/deployments", + "apiVersion": "2022-09-01", + "name": "deploy_managed_identity", + "resourceGroup": "[variables('rgName')]", + "properties": { + "expressionEvaluationOptions": { + "scope": "inner" + }, + "mode": "Incremental", + "parameters": { + "solutionName": { + "value": "[parameters('resourceToken')]" + }, + "solutionLocation": { + "value": "[parameters('location')]" + } + }, + "template": { + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "metadata": { + "_generator": { + "name": "bicep", + "version": "0.30.23.60470", + "templateHash": "8775325455752085588" + } + }, + "parameters": { + "solutionName": { + "type": "string", + "minLength": 3, + "maxLength": 15, + "metadata": { + "description": "Solution Name" + } + }, + "solutionLocation": { + "type": "string", + "metadata": { + "description": "Solution Location" + } + }, + "miName": { + "type": "string", + "defaultValue": "[format('{0}-managed-identity', parameters('solutionName'))]", + "metadata": { + "description": "Name" + } + } + }, + "resources": [ + { + "type": "Microsoft.ManagedIdentity/userAssignedIdentities", + "apiVersion": "2023-01-31", + "name": "[parameters('miName')]", + "location": "[parameters('solutionLocation')]", + "tags": { + "app": "[parameters('solutionName')]", + "location": "[parameters('solutionLocation')]" + } + }, + { + "type": "Microsoft.Authorization/roleAssignments", + "apiVersion": "2022-04-01", + "name": "[guid(resourceGroup().id, resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', parameters('miName')), resourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635'))]", + "properties": { + "principalId": "[reference(resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', parameters('miName')), '2023-01-31').principalId]", + "roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')]", + "principalType": "ServicePrincipal" + }, + "dependsOn": [ + "[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', parameters('miName'))]" + ] + } + ], + "outputs": { + "managedIdentityOutput": { + "type": "object", + "value": { + "id": "[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', parameters('miName'))]", + "objectId": "[reference(resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', parameters('miName')), '2023-01-31').principalId]", + "name": "[parameters('miName')]" + } + } + } + } + }, + "dependsOn": [ + "[subscriptionResourceId('Microsoft.Resources/resourceGroups', variables('rgName'))]" + ] + }, + { + "condition": "[equals(parameters('databaseType'), 'cosmos')]", "type": "Microsoft.Resources/deployments", "apiVersion": "2022-09-01", "name": "deploy_cosmos_db", @@ -706,8 +807,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "16376502235448567731" + "version": "0.30.23.60470", + "templateHash": "14453122839528928942" } }, "parameters": { @@ -844,6 +945,237 @@ "[subscriptionResourceId('Microsoft.Resources/resourceGroups', variables('rgName'))]" ] }, + { + "condition": "[equals(parameters('databaseType'), 'postgres')]", + "type": "Microsoft.Resources/deployments", + "apiVersion": "2022-09-01", + "name": "deploy_postgres_sql", + "resourceGroup": "[variables('rgName')]", + "properties": { + "expressionEvaluationOptions": { + "scope": "inner" + }, + "mode": "Incremental", + "parameters": { + "solutionName": { + "value": "[parameters('azurePostgresDBAccountName')]" + }, + "solutionLocation": { + "value": "eastus2" + }, + "managedIdentityObjectId": { + "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_managed_identity'), '2022-09-01').outputs.managedIdentityOutput.value.objectId]" + }, + "managedIdentityObjectName": { + "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_managed_identity'), '2022-09-01').outputs.managedIdentityOutput.value.name]" + } + }, + "template": { + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "metadata": { + "_generator": { + "name": "bicep", + "version": "0.30.23.60470", + "templateHash": "7878676541226628436" + } + }, + "parameters": { + "solutionName": { + "type": "string" + }, + "solutionLocation": { + "type": "string" + }, + "managedIdentityObjectId": { + "type": "string" + }, + "managedIdentityObjectName": { + "type": "string" + }, + "serverName": { + "type": "string", + "defaultValue": "[format('{0}-postgres', parameters('solutionName'))]", + "metadata": { + "description": "The name of the SQL logical server." + } + }, + "administratorLogin": { + "type": "string", + "defaultValue": "admintest" + }, + "administratorLoginPassword": { + "type": "securestring", + "defaultValue": "Initial_0524" + }, + "serverEdition": { + "type": "string", + "defaultValue": "Burstable" + }, + "skuSizeGB": { + "type": "int", + "defaultValue": 32 + }, + "dbInstanceType": { + "type": "string", + "defaultValue": "Standard_B1ms" + }, + "availabilityZone": { + "type": "string", + "defaultValue": "1" + }, + "allowAllIPsFirewall": { + "type": "bool", + "defaultValue": false + }, + "allowAzureIPsFirewall": { + "type": "bool", + "defaultValue": false + }, + "version": { + "type": "string", + "defaultValue": "16", + "allowedValues": [ + "11", + "12", + "13", + "14", + "15", + "16" + ], + "metadata": { + "description": "PostgreSQL version" + } + } + }, + "resources": [ + { + "type": "Microsoft.DBforPostgreSQL/flexibleServers", + "apiVersion": "2023-12-01-preview", + "name": "[parameters('serverName')]", + "location": "[parameters('solutionLocation')]", + "sku": { + "name": "[parameters('dbInstanceType')]", + "tier": "[parameters('serverEdition')]" + }, + "properties": { + "version": "[parameters('version')]", + "administratorLogin": "[parameters('administratorLogin')]", + "administratorLoginPassword": "[parameters('administratorLoginPassword')]", + "authConfig": { + "tenantId": "[subscription().tenantId]", + "activeDirectoryAuth": "Enabled", + "passwordAuth": "Enabled" + }, + "highAvailability": { + "mode": "Disabled" + }, + "storage": { + "storageSizeGB": "[parameters('skuSizeGB')]" + }, + "backup": { + "backupRetentionDays": 7, + "geoRedundantBackup": "Disabled" + }, + "network": { + "publicNetworkAccess": "Enabled" + }, + "availabilityZone": "[parameters('availabilityZone')]" + } + }, + { + "type": "Microsoft.Resources/deploymentScripts", + "apiVersion": "2020-10-01", + "name": "waitForServerReady", + "location": "[resourceGroup().location]", + "kind": "AzurePowerShell", + "properties": { + "azPowerShellVersion": "3.0", + "scriptContent": "start-sleep -Seconds 180", + "cleanupPreference": "Always", + "retentionInterval": "PT1H" + }, + "dependsOn": [ + "[resourceId('Microsoft.DBforPostgreSQL/flexibleServers', parameters('serverName'))]" + ] + }, + { + "type": "Microsoft.DBforPostgreSQL/flexibleServers/administrators", + "apiVersion": "2022-12-01", + "name": "[format('{0}/{1}', parameters('serverName'), parameters('managedIdentityObjectId'))]", + "properties": { + "principalType": "SERVICEPRINCIPAL", + "principalName": "[parameters('managedIdentityObjectName')]", + "tenantId": "[subscription().tenantId]" + }, + "dependsOn": [ + "[resourceId('Microsoft.Resources/deploymentScripts', 'waitForServerReady')]", + "[resourceId('Microsoft.DBforPostgreSQL/flexibleServers', parameters('serverName'))]" + ] + }, + { + "condition": "[parameters('allowAllIPsFirewall')]", + "type": "Microsoft.DBforPostgreSQL/flexibleServers/firewallRules", + "apiVersion": "2023-12-01-preview", + "name": "[format('{0}/{1}', parameters('serverName'), 'allow-all-IPs')]", + "properties": { + "startIpAddress": "0.0.0.0", + "endIpAddress": "255.255.255.255" + }, + "dependsOn": [ + "[resourceId('Microsoft.Resources/deploymentScripts', 'waitForServerReady')]", + "[resourceId('Microsoft.DBforPostgreSQL/flexibleServers', parameters('serverName'))]" + ] + }, + { + "condition": "[parameters('allowAzureIPsFirewall')]", + "type": "Microsoft.DBforPostgreSQL/flexibleServers/firewallRules", + "apiVersion": "2023-12-01-preview", + "name": "[format('{0}/{1}', parameters('serverName'), 'allow-all-azure-internal-IPs')]", + "properties": { + "startIpAddress": "0.0.0.0", + "endIpAddress": "0.0.0.0" + }, + "dependsOn": [ + "[resourceId('Microsoft.Resources/deploymentScripts', 'waitForServerReady')]", + "[resourceId('Microsoft.DBforPostgreSQL/flexibleServers', parameters('serverName'))]" + ] + }, + { + "type": "Microsoft.DBforPostgreSQL/flexibleServers/configurations", + "apiVersion": "2023-12-01-preview", + "name": "[format('{0}/{1}', parameters('serverName'), 'azure.extensions')]", + "properties": { + "value": "pg_diskann", + "source": "user-override" + }, + "dependsOn": [ + "[resourceId('Microsoft.DBforPostgreSQL/flexibleServers/firewallRules', parameters('serverName'), 'allow-all-IPs')]", + "[resourceId('Microsoft.DBforPostgreSQL/flexibleServers/firewallRules', parameters('serverName'), 'allow-all-azure-internal-IPs')]", + "[resourceId('Microsoft.DBforPostgreSQL/flexibleServers', parameters('serverName'))]" + ] + } + ], + "outputs": { + "postgresDbOutput": { + "type": "object", + "value": { + "postgresSQLName": "[parameters('serverName')]", + "postgreSQLServerName": "[format('{0}.postgres.database.azure.com', parameters('serverName'))]", + "postgreSQLDatabaseName": "postgres", + "postgreSQLDbUser": "[parameters('administratorLogin')]", + "postgreSQLDbPwd": "[parameters('administratorLoginPassword')]", + "sslMode": "Require" + } + } + } + } + }, + "dependsOn": [ + "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_managed_identity')]", + "[subscriptionResourceId('Microsoft.Resources/resourceGroups', variables('rgName'))]" + ] + }, { "condition": "[or(parameters('useKeyVault'), equals(parameters('authType'), 'rbac'))]", "type": "Microsoft.Resources/deployments", @@ -869,7 +1201,7 @@ "value": "[parameters('principalId')]" }, "managedIdentityObjectId": { - "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity'), '2022-09-01').outputs.managedIdentityOutput.value.objectId]" + "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_managed_identity'), '2022-09-01').outputs.managedIdentityOutput.value.objectId]" } }, "template": { @@ -878,8 +1210,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "13364147767022226969" + "version": "0.30.23.60470", + "templateHash": "12623823360057072578" }, "description": "Creates an Azure Key Vault." }, @@ -937,6 +1269,7 @@ } }, "dependsOn": [ + "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_managed_identity')]", "[subscriptionResourceId('Microsoft.Resources/resourceGroups', variables('rgName'))]" ] }, @@ -978,8 +1311,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5846053745240336221" + "version": "0.30.23.60470", + "templateHash": "13123022401063321803" }, "description": "Creates an Azure Cognitive Services instance." }, @@ -1137,8 +1470,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5846053745240336221" + "version": "0.30.23.60470", + "templateHash": "13123022401063321803" }, "description": "Creates an Azure Cognitive Services instance." }, @@ -1290,8 +1623,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -1361,8 +1694,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -1432,8 +1765,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -1503,8 +1836,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -1578,8 +1911,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5846053745240336221" + "version": "0.30.23.60470", + "templateHash": "13123022401063321803" }, "description": "Creates an Azure Cognitive Services instance." }, @@ -1737,9 +2070,11 @@ "value": "[parameters('speechServiceName')]" }, "computerVisionName": "[if(parameters('useAdvancedImageProcessing'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'computerVision'), '2022-09-01').outputs.name.value), createObject('value', ''))]", - "cosmosAccountName": { - "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosAccountName]" - }, + "cosmosAccountName": "[if(equals(parameters('databaseType'), 'cosmos'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosAccountName), createObject('value', ''))]", + "postgresServerName": "[if(equals(parameters('databaseType'), 'postgres'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLServerName), createObject('value', ''))]", + "postgresDatabaseName": "[if(equals(parameters('databaseType'), 'postgres'), createObject('value', 'postgres'), createObject('value', ''))]", + "postgresDatabaseAdminUserName": "[if(equals(parameters('databaseType'), 'postgres'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLDbUser), createObject('value', ''))]", + "postgresDatabaseAdminPassword": "[if(equals(parameters('databaseType'), 'postgres'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLDbPwd), createObject('value', ''))]", "rgName": { "value": "[variables('rgName')]" } @@ -1750,8 +2085,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "9526483378278704058" + "version": "0.30.23.60470", + "templateHash": "4301444608123274670" } }, "parameters": { @@ -1791,6 +2126,26 @@ "type": "string", "defaultValue": "" }, + "postgresServerName": { + "type": "string", + "defaultValue": "" + }, + "postgresDatabaseName": { + "type": "string", + "defaultValue": "postgres" + }, + "postgresInfoName": { + "type": "string", + "defaultValue": "AZURE-POSTGRESQL-INFO" + }, + "postgresDatabaseAdminUserName": { + "type": "string", + "defaultValue": "" + }, + "postgresDatabaseAdminPassword": { + "type": "string", + "defaultValue": "" + }, "storageAccountKeyName": { "type": "string", "defaultValue": "AZURE-STORAGE-ACCOUNT-KEY" @@ -1887,11 +2242,21 @@ } }, { + "condition": "[not(equals(parameters('postgresServerName'), ''))]", + "type": "Microsoft.KeyVault/vaults/secrets", + "apiVersion": "2022-07-01", + "name": "[format('{0}/{1}', parameters('keyVaultName'), parameters('postgresInfoName'))]", + "properties": { + "value": "[if(not(equals(parameters('postgresServerName'), '')), string(createObject('user', parameters('postgresDatabaseAdminUserName'), 'dbname', parameters('postgresDatabaseName'), 'host', parameters('postgresServerName'), 'password', parameters('postgresDatabaseAdminPassword'))), '')]" + } + }, + { + "condition": "[not(equals(parameters('cosmosAccountName'), ''))]", "type": "Microsoft.KeyVault/vaults/secrets", "apiVersion": "2022-07-01", "name": "[format('{0}/{1}', parameters('keyVaultName'), parameters('cosmosAccountKeyName'))]", "properties": { - "value": "[listKeys(resourceId(subscription().subscriptionId, parameters('rgName'), 'Microsoft.DocumentDB/databaseAccounts', parameters('cosmosAccountName')), '2022-08-15').primaryMasterKey]" + "value": "[if(not(equals(parameters('cosmosAccountName'), '')), listKeys(resourceId(subscription().subscriptionId, parameters('rgName'), 'Microsoft.DocumentDB/databaseAccounts', parameters('cosmosAccountName')), '2022-08-15').primaryMasterKey, '')]" } } ], @@ -1926,7 +2291,11 @@ }, "COSMOS_ACCOUNT_KEY_NAME": { "type": "string", - "value": "[parameters('cosmosAccountKeyName')]" + "value": "[if(not(equals(parameters('cosmosAccountName'), '')), parameters('cosmosAccountKeyName'), '')]" + }, + "POSTGRESQL_INFO_NAME": { + "type": "string", + "value": "[if(not(equals(parameters('postgresServerName'), '')), parameters('postgresInfoName'), '')]" } } } @@ -1937,6 +2306,7 @@ "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db')]", "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('formRecognizerName'))]", "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('azureOpenAIResourceName'))]", + "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql')]", "[subscriptionResourceId('Microsoft.Resources/resourceGroups', variables('rgName'))]", "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('azureAISearchName'))]", "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('storageAccountName'))]" @@ -1984,8 +2354,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "12402174270479558945" + "version": "0.30.23.60470", + "templateHash": "13584246975784398226" }, "description": "Creates an Azure AI Search instance." }, @@ -2153,8 +2523,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "11168587044178660695" + "version": "0.30.23.60470", + "templateHash": "9286637480882627742" }, "description": "Creates an Azure App Service plan." }, @@ -2267,14 +2637,22 @@ "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('speechServiceName')), '2022-09-01').outputs.name.value]" }, "computerVisionName": "[if(parameters('useAdvancedImageProcessing'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'computerVision'), '2022-09-01').outputs.name.value), createObject('value', ''))]", + "databaseType": { + "value": "[parameters('databaseType')]" + }, "openAIKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.OPENAI_KEY_NAME.value), createObject('value', ''))]", - "storageAccountKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.STORAGE_ACCOUNT_KEY_NAME.value), createObject('value', ''))]", - "formRecognizerKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.FORM_RECOGNIZER_KEY_NAME.value), createObject('value', ''))]", + "azureBlobStorageInfo": { + "value": "[string(createObject('containerName', variables('blobContainerName'), 'accountName', parameters('storageAccountName'), 'accountKey', if(parameters('useKeyVault'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.STORAGE_ACCOUNT_KEY_NAME.value, '$STORAGE_ACCOUNT_KEY')))]" + }, + "azureFormRecognizerInfo": { + "value": "[string(createObject('endpoint', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('formRecognizerName')), '2022-09-01').outputs.endpoint.value, 'key', if(parameters('useKeyVault'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.FORM_RECOGNIZER_KEY_NAME.value, '$FORM_RECOGNIZER_KEY')))]" + }, "searchKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.SEARCH_KEY_NAME.value), createObject('value', ''))]", "contentSafetyKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.CONTENT_SAFETY_KEY_NAME.value), createObject('value', ''))]", "speechKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.SPEECH_KEY_NAME.value), createObject('value', ''))]", "computerVisionKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.COMPUTER_VISION_KEY_NAME.value), createObject('value', ''))]", - "cosmosDBKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.COSMOS_ACCOUNT_KEY_NAME.value), createObject('value', ''))]", + "cosmosDBKeyName": "[if(and(equals(parameters('databaseType'), 'cosmos'), parameters('useKeyVault')), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.COSMOS_ACCOUNT_KEY_NAME.value), createObject('value', ''))]", + "postgresInfoName": "[if(and(equals(parameters('databaseType'), 'postgres'), parameters('useKeyVault')), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.POSTGRESQL_INFO_NAME.value), createObject('value', ''))]", "useKeyVault": { "value": "[parameters('useKeyVault')]" }, @@ -2283,56 +2661,7 @@ "value": "[parameters('authType')]" }, "appSettings": { - "value": { - "AZURE_BLOB_ACCOUNT_NAME": "[parameters('storageAccountName')]", - "AZURE_BLOB_CONTAINER_NAME": "[variables('blobContainerName')]", - "AZURE_COMPUTER_VISION_ENDPOINT": "[if(parameters('useAdvancedImageProcessing'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'computerVision'), '2022-09-01').outputs.endpoint.value, '')]", - "AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_API_VERSION": "[parameters('computerVisionVectorizeImageApiVersion')]", - "AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_MODEL_VERSION": "[parameters('computerVisionVectorizeImageModelVersion')]", - "AZURE_CONTENT_SAFETY_ENDPOINT": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('contentSafetyName')), '2022-09-01').outputs.endpoint.value]", - "AZURE_FORM_RECOGNIZER_ENDPOINT": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('formRecognizerName')), '2022-09-01').outputs.endpoint.value]", - "AZURE_OPENAI_RESOURCE": "[parameters('azureOpenAIResourceName')]", - "AZURE_OPENAI_MODEL_INFO": "[variables('azureOpenAIModelInfo')]", - "AZURE_OPENAI_TEMPERATURE": "[parameters('azureOpenAITemperature')]", - "AZURE_OPENAI_TOP_P": "[parameters('azureOpenAITopP')]", - "AZURE_OPENAI_MAX_TOKENS": "[parameters('azureOpenAIMaxTokens')]", - "AZURE_OPENAI_STOP_SEQUENCE": "[parameters('azureOpenAIStopSequence')]", - "AZURE_OPENAI_SYSTEM_MESSAGE": "[parameters('azureOpenAISystemMessage')]", - "AZURE_OPENAI_API_VERSION": "[parameters('azureOpenAIApiVersion')]", - "AZURE_OPENAI_STREAM": "[parameters('azureOpenAIStream')]", - "AZURE_OPENAI_EMBEDDING_MODEL_INFO": "[variables('azureOpenAIEmbeddingModelInfo')]", - "AZURE_SEARCH_USE_SEMANTIC_SEARCH": "[parameters('azureSearchUseSemanticSearch')]", - "AZURE_SEARCH_SERVICE": "[format('https://{0}.search.windows.net', parameters('azureAISearchName'))]", - "AZURE_SEARCH_INDEX": "[parameters('azureSearchIndex')]", - "AZURE_SEARCH_CONVERSATIONS_LOG_INDEX": "[parameters('azureSearchConversationLogIndex')]", - "AZURE_SEARCH_SEMANTIC_SEARCH_CONFIG": "[parameters('azureSearchSemanticSearchConfig')]", - "AZURE_SEARCH_INDEX_IS_PRECHUNKED": "[parameters('azureSearchIndexIsPrechunked')]", - "AZURE_SEARCH_TOP_K": "[parameters('azureSearchTopK')]", - "AZURE_SEARCH_ENABLE_IN_DOMAIN": "[parameters('azureSearchEnableInDomain')]", - "AZURE_SEARCH_FILENAME_COLUMN": "[parameters('azureSearchFilenameColumn')]", - "AZURE_SEARCH_FILTER": "[parameters('azureSearchFilter')]", - "AZURE_SEARCH_FIELDS_ID": "[parameters('azureSearchFieldId')]", - "AZURE_SEARCH_CONTENT_COLUMN": "[parameters('azureSearchContentColumn')]", - "AZURE_SEARCH_CONTENT_VECTOR_COLUMN": "[parameters('azureSearchVectorColumn')]", - "AZURE_SEARCH_TITLE_COLUMN": "[parameters('azureSearchTitleColumn')]", - "AZURE_SEARCH_FIELDS_METADATA": "[parameters('azureSearchFieldsMetadata')]", - "AZURE_SEARCH_SOURCE_COLUMN": "[parameters('azureSearchSourceColumn')]", - "AZURE_SEARCH_CHUNK_COLUMN": "[parameters('azureSearchChunkColumn')]", - "AZURE_SEARCH_OFFSET_COLUMN": "[parameters('azureSearchOffsetColumn')]", - "AZURE_SEARCH_URL_COLUMN": "[parameters('azureSearchUrlColumn')]", - "AZURE_SEARCH_USE_INTEGRATED_VECTORIZATION": "[parameters('azureSearchUseIntegratedVectorization')]", - "AZURE_SPEECH_SERVICE_NAME": "[parameters('speechServiceName')]", - "AZURE_SPEECH_SERVICE_REGION": "[parameters('location')]", - "AZURE_SPEECH_RECOGNIZER_LANGUAGES": "[parameters('recognizedLanguages')]", - "USE_ADVANCED_IMAGE_PROCESSING": "[parameters('useAdvancedImageProcessing')]", - "ADVANCED_IMAGE_PROCESSING_MAX_IMAGES": "[parameters('advancedImageProcessingMaxImages')]", - "ORCHESTRATION_STRATEGY": "[parameters('orchestrationStrategy')]", - "CONVERSATION_FLOW": "[parameters('conversationFlow')]", - "LOGLEVEL": "[parameters('logLevel')]", - "AZURE_COSMOSDB_INFO": "[string(createObject('accountName', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosAccountName, 'databaseName', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosDatabaseName, 'containerName', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosContainerName))]", - "AZURE_COSMOSDB_ENABLE_FEEDBACK": true, - "CHAT_HISTORY_ENABLED": "[parameters('chatHistoryEnabled')]" - } + "value": "[union(createObject('AZURE_COMPUTER_VISION_ENDPOINT', if(parameters('useAdvancedImageProcessing'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'computerVision'), '2022-09-01').outputs.endpoint.value, ''), 'AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_API_VERSION', parameters('computerVisionVectorizeImageApiVersion'), 'AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_MODEL_VERSION', parameters('computerVisionVectorizeImageModelVersion'), 'AZURE_CONTENT_SAFETY_ENDPOINT', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('contentSafetyName')), '2022-09-01').outputs.endpoint.value, 'AZURE_OPENAI_RESOURCE', parameters('azureOpenAIResourceName'), 'AZURE_OPENAI_MODEL_INFO', variables('azureOpenAIModelInfo'), 'AZURE_OPENAI_TEMPERATURE', parameters('azureOpenAITemperature'), 'AZURE_OPENAI_TOP_P', parameters('azureOpenAITopP'), 'AZURE_OPENAI_MAX_TOKENS', parameters('azureOpenAIMaxTokens'), 'AZURE_OPENAI_STOP_SEQUENCE', parameters('azureOpenAIStopSequence'), 'AZURE_OPENAI_SYSTEM_MESSAGE', parameters('azureOpenAISystemMessage'), 'AZURE_OPENAI_API_VERSION', parameters('azureOpenAIApiVersion'), 'AZURE_OPENAI_STREAM', parameters('azureOpenAIStream'), 'AZURE_OPENAI_EMBEDDING_MODEL_INFO', variables('azureOpenAIEmbeddingModelInfo'), 'AZURE_SEARCH_USE_SEMANTIC_SEARCH', parameters('azureSearchUseSemanticSearch'), 'AZURE_SEARCH_SERVICE', format('https://{0}.search.windows.net', parameters('azureAISearchName')), 'AZURE_SEARCH_INDEX', parameters('azureSearchIndex'), 'AZURE_SEARCH_CONVERSATIONS_LOG_INDEX', parameters('azureSearchConversationLogIndex'), 'AZURE_SEARCH_SEMANTIC_SEARCH_CONFIG', parameters('azureSearchSemanticSearchConfig'), 'AZURE_SEARCH_INDEX_IS_PRECHUNKED', parameters('azureSearchIndexIsPrechunked'), 'AZURE_SEARCH_TOP_K', parameters('azureSearchTopK'), 'AZURE_SEARCH_ENABLE_IN_DOMAIN', parameters('azureSearchEnableInDomain'), 'AZURE_SEARCH_FILENAME_COLUMN', parameters('azureSearchFilenameColumn'), 'AZURE_SEARCH_FILTER', parameters('azureSearchFilter'), 'AZURE_SEARCH_FIELDS_ID', parameters('azureSearchFieldId'), 'AZURE_SEARCH_CONTENT_COLUMN', parameters('azureSearchContentColumn'), 'AZURE_SEARCH_CONTENT_VECTOR_COLUMN', parameters('azureSearchVectorColumn'), 'AZURE_SEARCH_TITLE_COLUMN', parameters('azureSearchTitleColumn'), 'AZURE_SEARCH_FIELDS_METADATA', parameters('azureSearchFieldsMetadata'), 'AZURE_SEARCH_SOURCE_COLUMN', parameters('azureSearchSourceColumn'), 'AZURE_SEARCH_CHUNK_COLUMN', parameters('azureSearchChunkColumn'), 'AZURE_SEARCH_OFFSET_COLUMN', parameters('azureSearchOffsetColumn'), 'AZURE_SEARCH_URL_COLUMN', parameters('azureSearchUrlColumn'), 'AZURE_SEARCH_USE_INTEGRATED_VECTORIZATION', parameters('azureSearchUseIntegratedVectorization'), 'AZURE_SPEECH_SERVICE_NAME', parameters('speechServiceName'), 'AZURE_SPEECH_SERVICE_REGION', parameters('location'), 'AZURE_SPEECH_RECOGNIZER_LANGUAGES', parameters('recognizedLanguages'), 'USE_ADVANCED_IMAGE_PROCESSING', parameters('useAdvancedImageProcessing'), 'ADVANCED_IMAGE_PROCESSING_MAX_IMAGES', parameters('advancedImageProcessingMaxImages'), 'ORCHESTRATION_STRATEGY', parameters('orchestrationStrategy'), 'CONVERSATION_FLOW', parameters('conversationFlow'), 'LOGLEVEL', parameters('logLevel'), 'AZURE_DATABASE_TYPE', parameters('databaseType')), if(equals(parameters('databaseType'), 'cosmos'), createObject('AZURE_COSMOSDB_INFO', string(createObject('accountName', if(equals(parameters('databaseType'), 'cosmos'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosAccountName, ''), 'databaseName', if(equals(parameters('databaseType'), 'cosmos'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosDatabaseName, ''), 'containerName', if(equals(parameters('databaseType'), 'cosmos'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosContainerName, ''))), 'AZURE_COSMOSDB_ENABLE_FEEDBACK', true()), if(equals(parameters('databaseType'), 'postgres'), createObject('AZURE_POSTGRES_INFO', string(createObject('serverName', format('{0}.postgres.database.azure.com', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLServerName), 'databaseName', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLDatabaseName, 'userName', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLDbUser, 'password', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLDbPwd))), createObject())))]" } }, "template": { @@ -2341,8 +2670,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "9347651394814311894" + "version": "0.30.23.60470", + "templateHash": "64857797928052295" } }, "parameters": { @@ -2423,11 +2752,11 @@ "type": "string", "defaultValue": "" }, - "storageAccountKeyName": { + "azureBlobStorageInfo": { "type": "string", "defaultValue": "" }, - "formRecognizerKeyName": { + "azureFormRecognizerInfo": { "type": "string", "defaultValue": "" }, @@ -2462,9 +2791,17 @@ "type": "string", "defaultValue": "" }, + "databaseType": { + "type": "string", + "defaultValue": "cosmos" + }, "cosmosDBKeyName": { "type": "string", "defaultValue": "" + }, + "postgresInfoName": { + "type": "string", + "defaultValue": "" } }, "resources": [ @@ -2498,7 +2835,7 @@ "value": "[parameters('appServicePlanId')]" }, "appSettings": { - "value": "[union(parameters('appSettings'), createObject('AZURE_AUTH_TYPE', parameters('authType'), 'USE_KEY_VAULT', if(parameters('useKeyVault'), parameters('useKeyVault'), ''), 'AZURE_OPENAI_API_KEY', if(parameters('useKeyVault'), parameters('openAIKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('azureOpenAIName')), '2023-05-01').key1), 'AZURE_SEARCH_KEY', if(parameters('useKeyVault'), parameters('searchKeyName'), listAdminKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Search/searchServices', parameters('azureAISearchName')), '2021-04-01-preview').primaryKey), 'AZURE_BLOB_ACCOUNT_KEY', if(parameters('useKeyVault'), parameters('storageAccountKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2021-09-01').keys[0].value), 'AZURE_FORM_RECOGNIZER_KEY', if(parameters('useKeyVault'), parameters('formRecognizerKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('formRecognizerName')), '2023-05-01').key1), 'AZURE_CONTENT_SAFETY_KEY', if(parameters('useKeyVault'), parameters('contentSafetyKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('contentSafetyName')), '2023-05-01').key1), 'AZURE_SPEECH_SERVICE_KEY', if(parameters('useKeyVault'), parameters('speechKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('speechServiceName')), '2023-05-01').key1), 'AZURE_COMPUTER_VISION_KEY', if(or(parameters('useKeyVault'), equals(parameters('computerVisionName'), '')), parameters('computerVisionKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('computerVisionName')), '2023-05-01').key1), 'AZURE_COSMOSDB_ACCOUNT_KEY', if(or(parameters('useKeyVault'), equals(parameters('cosmosDBKeyName'), '')), parameters('cosmosDBKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.DocumentDB/databaseAccounts', parameters('cosmosDBKeyName')), '2022-08-15').primaryMasterKey)))]" + "value": "[union(parameters('appSettings'), union(if(equals(parameters('databaseType'), 'cosmos'), createObject('DATABASE_TYPE', 'cosmos', 'AZURE_COSMOSDB_ACCOUNT_KEY', if(or(parameters('useKeyVault'), equals(parameters('cosmosDBKeyName'), '')), parameters('cosmosDBKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.DocumentDB/databaseAccounts', parameters('cosmosDBKeyName')), '2022-08-15').primaryMasterKey)), createObject('DATABASE_TYPE', 'postgres', 'AZURE_POSTGRESQL_INFO', if(parameters('useKeyVault'), parameters('postgresInfoName'), ''))), createObject('AZURE_AUTH_TYPE', parameters('authType'), 'USE_KEY_VAULT', if(parameters('useKeyVault'), parameters('useKeyVault'), ''), 'AZURE_OPENAI_API_KEY', if(parameters('useKeyVault'), parameters('openAIKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('azureOpenAIName')), '2023-05-01').key1), 'AZURE_SEARCH_KEY', if(parameters('useKeyVault'), parameters('searchKeyName'), listAdminKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Search/searchServices', parameters('azureAISearchName')), '2021-04-01-preview').primaryKey), 'AZURE_BLOB_STORAGE_INFO', if(parameters('useKeyVault'), parameters('azureBlobStorageInfo'), replace(parameters('azureBlobStorageInfo'), '$STORAGE_ACCOUNT_KEY', listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2021-09-01').keys[0].value)), 'AZURE_FORM_RECOGNIZER_INFO', if(parameters('useKeyVault'), parameters('azureFormRecognizerInfo'), replace(parameters('azureFormRecognizerInfo'), '$FORM_RECOGNIZER_KEY', listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('formRecognizerName')), '2023-05-01').key1)), 'AZURE_CONTENT_SAFETY_KEY', if(parameters('useKeyVault'), parameters('contentSafetyKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('contentSafetyName')), '2023-05-01').key1), 'AZURE_SPEECH_SERVICE_KEY', if(parameters('useKeyVault'), parameters('speechKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('speechServiceName')), '2023-05-01').key1), 'AZURE_COMPUTER_VISION_KEY', if(or(parameters('useKeyVault'), equals(parameters('computerVisionName'), '')), parameters('computerVisionKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('computerVisionName')), '2023-05-01').key1))))]" }, "keyVaultName": { "value": "[parameters('keyVaultName')]" @@ -2523,8 +2860,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "14818871229133632920" + "version": "0.30.23.60470", + "templateHash": "7732628295698757767" }, "description": "Creates an Azure App Service in an existing Azure App Service plan." }, @@ -2750,8 +3087,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "3955925289075906039" + "version": "0.30.23.60470", + "templateHash": "16930852302813854027" }, "description": "Updates app settings for an Azure App Service." }, @@ -2828,8 +3165,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -2897,8 +3234,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -2966,8 +3303,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -3035,8 +3372,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -3101,8 +3438,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "17352167468248267479" + "version": "0.30.23.60470", + "templateHash": "465622386717580763" }, "description": "Assigns an Azure Key Vault access policy." }, @@ -3175,8 +3512,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "8033637033572984239" + "version": "0.30.23.60470", + "templateHash": "2622922268469466870" }, "description": "Creates a SQL role assignment under an Azure Cosmos DB account." }, @@ -3236,6 +3573,7 @@ "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'keyvault')]", "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'monitoring')]", "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('azureOpenAIResourceName'))]", + "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql')]", "[subscriptionResourceId('Microsoft.Resources/resourceGroups', variables('rgName'))]", "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('azureAISearchName'))]", "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('speechServiceName'))]", @@ -3295,14 +3633,22 @@ "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('speechServiceName')), '2022-09-01').outputs.name.value]" }, "computerVisionName": "[if(parameters('useAdvancedImageProcessing'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'computerVision'), '2022-09-01').outputs.name.value), createObject('value', ''))]", + "databaseType": { + "value": "[parameters('databaseType')]" + }, "openAIKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.OPENAI_KEY_NAME.value), createObject('value', ''))]", - "storageAccountKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.STORAGE_ACCOUNT_KEY_NAME.value), createObject('value', ''))]", - "formRecognizerKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.FORM_RECOGNIZER_KEY_NAME.value), createObject('value', ''))]", + "azureBlobStorageInfo": { + "value": "[string(createObject('containerName', variables('blobContainerName'), 'accountName', parameters('storageAccountName'), 'accountKey', if(parameters('useKeyVault'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.STORAGE_ACCOUNT_KEY_NAME.value, '$STORAGE_ACCOUNT_KEY')))]" + }, + "azureFormRecognizerInfo": { + "value": "[string(createObject('endpoint', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('formRecognizerName')), '2022-09-01').outputs.endpoint.value, 'key', if(parameters('useKeyVault'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.FORM_RECOGNIZER_KEY_NAME.value, '$FORM_RECOGNIZER_KEY')))]" + }, "searchKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.SEARCH_KEY_NAME.value), createObject('value', ''))]", "computerVisionKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.COMPUTER_VISION_KEY_NAME.value), createObject('value', ''))]", "contentSafetyKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.CONTENT_SAFETY_KEY_NAME.value), createObject('value', ''))]", "speechKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.SPEECH_KEY_NAME.value), createObject('value', ''))]", - "cosmosDBKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.COSMOS_ACCOUNT_KEY_NAME.value), createObject('value', ''))]", + "cosmosDBKeyName": "[if(and(equals(parameters('databaseType'), 'cosmos'), parameters('useKeyVault')), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.COSMOS_ACCOUNT_KEY_NAME.value), createObject('value', ''))]", + "postgresInfoName": "[if(and(equals(parameters('databaseType'), 'postgres'), parameters('useKeyVault')), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.POSTGRESQL_INFO_NAME.value), createObject('value', ''))]", "useKeyVault": { "value": "[parameters('useKeyVault')]" }, @@ -3311,56 +3657,7 @@ "value": "[parameters('authType')]" }, "appSettings": { - "value": { - "AZURE_BLOB_ACCOUNT_NAME": "[parameters('storageAccountName')]", - "AZURE_BLOB_CONTAINER_NAME": "[variables('blobContainerName')]", - "AZURE_COMPUTER_VISION_ENDPOINT": "[if(parameters('useAdvancedImageProcessing'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'computerVision'), '2022-09-01').outputs.endpoint.value, '')]", - "AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_API_VERSION": "[parameters('computerVisionVectorizeImageApiVersion')]", - "AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_MODEL_VERSION": "[parameters('computerVisionVectorizeImageModelVersion')]", - "AZURE_CONTENT_SAFETY_ENDPOINT": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('contentSafetyName')), '2022-09-01').outputs.endpoint.value]", - "AZURE_FORM_RECOGNIZER_ENDPOINT": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('formRecognizerName')), '2022-09-01').outputs.endpoint.value]", - "AZURE_OPENAI_RESOURCE": "[parameters('azureOpenAIResourceName')]", - "AZURE_OPENAI_MODEL_INFO": "[variables('azureOpenAIModelInfo')]", - "AZURE_OPENAI_TEMPERATURE": "[parameters('azureOpenAITemperature')]", - "AZURE_OPENAI_TOP_P": "[parameters('azureOpenAITopP')]", - "AZURE_OPENAI_MAX_TOKENS": "[parameters('azureOpenAIMaxTokens')]", - "AZURE_OPENAI_STOP_SEQUENCE": "[parameters('azureOpenAIStopSequence')]", - "AZURE_OPENAI_SYSTEM_MESSAGE": "[parameters('azureOpenAISystemMessage')]", - "AZURE_OPENAI_API_VERSION": "[parameters('azureOpenAIApiVersion')]", - "AZURE_OPENAI_STREAM": "[parameters('azureOpenAIStream')]", - "AZURE_OPENAI_EMBEDDING_MODEL_INFO": "[variables('azureOpenAIEmbeddingModelInfo')]", - "AZURE_SEARCH_USE_SEMANTIC_SEARCH": "[parameters('azureSearchUseSemanticSearch')]", - "AZURE_SEARCH_SERVICE": "[format('https://{0}.search.windows.net', parameters('azureAISearchName'))]", - "AZURE_SEARCH_INDEX": "[parameters('azureSearchIndex')]", - "AZURE_SEARCH_CONVERSATIONS_LOG_INDEX": "[parameters('azureSearchConversationLogIndex')]", - "AZURE_SEARCH_SEMANTIC_SEARCH_CONFIG": "[parameters('azureSearchSemanticSearchConfig')]", - "AZURE_SEARCH_INDEX_IS_PRECHUNKED": "[parameters('azureSearchIndexIsPrechunked')]", - "AZURE_SEARCH_TOP_K": "[parameters('azureSearchTopK')]", - "AZURE_SEARCH_ENABLE_IN_DOMAIN": "[parameters('azureSearchEnableInDomain')]", - "AZURE_SEARCH_FILENAME_COLUMN": "[parameters('azureSearchFilenameColumn')]", - "AZURE_SEARCH_FILTER": "[parameters('azureSearchFilter')]", - "AZURE_SEARCH_FIELDS_ID": "[parameters('azureSearchFieldId')]", - "AZURE_SEARCH_CONTENT_COLUMN": "[parameters('azureSearchContentColumn')]", - "AZURE_SEARCH_CONTENT_VECTOR_COLUMN": "[parameters('azureSearchVectorColumn')]", - "AZURE_SEARCH_TITLE_COLUMN": "[parameters('azureSearchTitleColumn')]", - "AZURE_SEARCH_FIELDS_METADATA": "[parameters('azureSearchFieldsMetadata')]", - "AZURE_SEARCH_SOURCE_COLUMN": "[parameters('azureSearchSourceColumn')]", - "AZURE_SEARCH_CHUNK_COLUMN": "[parameters('azureSearchChunkColumn')]", - "AZURE_SEARCH_OFFSET_COLUMN": "[parameters('azureSearchOffsetColumn')]", - "AZURE_SEARCH_URL_COLUMN": "[parameters('azureSearchUrlColumn')]", - "AZURE_SEARCH_USE_INTEGRATED_VECTORIZATION": "[parameters('azureSearchUseIntegratedVectorization')]", - "AZURE_SPEECH_SERVICE_NAME": "[parameters('speechServiceName')]", - "AZURE_SPEECH_SERVICE_REGION": "[parameters('location')]", - "AZURE_SPEECH_RECOGNIZER_LANGUAGES": "[parameters('recognizedLanguages')]", - "USE_ADVANCED_IMAGE_PROCESSING": "[parameters('useAdvancedImageProcessing')]", - "ADVANCED_IMAGE_PROCESSING_MAX_IMAGES": "[parameters('advancedImageProcessingMaxImages')]", - "ORCHESTRATION_STRATEGY": "[parameters('orchestrationStrategy')]", - "CONVERSATION_FLOW": "[parameters('conversationFlow')]", - "LOGLEVEL": "[parameters('logLevel')]", - "AZURE_COSMOSDB_INFO": "[string(createObject('accountName', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosAccountName, 'databaseName', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosDatabaseName, 'containerName', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosContainerName))]", - "AZURE_COSMOSDB_ENABLE_FEEDBACK": true, - "CHAT_HISTORY_ENABLED": "[parameters('chatHistoryEnabled')]" - } + "value": "[union(createObject('AZURE_COMPUTER_VISION_ENDPOINT', if(parameters('useAdvancedImageProcessing'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'computerVision'), '2022-09-01').outputs.endpoint.value, ''), 'AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_API_VERSION', parameters('computerVisionVectorizeImageApiVersion'), 'AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_MODEL_VERSION', parameters('computerVisionVectorizeImageModelVersion'), 'AZURE_CONTENT_SAFETY_ENDPOINT', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('contentSafetyName')), '2022-09-01').outputs.endpoint.value, 'AZURE_OPENAI_RESOURCE', parameters('azureOpenAIResourceName'), 'AZURE_OPENAI_MODEL_INFO', variables('azureOpenAIModelInfo'), 'AZURE_OPENAI_TEMPERATURE', parameters('azureOpenAITemperature'), 'AZURE_OPENAI_TOP_P', parameters('azureOpenAITopP'), 'AZURE_OPENAI_MAX_TOKENS', parameters('azureOpenAIMaxTokens'), 'AZURE_OPENAI_STOP_SEQUENCE', parameters('azureOpenAIStopSequence'), 'AZURE_OPENAI_SYSTEM_MESSAGE', parameters('azureOpenAISystemMessage'), 'AZURE_OPENAI_API_VERSION', parameters('azureOpenAIApiVersion'), 'AZURE_OPENAI_STREAM', parameters('azureOpenAIStream'), 'AZURE_OPENAI_EMBEDDING_MODEL_INFO', variables('azureOpenAIEmbeddingModelInfo'), 'AZURE_SEARCH_USE_SEMANTIC_SEARCH', parameters('azureSearchUseSemanticSearch'), 'AZURE_SEARCH_SERVICE', format('https://{0}.search.windows.net', parameters('azureAISearchName')), 'AZURE_SEARCH_INDEX', parameters('azureSearchIndex'), 'AZURE_SEARCH_CONVERSATIONS_LOG_INDEX', parameters('azureSearchConversationLogIndex'), 'AZURE_SEARCH_SEMANTIC_SEARCH_CONFIG', parameters('azureSearchSemanticSearchConfig'), 'AZURE_SEARCH_INDEX_IS_PRECHUNKED', parameters('azureSearchIndexIsPrechunked'), 'AZURE_SEARCH_TOP_K', parameters('azureSearchTopK'), 'AZURE_SEARCH_ENABLE_IN_DOMAIN', parameters('azureSearchEnableInDomain'), 'AZURE_SEARCH_FILENAME_COLUMN', parameters('azureSearchFilenameColumn'), 'AZURE_SEARCH_FILTER', parameters('azureSearchFilter'), 'AZURE_SEARCH_FIELDS_ID', parameters('azureSearchFieldId'), 'AZURE_SEARCH_CONTENT_COLUMN', parameters('azureSearchContentColumn'), 'AZURE_SEARCH_CONTENT_VECTOR_COLUMN', parameters('azureSearchVectorColumn'), 'AZURE_SEARCH_TITLE_COLUMN', parameters('azureSearchTitleColumn'), 'AZURE_SEARCH_FIELDS_METADATA', parameters('azureSearchFieldsMetadata'), 'AZURE_SEARCH_SOURCE_COLUMN', parameters('azureSearchSourceColumn'), 'AZURE_SEARCH_CHUNK_COLUMN', parameters('azureSearchChunkColumn'), 'AZURE_SEARCH_OFFSET_COLUMN', parameters('azureSearchOffsetColumn'), 'AZURE_SEARCH_URL_COLUMN', parameters('azureSearchUrlColumn'), 'AZURE_SEARCH_USE_INTEGRATED_VECTORIZATION', parameters('azureSearchUseIntegratedVectorization'), 'AZURE_SPEECH_SERVICE_NAME', parameters('speechServiceName'), 'AZURE_SPEECH_SERVICE_REGION', parameters('location'), 'AZURE_SPEECH_RECOGNIZER_LANGUAGES', parameters('recognizedLanguages'), 'USE_ADVANCED_IMAGE_PROCESSING', parameters('useAdvancedImageProcessing'), 'ADVANCED_IMAGE_PROCESSING_MAX_IMAGES', parameters('advancedImageProcessingMaxImages'), 'ORCHESTRATION_STRATEGY', parameters('orchestrationStrategy'), 'CONVERSATION_FLOW', parameters('conversationFlow'), 'LOGLEVEL', parameters('logLevel'), 'AZURE_DATABASE_TYPE', parameters('databaseType')), if(equals(parameters('databaseType'), 'cosmos'), createObject('AZURE_COSMOSDB_INFO', string(createObject('accountName', if(equals(parameters('databaseType'), 'cosmos'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosAccountName, ''), 'databaseName', if(equals(parameters('databaseType'), 'cosmos'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosDatabaseName, ''), 'containerName', if(equals(parameters('databaseType'), 'cosmos'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosContainerName, ''))), 'AZURE_COSMOSDB_ENABLE_FEEDBACK', true()), if(equals(parameters('databaseType'), 'postgres'), createObject('AZURE_POSTGRESDB_INFO', string(createObject('serverName', format('{0}.postgres.database.azure.com', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLServerName), 'databaseName', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLDatabaseName, 'userName', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLDbUser, 'password', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLDbPwd))), createObject())))]" } }, "template": { @@ -3369,8 +3666,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "9347651394814311894" + "version": "0.30.23.60470", + "templateHash": "64857797928052295" } }, "parameters": { @@ -3451,11 +3748,11 @@ "type": "string", "defaultValue": "" }, - "storageAccountKeyName": { + "azureBlobStorageInfo": { "type": "string", "defaultValue": "" }, - "formRecognizerKeyName": { + "azureFormRecognizerInfo": { "type": "string", "defaultValue": "" }, @@ -3490,9 +3787,17 @@ "type": "string", "defaultValue": "" }, + "databaseType": { + "type": "string", + "defaultValue": "cosmos" + }, "cosmosDBKeyName": { "type": "string", "defaultValue": "" + }, + "postgresInfoName": { + "type": "string", + "defaultValue": "" } }, "resources": [ @@ -3526,7 +3831,7 @@ "value": "[parameters('appServicePlanId')]" }, "appSettings": { - "value": "[union(parameters('appSettings'), createObject('AZURE_AUTH_TYPE', parameters('authType'), 'USE_KEY_VAULT', if(parameters('useKeyVault'), parameters('useKeyVault'), ''), 'AZURE_OPENAI_API_KEY', if(parameters('useKeyVault'), parameters('openAIKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('azureOpenAIName')), '2023-05-01').key1), 'AZURE_SEARCH_KEY', if(parameters('useKeyVault'), parameters('searchKeyName'), listAdminKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Search/searchServices', parameters('azureAISearchName')), '2021-04-01-preview').primaryKey), 'AZURE_BLOB_ACCOUNT_KEY', if(parameters('useKeyVault'), parameters('storageAccountKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2021-09-01').keys[0].value), 'AZURE_FORM_RECOGNIZER_KEY', if(parameters('useKeyVault'), parameters('formRecognizerKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('formRecognizerName')), '2023-05-01').key1), 'AZURE_CONTENT_SAFETY_KEY', if(parameters('useKeyVault'), parameters('contentSafetyKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('contentSafetyName')), '2023-05-01').key1), 'AZURE_SPEECH_SERVICE_KEY', if(parameters('useKeyVault'), parameters('speechKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('speechServiceName')), '2023-05-01').key1), 'AZURE_COMPUTER_VISION_KEY', if(or(parameters('useKeyVault'), equals(parameters('computerVisionName'), '')), parameters('computerVisionKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('computerVisionName')), '2023-05-01').key1), 'AZURE_COSMOSDB_ACCOUNT_KEY', if(or(parameters('useKeyVault'), equals(parameters('cosmosDBKeyName'), '')), parameters('cosmosDBKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.DocumentDB/databaseAccounts', parameters('cosmosDBKeyName')), '2022-08-15').primaryMasterKey)))]" + "value": "[union(parameters('appSettings'), union(if(equals(parameters('databaseType'), 'cosmos'), createObject('DATABASE_TYPE', 'cosmos', 'AZURE_COSMOSDB_ACCOUNT_KEY', if(or(parameters('useKeyVault'), equals(parameters('cosmosDBKeyName'), '')), parameters('cosmosDBKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.DocumentDB/databaseAccounts', parameters('cosmosDBKeyName')), '2022-08-15').primaryMasterKey)), createObject('DATABASE_TYPE', 'postgres', 'AZURE_POSTGRESQL_INFO', if(parameters('useKeyVault'), parameters('postgresInfoName'), ''))), createObject('AZURE_AUTH_TYPE', parameters('authType'), 'USE_KEY_VAULT', if(parameters('useKeyVault'), parameters('useKeyVault'), ''), 'AZURE_OPENAI_API_KEY', if(parameters('useKeyVault'), parameters('openAIKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('azureOpenAIName')), '2023-05-01').key1), 'AZURE_SEARCH_KEY', if(parameters('useKeyVault'), parameters('searchKeyName'), listAdminKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Search/searchServices', parameters('azureAISearchName')), '2021-04-01-preview').primaryKey), 'AZURE_BLOB_STORAGE_INFO', if(parameters('useKeyVault'), parameters('azureBlobStorageInfo'), replace(parameters('azureBlobStorageInfo'), '$STORAGE_ACCOUNT_KEY', listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2021-09-01').keys[0].value)), 'AZURE_FORM_RECOGNIZER_INFO', if(parameters('useKeyVault'), parameters('azureFormRecognizerInfo'), replace(parameters('azureFormRecognizerInfo'), '$FORM_RECOGNIZER_KEY', listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('formRecognizerName')), '2023-05-01').key1)), 'AZURE_CONTENT_SAFETY_KEY', if(parameters('useKeyVault'), parameters('contentSafetyKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('contentSafetyName')), '2023-05-01').key1), 'AZURE_SPEECH_SERVICE_KEY', if(parameters('useKeyVault'), parameters('speechKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('speechServiceName')), '2023-05-01').key1), 'AZURE_COMPUTER_VISION_KEY', if(or(parameters('useKeyVault'), equals(parameters('computerVisionName'), '')), parameters('computerVisionKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('computerVisionName')), '2023-05-01').key1))))]" }, "keyVaultName": { "value": "[parameters('keyVaultName')]" @@ -3551,8 +3856,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "14818871229133632920" + "version": "0.30.23.60470", + "templateHash": "7732628295698757767" }, "description": "Creates an Azure App Service in an existing Azure App Service plan." }, @@ -3778,8 +4083,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "3955925289075906039" + "version": "0.30.23.60470", + "templateHash": "16930852302813854027" }, "description": "Updates app settings for an Azure App Service." }, @@ -3856,8 +4161,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -3925,8 +4230,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -3994,8 +4299,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -4063,8 +4368,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -4129,8 +4434,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "17352167468248267479" + "version": "0.30.23.60470", + "templateHash": "465622386717580763" }, "description": "Assigns an Azure Key Vault access policy." }, @@ -4203,8 +4508,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "8033637033572984239" + "version": "0.30.23.60470", + "templateHash": "2622922268469466870" }, "description": "Creates a SQL role assignment under an Azure Cosmos DB account." }, @@ -4264,6 +4569,7 @@ "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'keyvault')]", "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'monitoring')]", "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('azureOpenAIResourceName'))]", + "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql')]", "[subscriptionResourceId('Microsoft.Resources/resourceGroups', variables('rgName'))]", "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('azureAISearchName'))]", "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('speechServiceName'))]", @@ -4324,8 +4630,12 @@ }, "computerVisionName": "[if(parameters('useAdvancedImageProcessing'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'computerVision'), '2022-09-01').outputs.name.value), createObject('value', ''))]", "openAIKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.OPENAI_KEY_NAME.value), createObject('value', ''))]", - "storageAccountKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.STORAGE_ACCOUNT_KEY_NAME.value), createObject('value', ''))]", - "formRecognizerKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.FORM_RECOGNIZER_KEY_NAME.value), createObject('value', ''))]", + "azureBlobStorageInfo": { + "value": "[string(createObject('containerName', variables('blobContainerName'), 'accountName', parameters('storageAccountName'), 'accountKey', if(parameters('useKeyVault'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.STORAGE_ACCOUNT_KEY_NAME.value, '$STORAGE_ACCOUNT_KEY')))]" + }, + "azureFormRecognizerInfo": { + "value": "[string(createObject('endpoint', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('formRecognizerName')), '2022-09-01').outputs.endpoint.value, 'key', if(parameters('useKeyVault'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.FORM_RECOGNIZER_KEY_NAME.value, '$FORM_RECOGNIZER_KEY')))]" + }, "searchKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.SEARCH_KEY_NAME.value), createObject('value', ''))]", "computerVisionKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.COMPUTER_VISION_KEY_NAME.value), createObject('value', ''))]", "contentSafetyKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.CONTENT_SAFETY_KEY_NAME.value), createObject('value', ''))]", @@ -4339,13 +4649,10 @@ }, "appSettings": { "value": { - "AZURE_BLOB_ACCOUNT_NAME": "[parameters('storageAccountName')]", - "AZURE_BLOB_CONTAINER_NAME": "[variables('blobContainerName')]", "AZURE_COMPUTER_VISION_ENDPOINT": "[if(parameters('useAdvancedImageProcessing'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'computerVision'), '2022-09-01').outputs.endpoint.value, '')]", "AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_API_VERSION": "[parameters('computerVisionVectorizeImageApiVersion')]", "AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_MODEL_VERSION": "[parameters('computerVisionVectorizeImageModelVersion')]", "AZURE_CONTENT_SAFETY_ENDPOINT": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('contentSafetyName')), '2022-09-01').outputs.endpoint.value]", - "AZURE_FORM_RECOGNIZER_ENDPOINT": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('formRecognizerName')), '2022-09-01').outputs.endpoint.value]", "AZURE_OPENAI_RESOURCE": "[parameters('azureOpenAIResourceName')]", "AZURE_OPENAI_MODEL_INFO": "[variables('azureOpenAIModelInfo')]", "AZURE_OPENAI_TEMPERATURE": "[parameters('azureOpenAITemperature')]", @@ -4392,8 +4699,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "16426772879193976216" + "version": "0.30.23.60470", + "templateHash": "12567732396765618168" } }, "parameters": { @@ -4474,11 +4781,11 @@ "type": "string", "defaultValue": "" }, - "storageAccountKeyName": { + "azureBlobStorageInfo": { "type": "string", "defaultValue": "" }, - "formRecognizerKeyName": { + "azureFormRecognizerInfo": { "type": "string", "defaultValue": "" }, @@ -4554,7 +4861,7 @@ "value": "[parameters('appServicePlanId')]" }, "appSettings": { - "value": "[union(parameters('appSettings'), createObject('AZURE_AUTH_TYPE', parameters('authType'), 'USE_KEY_VAULT', if(parameters('useKeyVault'), parameters('useKeyVault'), ''), 'AZURE_OPENAI_API_KEY', if(parameters('useKeyVault'), parameters('openAIKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('azureOpenAIName')), '2023-05-01').key1), 'AZURE_SEARCH_KEY', if(parameters('useKeyVault'), parameters('searchKeyName'), listAdminKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Search/searchServices', parameters('azureAISearchName')), '2021-04-01-preview').primaryKey), 'AZURE_BLOB_ACCOUNT_KEY', if(parameters('useKeyVault'), parameters('storageAccountKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2021-09-01').keys[0].value), 'AZURE_FORM_RECOGNIZER_KEY', if(parameters('useKeyVault'), parameters('formRecognizerKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('formRecognizerName')), '2023-05-01').key1), 'AZURE_CONTENT_SAFETY_KEY', if(parameters('useKeyVault'), parameters('contentSafetyKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('contentSafetyName')), '2023-05-01').key1), 'AZURE_SPEECH_SERVICE_KEY', if(parameters('useKeyVault'), parameters('speechKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('speechServiceName')), '2023-05-01').key1), 'AZURE_COMPUTER_VISION_KEY', if(or(parameters('useKeyVault'), equals(parameters('computerVisionName'), '')), parameters('computerVisionKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('computerVisionName')), '2023-05-01').key1)))]" + "value": "[union(parameters('appSettings'), createObject('AZURE_AUTH_TYPE', parameters('authType'), 'USE_KEY_VAULT', if(parameters('useKeyVault'), parameters('useKeyVault'), ''), 'AZURE_OPENAI_API_KEY', if(parameters('useKeyVault'), parameters('openAIKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('azureOpenAIName')), '2023-05-01').key1), 'AZURE_SEARCH_KEY', if(parameters('useKeyVault'), parameters('searchKeyName'), listAdminKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Search/searchServices', parameters('azureAISearchName')), '2021-04-01-preview').primaryKey), 'AZURE_BLOB_STORAGE_INFO', if(parameters('useKeyVault'), parameters('azureBlobStorageInfo'), replace(parameters('azureBlobStorageInfo'), '$STORAGE_ACCOUNT_KEY', listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2021-09-01').keys[0].value)), 'AZURE_FORM_RECOGNIZER_INFO', if(parameters('useKeyVault'), parameters('azureFormRecognizerInfo'), replace(parameters('azureFormRecognizerInfo'), '$FORM_RECOGNIZER_KEY', listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('formRecognizerName')), '2023-05-01').key1)), 'AZURE_CONTENT_SAFETY_KEY', if(parameters('useKeyVault'), parameters('contentSafetyKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('contentSafetyName')), '2023-05-01').key1), 'AZURE_SPEECH_SERVICE_KEY', if(parameters('useKeyVault'), parameters('speechKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('speechServiceName')), '2023-05-01').key1), 'AZURE_COMPUTER_VISION_KEY', if(or(parameters('useKeyVault'), equals(parameters('computerVisionName'), '')), parameters('computerVisionKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('computerVisionName')), '2023-05-01').key1)))]" } }, "template": { @@ -4563,8 +4870,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "14818871229133632920" + "version": "0.30.23.60470", + "templateHash": "7732628295698757767" }, "description": "Creates an Azure App Service in an existing Azure App Service plan." }, @@ -4790,8 +5097,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "3955925289075906039" + "version": "0.30.23.60470", + "templateHash": "16930852302813854027" }, "description": "Updates app settings for an Azure App Service." }, @@ -4868,8 +5175,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -4937,8 +5244,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -5006,8 +5313,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -5075,8 +5382,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -5141,8 +5448,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "17352167468248267479" + "version": "0.30.23.60470", + "templateHash": "465622386717580763" }, "description": "Assigns an Azure Key Vault access policy." }, @@ -5271,8 +5578,12 @@ }, "computerVisionName": "[if(parameters('useAdvancedImageProcessing'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'computerVision'), '2022-09-01').outputs.name.value), createObject('value', ''))]", "openAIKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.OPENAI_KEY_NAME.value), createObject('value', ''))]", - "storageAccountKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.STORAGE_ACCOUNT_KEY_NAME.value), createObject('value', ''))]", - "formRecognizerKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.FORM_RECOGNIZER_KEY_NAME.value), createObject('value', ''))]", + "azureBlobStorageInfo": { + "value": "[string(createObject('containerName', variables('blobContainerName'), 'accountName', parameters('storageAccountName'), 'accountKey', if(parameters('useKeyVault'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.STORAGE_ACCOUNT_KEY_NAME.value, '$STORAGE_ACCOUNT_KEY')))]" + }, + "azureFormRecognizerInfo": { + "value": "[string(createObject('endpoint', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('formRecognizerName')), '2022-09-01').outputs.endpoint.value, 'key', if(parameters('useKeyVault'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.FORM_RECOGNIZER_KEY_NAME.value, '$FORM_RECOGNIZER_KEY')))]" + }, "searchKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.SEARCH_KEY_NAME.value), createObject('value', ''))]", "contentSafetyKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.CONTENT_SAFETY_KEY_NAME.value), createObject('value', ''))]", "speechKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.SPEECH_KEY_NAME.value), createObject('value', ''))]", @@ -5286,13 +5597,10 @@ }, "appSettings": { "value": { - "AZURE_BLOB_ACCOUNT_NAME": "[parameters('storageAccountName')]", - "AZURE_BLOB_CONTAINER_NAME": "[variables('blobContainerName')]", "AZURE_COMPUTER_VISION_ENDPOINT": "[if(parameters('useAdvancedImageProcessing'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'computerVision'), '2022-09-01').outputs.endpoint.value, '')]", "AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_API_VERSION": "[parameters('computerVisionVectorizeImageApiVersion')]", "AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_MODEL_VERSION": "[parameters('computerVisionVectorizeImageModelVersion')]", "AZURE_CONTENT_SAFETY_ENDPOINT": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('contentSafetyName')), '2022-09-01').outputs.endpoint.value]", - "AZURE_FORM_RECOGNIZER_ENDPOINT": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('formRecognizerName')), '2022-09-01').outputs.endpoint.value]", "AZURE_OPENAI_RESOURCE": "[parameters('azureOpenAIResourceName')]", "AZURE_OPENAI_MODEL_INFO": "[variables('azureOpenAIModelInfo')]", "AZURE_OPENAI_TEMPERATURE": "[parameters('azureOpenAITemperature')]", @@ -5339,8 +5647,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "16426772879193976216" + "version": "0.30.23.60470", + "templateHash": "12567732396765618168" } }, "parameters": { @@ -5421,11 +5729,11 @@ "type": "string", "defaultValue": "" }, - "storageAccountKeyName": { + "azureBlobStorageInfo": { "type": "string", "defaultValue": "" }, - "formRecognizerKeyName": { + "azureFormRecognizerInfo": { "type": "string", "defaultValue": "" }, @@ -5501,7 +5809,7 @@ "value": "[parameters('appServicePlanId')]" }, "appSettings": { - "value": "[union(parameters('appSettings'), createObject('AZURE_AUTH_TYPE', parameters('authType'), 'USE_KEY_VAULT', if(parameters('useKeyVault'), parameters('useKeyVault'), ''), 'AZURE_OPENAI_API_KEY', if(parameters('useKeyVault'), parameters('openAIKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('azureOpenAIName')), '2023-05-01').key1), 'AZURE_SEARCH_KEY', if(parameters('useKeyVault'), parameters('searchKeyName'), listAdminKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Search/searchServices', parameters('azureAISearchName')), '2021-04-01-preview').primaryKey), 'AZURE_BLOB_ACCOUNT_KEY', if(parameters('useKeyVault'), parameters('storageAccountKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2021-09-01').keys[0].value), 'AZURE_FORM_RECOGNIZER_KEY', if(parameters('useKeyVault'), parameters('formRecognizerKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('formRecognizerName')), '2023-05-01').key1), 'AZURE_CONTENT_SAFETY_KEY', if(parameters('useKeyVault'), parameters('contentSafetyKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('contentSafetyName')), '2023-05-01').key1), 'AZURE_SPEECH_SERVICE_KEY', if(parameters('useKeyVault'), parameters('speechKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('speechServiceName')), '2023-05-01').key1), 'AZURE_COMPUTER_VISION_KEY', if(or(parameters('useKeyVault'), equals(parameters('computerVisionName'), '')), parameters('computerVisionKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('computerVisionName')), '2023-05-01').key1)))]" + "value": "[union(parameters('appSettings'), createObject('AZURE_AUTH_TYPE', parameters('authType'), 'USE_KEY_VAULT', if(parameters('useKeyVault'), parameters('useKeyVault'), ''), 'AZURE_OPENAI_API_KEY', if(parameters('useKeyVault'), parameters('openAIKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('azureOpenAIName')), '2023-05-01').key1), 'AZURE_SEARCH_KEY', if(parameters('useKeyVault'), parameters('searchKeyName'), listAdminKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Search/searchServices', parameters('azureAISearchName')), '2021-04-01-preview').primaryKey), 'AZURE_BLOB_STORAGE_INFO', if(parameters('useKeyVault'), parameters('azureBlobStorageInfo'), replace(parameters('azureBlobStorageInfo'), '$STORAGE_ACCOUNT_KEY', listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2021-09-01').keys[0].value)), 'AZURE_FORM_RECOGNIZER_INFO', if(parameters('useKeyVault'), parameters('azureFormRecognizerInfo'), replace(parameters('azureFormRecognizerInfo'), '$FORM_RECOGNIZER_KEY', listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('formRecognizerName')), '2023-05-01').key1)), 'AZURE_CONTENT_SAFETY_KEY', if(parameters('useKeyVault'), parameters('contentSafetyKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('contentSafetyName')), '2023-05-01').key1), 'AZURE_SPEECH_SERVICE_KEY', if(parameters('useKeyVault'), parameters('speechKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('speechServiceName')), '2023-05-01').key1), 'AZURE_COMPUTER_VISION_KEY', if(or(parameters('useKeyVault'), equals(parameters('computerVisionName'), '')), parameters('computerVisionKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('computerVisionName')), '2023-05-01').key1)))]" } }, "template": { @@ -5510,8 +5818,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "14818871229133632920" + "version": "0.30.23.60470", + "templateHash": "7732628295698757767" }, "description": "Creates an Azure App Service in an existing Azure App Service plan." }, @@ -5737,8 +6045,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "3955925289075906039" + "version": "0.30.23.60470", + "templateHash": "16930852302813854027" }, "description": "Updates app settings for an Azure App Service." }, @@ -5815,8 +6123,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -5884,8 +6192,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -5953,8 +6261,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -6022,8 +6330,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -6088,8 +6396,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "17352167468248267479" + "version": "0.30.23.60470", + "templateHash": "465622386717580763" }, "description": "Assigns an Azure Key Vault access policy." }, @@ -6203,8 +6511,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "8473455776229346647" + "version": "0.30.23.60470", + "templateHash": "2390666818608223959" }, "description": "Creates an Application Insights instance and a Log Analytics workspace." }, @@ -6255,8 +6563,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "15449976264810996474" + "version": "0.30.23.60470", + "templateHash": "19694557100387265" }, "description": "Creates a Log Analytics workspace." }, @@ -6336,8 +6644,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "16358460762600875186" + "version": "0.30.23.60470", + "templateHash": "16993757720869129667" }, "description": "Creates an Application Insights instance based on an existing Log Analytics workspace." }, @@ -6401,8 +6709,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "1003060957409338499" + "version": "0.30.23.60470", + "templateHash": "12524466040979787143" }, "description": "Creates a dashboard for an Application Insights instance." }, @@ -7740,8 +8048,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "12632171944221294691" + "version": "0.30.23.60470", + "templateHash": "15151749822990864279" } }, "parameters": { @@ -7823,8 +8131,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "10154909114565024920" + "version": "0.30.23.60470", + "templateHash": "15030863077610448627" } }, "parameters": { @@ -7965,8 +8273,12 @@ "value": "[variables('clientKey')]" }, "openAIKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.OPENAI_KEY_NAME.value), createObject('value', ''))]", - "storageAccountKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.STORAGE_ACCOUNT_KEY_NAME.value), createObject('value', ''))]", - "formRecognizerKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.FORM_RECOGNIZER_KEY_NAME.value), createObject('value', ''))]", + "azureBlobStorageInfo": { + "value": "[string(createObject('containerName', variables('blobContainerName'), 'accountName', parameters('storageAccountName'), 'accountKey', if(parameters('useKeyVault'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.STORAGE_ACCOUNT_KEY_NAME.value, '$STORAGE_ACCOUNT_KEY')))]" + }, + "azureFormRecognizerInfo": { + "value": "[string(createObject('endpoint', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('formRecognizerName')), '2022-09-01').outputs.endpoint.value, 'key', if(parameters('useKeyVault'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.FORM_RECOGNIZER_KEY_NAME.value, '$FORM_RECOGNIZER_KEY')))]" + }, "searchKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.SEARCH_KEY_NAME.value), createObject('value', ''))]", "contentSafetyKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.CONTENT_SAFETY_KEY_NAME.value), createObject('value', ''))]", "speechKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.SPEECH_KEY_NAME.value), createObject('value', ''))]", @@ -7980,13 +8292,10 @@ }, "appSettings": { "value": { - "AZURE_BLOB_ACCOUNT_NAME": "[parameters('storageAccountName')]", - "AZURE_BLOB_CONTAINER_NAME": "[variables('blobContainerName')]", "AZURE_COMPUTER_VISION_ENDPOINT": "[if(parameters('useAdvancedImageProcessing'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'computerVision'), '2022-09-01').outputs.endpoint.value, '')]", "AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_API_VERSION": "[parameters('computerVisionVectorizeImageApiVersion')]", "AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_MODEL_VERSION": "[parameters('computerVisionVectorizeImageModelVersion')]", "AZURE_CONTENT_SAFETY_ENDPOINT": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('contentSafetyName')), '2022-09-01').outputs.endpoint.value]", - "AZURE_FORM_RECOGNIZER_ENDPOINT": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('formRecognizerName')), '2022-09-01').outputs.endpoint.value]", "AZURE_OPENAI_MODEL_INFO": "[variables('azureOpenAIModelInfo')]", "AZURE_OPENAI_EMBEDDING_MODEL_INFO": "[variables('azureOpenAIEmbeddingModelInfo')]", "AZURE_OPENAI_RESOURCE": "[parameters('azureOpenAIResourceName')]", @@ -8019,8 +8328,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "9410273585702095132" + "version": "0.30.23.60470", + "templateHash": "17678067728265319370" } }, "parameters": { @@ -8096,11 +8405,11 @@ "type": "string", "defaultValue": "" }, - "storageAccountKeyName": { + "azureBlobStorageInfo": { "type": "string", "defaultValue": "" }, - "formRecognizerKeyName": { + "azureFormRecognizerInfo": { "type": "string", "defaultValue": "" }, @@ -8206,7 +8515,7 @@ "value": "[parameters('useKeyVault')]" }, "appSettings": { - "value": "[union(parameters('appSettings'), createObject('WEBSITES_ENABLE_APP_SERVICE_STORAGE', 'false', 'AZURE_AUTH_TYPE', parameters('authType'), 'USE_KEY_VAULT', if(parameters('useKeyVault'), parameters('useKeyVault'), ''), 'AZURE_OPENAI_API_KEY', if(parameters('useKeyVault'), parameters('openAIKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('azureOpenAIName')), '2023-05-01').key1), 'AZURE_SEARCH_KEY', if(parameters('useKeyVault'), parameters('searchKeyName'), listAdminKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Search/searchServices', parameters('azureAISearchName')), '2021-04-01-preview').primaryKey), 'AZURE_BLOB_ACCOUNT_KEY', if(parameters('useKeyVault'), parameters('storageAccountKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2021-09-01').keys[0].value), 'AZURE_FORM_RECOGNIZER_KEY', if(parameters('useKeyVault'), parameters('formRecognizerKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('formRecognizerName')), '2023-05-01').key1), 'AZURE_CONTENT_SAFETY_KEY', if(parameters('useKeyVault'), parameters('contentSafetyKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('contentSafetyName')), '2023-05-01').key1), 'AZURE_SPEECH_SERVICE_KEY', if(parameters('useKeyVault'), parameters('speechKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('speechServiceName')), '2023-05-01').key1), 'AZURE_COMPUTER_VISION_KEY', if(or(parameters('useKeyVault'), equals(parameters('computerVisionName'), '')), parameters('computerVisionKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('computerVisionName')), '2023-05-01').key1)))]" + "value": "[union(parameters('appSettings'), createObject('WEBSITES_ENABLE_APP_SERVICE_STORAGE', 'false', 'AZURE_AUTH_TYPE', parameters('authType'), 'USE_KEY_VAULT', if(parameters('useKeyVault'), parameters('useKeyVault'), ''), 'AZURE_OPENAI_API_KEY', if(parameters('useKeyVault'), parameters('openAIKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('azureOpenAIName')), '2023-05-01').key1), 'AZURE_SEARCH_KEY', if(parameters('useKeyVault'), parameters('searchKeyName'), listAdminKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Search/searchServices', parameters('azureAISearchName')), '2021-04-01-preview').primaryKey), 'AZURE_BLOB_STORAGE_INFO', if(parameters('useKeyVault'), parameters('azureBlobStorageInfo'), replace(parameters('azureBlobStorageInfo'), '$STORAGE_ACCOUNT_KEY', listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2021-09-01').keys[0].value)), 'AZURE_FORM_RECOGNIZER_INFO', if(parameters('useKeyVault'), parameters('azureFormRecognizerInfo'), replace(parameters('azureFormRecognizerInfo'), '$FORM_RECOGNIZER_KEY', listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('formRecognizerName')), '2023-05-01').key1)), 'AZURE_CONTENT_SAFETY_KEY', if(parameters('useKeyVault'), parameters('contentSafetyKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('contentSafetyName')), '2023-05-01').key1), 'AZURE_SPEECH_SERVICE_KEY', if(parameters('useKeyVault'), parameters('speechKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('speechServiceName')), '2023-05-01').key1), 'AZURE_COMPUTER_VISION_KEY', if(or(parameters('useKeyVault'), equals(parameters('computerVisionName'), '')), parameters('computerVisionKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('computerVisionName')), '2023-05-01').key1)))]" } }, "template": { @@ -8215,8 +8524,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "7133078529690530611" + "version": "0.30.23.60470", + "templateHash": "8206949151292074536" }, "description": "Creates an Azure Function in an existing Azure App Service plan." }, @@ -8426,8 +8735,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "14818871229133632920" + "version": "0.30.23.60470", + "templateHash": "7732628295698757767" }, "description": "Creates an Azure App Service in an existing Azure App Service plan." }, @@ -8653,8 +8962,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "3955925289075906039" + "version": "0.30.23.60470", + "templateHash": "16930852302813854027" }, "description": "Updates app settings for an Azure App Service." }, @@ -8730,8 +9039,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -8817,8 +9126,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -8886,8 +9195,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -8955,8 +9264,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -9024,8 +9333,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -9093,8 +9402,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -9159,8 +9468,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "17352167468248267479" + "version": "0.30.23.60470", + "templateHash": "465622386717580763" }, "description": "Assigns an Azure Key Vault access policy." }, @@ -9288,8 +9597,12 @@ "value": "[variables('clientKey')]" }, "openAIKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.OPENAI_KEY_NAME.value), createObject('value', ''))]", - "storageAccountKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.STORAGE_ACCOUNT_KEY_NAME.value), createObject('value', ''))]", - "formRecognizerKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.FORM_RECOGNIZER_KEY_NAME.value), createObject('value', ''))]", + "azureBlobStorageInfo": { + "value": "[string(createObject('containerName', variables('blobContainerName'), 'accountName', parameters('storageAccountName'), 'accountKey', if(parameters('useKeyVault'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.STORAGE_ACCOUNT_KEY_NAME.value, '$STORAGE_ACCOUNT_KEY')))]" + }, + "azureFormRecognizerInfo": { + "value": "[string(createObject('endpoint', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('formRecognizerName')), '2022-09-01').outputs.endpoint.value, 'key', if(parameters('useKeyVault'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.FORM_RECOGNIZER_KEY_NAME.value, '$FORM_RECOGNIZER_KEY')))]" + }, "searchKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.SEARCH_KEY_NAME.value), createObject('value', ''))]", "contentSafetyKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.CONTENT_SAFETY_KEY_NAME.value), createObject('value', ''))]", "speechKeyName": "[if(parameters('useKeyVault'), createObject('value', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.SPEECH_KEY_NAME.value), createObject('value', ''))]", @@ -9303,13 +9616,10 @@ }, "appSettings": { "value": { - "AZURE_BLOB_ACCOUNT_NAME": "[parameters('storageAccountName')]", - "AZURE_BLOB_CONTAINER_NAME": "[variables('blobContainerName')]", "AZURE_COMPUTER_VISION_ENDPOINT": "[if(parameters('useAdvancedImageProcessing'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'computerVision'), '2022-09-01').outputs.endpoint.value, '')]", "AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_API_VERSION": "[parameters('computerVisionVectorizeImageApiVersion')]", "AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_MODEL_VERSION": "[parameters('computerVisionVectorizeImageModelVersion')]", "AZURE_CONTENT_SAFETY_ENDPOINT": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('contentSafetyName')), '2022-09-01').outputs.endpoint.value]", - "AZURE_FORM_RECOGNIZER_ENDPOINT": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('formRecognizerName')), '2022-09-01').outputs.endpoint.value]", "AZURE_OPENAI_MODEL_INFO": "[variables('azureOpenAIModelInfo')]", "AZURE_OPENAI_EMBEDDING_MODEL_INFO": "[variables('azureOpenAIEmbeddingModelInfo')]", "AZURE_OPENAI_RESOURCE": "[parameters('azureOpenAIResourceName')]", @@ -9342,8 +9652,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "9410273585702095132" + "version": "0.30.23.60470", + "templateHash": "17678067728265319370" } }, "parameters": { @@ -9419,11 +9729,11 @@ "type": "string", "defaultValue": "" }, - "storageAccountKeyName": { + "azureBlobStorageInfo": { "type": "string", "defaultValue": "" }, - "formRecognizerKeyName": { + "azureFormRecognizerInfo": { "type": "string", "defaultValue": "" }, @@ -9529,7 +9839,7 @@ "value": "[parameters('useKeyVault')]" }, "appSettings": { - "value": "[union(parameters('appSettings'), createObject('WEBSITES_ENABLE_APP_SERVICE_STORAGE', 'false', 'AZURE_AUTH_TYPE', parameters('authType'), 'USE_KEY_VAULT', if(parameters('useKeyVault'), parameters('useKeyVault'), ''), 'AZURE_OPENAI_API_KEY', if(parameters('useKeyVault'), parameters('openAIKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('azureOpenAIName')), '2023-05-01').key1), 'AZURE_SEARCH_KEY', if(parameters('useKeyVault'), parameters('searchKeyName'), listAdminKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Search/searchServices', parameters('azureAISearchName')), '2021-04-01-preview').primaryKey), 'AZURE_BLOB_ACCOUNT_KEY', if(parameters('useKeyVault'), parameters('storageAccountKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2021-09-01').keys[0].value), 'AZURE_FORM_RECOGNIZER_KEY', if(parameters('useKeyVault'), parameters('formRecognizerKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('formRecognizerName')), '2023-05-01').key1), 'AZURE_CONTENT_SAFETY_KEY', if(parameters('useKeyVault'), parameters('contentSafetyKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('contentSafetyName')), '2023-05-01').key1), 'AZURE_SPEECH_SERVICE_KEY', if(parameters('useKeyVault'), parameters('speechKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('speechServiceName')), '2023-05-01').key1), 'AZURE_COMPUTER_VISION_KEY', if(or(parameters('useKeyVault'), equals(parameters('computerVisionName'), '')), parameters('computerVisionKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('computerVisionName')), '2023-05-01').key1)))]" + "value": "[union(parameters('appSettings'), createObject('WEBSITES_ENABLE_APP_SERVICE_STORAGE', 'false', 'AZURE_AUTH_TYPE', parameters('authType'), 'USE_KEY_VAULT', if(parameters('useKeyVault'), parameters('useKeyVault'), ''), 'AZURE_OPENAI_API_KEY', if(parameters('useKeyVault'), parameters('openAIKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('azureOpenAIName')), '2023-05-01').key1), 'AZURE_SEARCH_KEY', if(parameters('useKeyVault'), parameters('searchKeyName'), listAdminKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Search/searchServices', parameters('azureAISearchName')), '2021-04-01-preview').primaryKey), 'AZURE_BLOB_STORAGE_INFO', if(parameters('useKeyVault'), parameters('azureBlobStorageInfo'), replace(parameters('azureBlobStorageInfo'), '$STORAGE_ACCOUNT_KEY', listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2021-09-01').keys[0].value)), 'AZURE_FORM_RECOGNIZER_INFO', if(parameters('useKeyVault'), parameters('azureFormRecognizerInfo'), replace(parameters('azureFormRecognizerInfo'), '$FORM_RECOGNIZER_KEY', listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('formRecognizerName')), '2023-05-01').key1)), 'AZURE_CONTENT_SAFETY_KEY', if(parameters('useKeyVault'), parameters('contentSafetyKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('contentSafetyName')), '2023-05-01').key1), 'AZURE_SPEECH_SERVICE_KEY', if(parameters('useKeyVault'), parameters('speechKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('speechServiceName')), '2023-05-01').key1), 'AZURE_COMPUTER_VISION_KEY', if(or(parameters('useKeyVault'), equals(parameters('computerVisionName'), '')), parameters('computerVisionKeyName'), listKeys(resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', parameters('computerVisionName')), '2023-05-01').key1)))]" } }, "template": { @@ -9538,8 +9848,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "7133078529690530611" + "version": "0.30.23.60470", + "templateHash": "8206949151292074536" }, "description": "Creates an Azure Function in an existing Azure App Service plan." }, @@ -9749,8 +10059,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "14818871229133632920" + "version": "0.30.23.60470", + "templateHash": "7732628295698757767" }, "description": "Creates an Azure App Service in an existing Azure App Service plan." }, @@ -9976,8 +10286,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "3955925289075906039" + "version": "0.30.23.60470", + "templateHash": "16930852302813854027" }, "description": "Updates app settings for an Azure App Service." }, @@ -10053,8 +10363,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -10140,8 +10450,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -10209,8 +10519,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -10278,8 +10588,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -10347,8 +10657,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -10416,8 +10726,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -10482,8 +10792,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "17352167468248267479" + "version": "0.30.23.60470", + "templateHash": "465622386717580763" }, "description": "Assigns an Azure Key Vault access policy." }, @@ -10588,8 +10898,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5846053745240336221" + "version": "0.30.23.60470", + "templateHash": "13123022401063321803" }, "description": "Creates an Azure Cognitive Services instance." }, @@ -10743,8 +11053,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5846053745240336221" + "version": "0.30.23.60470", + "templateHash": "13123022401063321803" }, "description": "Creates an Azure Cognitive Services instance." }, @@ -10901,8 +11211,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "14787323190374281342" + "version": "0.30.23.60470", + "templateHash": "6699069410959282929" } }, "parameters": { @@ -11034,8 +11344,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "17192989974061212120" + "version": "0.30.23.60470", + "templateHash": "10401188783540495741" }, "description": "Creates an Azure storage account." }, @@ -11262,8 +11572,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -11332,8 +11642,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -11402,8 +11712,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -11472,8 +11782,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "5620801774479515492" + "version": "0.30.23.60470", + "templateHash": "14973584850527407631" }, "description": "Creates a role assignment for a service principal." }, @@ -11558,8 +11868,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.31.34.60546", - "templateHash": "14309427698097244890" + "version": "0.30.23.60470", + "templateHash": "17372485166957435450" } }, "parameters": { @@ -11668,6 +11978,7 @@ "type": "Microsoft.Resources/deployments", "apiVersion": "2022-09-01", "name": "deploy_create_table_script", + "resourceGroup": "[variables('rgName')]", "properties": { "expressionEvaluationOptions": { "scope": "inner" @@ -11675,19 +11986,19 @@ "mode": "Incremental", "parameters": { "solutionLocation": { - "value": "[variables('location')]" + "value": "[parameters('location')]" }, "identity": { - "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity'), '2022-09-01').outputs.managedIdentityOutput.value.id]" + "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_managed_identity'), '2022-09-01').outputs.managedIdentityOutput.value.id]" }, "baseUrl": { "value": "[variables('baseUrl')]" }, "keyVaultName": { - "value": "[reference(resourceId('Microsoft.Resources/deployments', 'keyvault'), '2022-09-01').outputs.name.value]" + "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'keyvault'), '2022-09-01').outputs.name.value]" }, "postgresSqlServerName": { - "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgresSQLName]" + "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgresSQLName]" } }, "template": { @@ -11747,11 +12058,10 @@ }, "dependsOn": [ "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'keyvault')]", - "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'monitoring')]", - "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('azureOpenAIResourceName'))]", + "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_managed_identity')]", + "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql')]", "[subscriptionResourceId('Microsoft.Resources/resourceGroups', variables('rgName'))]", - "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('azureAISearchName'))]", - "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('storageAccountName'))]" + "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys')]" ] } ], @@ -11764,17 +12074,9 @@ "type": "string", "value": "[parameters('hostingModel')]" }, - "AZURE_BLOB_CONTAINER_NAME": { + "AZURE_BLOB_STORAGE_INFO": { "type": "string", - "value": "[variables('blobContainerName')]" - }, - "AZURE_BLOB_ACCOUNT_NAME": { - "type": "string", - "value": "[parameters('storageAccountName')]" - }, - "AZURE_BLOB_ACCOUNT_KEY": { - "type": "string", - "value": "[if(parameters('useKeyVault'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.STORAGE_ACCOUNT_KEY_NAME.value, '')]" + "value": "[replace(string(createObject('containerName', variables('blobContainerName'), 'accountName', parameters('storageAccountName'), 'accountKey', if(parameters('useKeyVault'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.STORAGE_ACCOUNT_KEY_NAME.value, '$STORAGE_ACCOUNT_KEY'))), '$STORAGE_ACCOUNT_KEY', '')]" }, "AZURE_COMPUTER_VISION_ENDPOINT": { "type": "string", @@ -11804,13 +12106,9 @@ "type": "string", "value": "[if(parameters('useKeyVault'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.CONTENT_SAFETY_KEY_NAME.value, '')]" }, - "AZURE_FORM_RECOGNIZER_ENDPOINT": { - "type": "string", - "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('formRecognizerName')), '2022-09-01').outputs.endpoint.value]" - }, - "AZURE_FORM_RECOGNIZER_KEY": { + "AZURE_FORM_RECOGNIZER_INFO": { "type": "string", - "value": "[if(parameters('useKeyVault'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.FORM_RECOGNIZER_KEY_NAME.value, '')]" + "value": "[replace(string(createObject('endpoint', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', parameters('formRecognizerName')), '2022-09-01').outputs.endpoint.value, 'key', if(parameters('useKeyVault'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.FORM_RECOGNIZER_KEY_NAME.value, '$FORM_RECOGNIZER_KEY'))), '$FORM_RECOGNIZER_KEY', '')]" }, "AZURE_KEY_VAULT_ENDPOINT": { "type": "string", @@ -12006,7 +12304,11 @@ }, "AZURE_COSMOSDB_INFO": { "type": "string", - "value": "[string(createObject('accountName', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosAccountName, 'databaseName', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosDatabaseName, 'containerName', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosContainerName))]" + "value": "[string(createObject('accountName', if(equals(parameters('databaseType'), 'cosmos'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosAccountName, ''), 'databaseName', if(equals(parameters('databaseType'), 'cosmos'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosDatabaseName, ''), 'containerName', if(equals(parameters('databaseType'), 'cosmos'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosContainerName, '')))]" + }, + "AZURE_POSTGRESDB_INFO": { + "type": "string", + "value": "[string(createObject('serverName', format('{0}.postgres.database.azure.com', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLServerName), 'databaseName', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLDatabaseName, 'userName', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLDbUser, 'password', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_postgres_sql'), '2022-09-01').outputs.postgresDbOutput.value.postgreSQLDbPwd))]" } } -} +} \ No newline at end of file From 7fc608db4d959b3e8e5869a3722d126d3a134d54 Mon Sep 17 00:00:00 2001 From: Prajwal D C Date: Thu, 28 Nov 2024 17:02:09 +0530 Subject: [PATCH 20/20] fix: Lint issue --- code/tests/functional/app_config.py | 1 + 1 file changed, 1 insertion(+) diff --git a/code/tests/functional/app_config.py b/code/tests/functional/app_config.py index fa2829fb9..0dd14b2f6 100644 --- a/code/tests/functional/app_config.py +++ b/code/tests/functional/app_config.py @@ -7,6 +7,7 @@ logger = logging.getLogger(__name__) encoded_account_key = str(base64.b64encode(b"some-blob-account-key"), "utf-8") + class AppConfig: before_config: dict[str, str] = {} config: dict[str, str | None] = {