From 12491359e46e69541a40cb23d4969a3a73d24fdb Mon Sep 17 00:00:00 2001
From: Prasanjeet-Microsoft <v-singhprasa@microsoft.com>
Date: Thu, 29 May 2025 21:40:29 +0530
Subject: [PATCH 1/2] Added missing output variable AZURE_COSMOSDB_ACCOUNT_KEY
 for environment configuration

---
 infra/main.bicep | 1 +
 infra/main.json  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/infra/main.bicep b/infra/main.bicep
index 4824258d8..b0606ef8c 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -1380,6 +1380,7 @@ var azureOpenAIEmbeddingModelInfo = string({
 
 var azureCosmosDBInfo = string({
   account_name: databaseType == 'CosmosDB' ? cosmosDBModule.outputs.cosmosOutput.cosmosAccountName : ''
+  account_key: databaseType == 'CosmosDB' && useKeyVault ? storekeys.outputs.COSMOS_ACCOUNT_KEY_NAME : ''
   database_name: databaseType == 'CosmosDB' ? cosmosDBModule.outputs.cosmosOutput.cosmosDatabaseName : ''
   conversations_container_name: databaseType == 'CosmosDB'
     ? cosmosDBModule.outputs.cosmosOutput.cosmosContainerName
diff --git a/infra/main.json b/infra/main.json
index 68116d761..fb3e66093 100644
--- a/infra/main.json
+++ b/infra/main.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.35.1.17967",
-      "templateHash": "15937746938783498831"
+      "templateHash": "6933035325950046645"
     }
   },
   "parameters": {
@@ -12278,7 +12278,7 @@
     },
     "AZURE_COSMOSDB_INFO": {
       "type": "string",
-      "value": "[string(createObject('account_name', if(equals(parameters('databaseType'), 'CosmosDB'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosAccountName, ''), 'database_name', if(equals(parameters('databaseType'), 'CosmosDB'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosDatabaseName, ''), 'conversations_container_name', if(equals(parameters('databaseType'), 'CosmosDB'), 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('account_name', if(equals(parameters('databaseType'), 'CosmosDB'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosAccountName, ''), 'account_key', if(and(equals(parameters('databaseType'), 'CosmosDB'), parameters('useKeyVault')), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'storekeys'), '2022-09-01').outputs.COSMOS_ACCOUNT_KEY_NAME.value, ''), 'database_name', if(equals(parameters('databaseType'), 'CosmosDB'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, variables('rgName')), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosOutput.value.cosmosDatabaseName, ''), 'conversations_container_name', if(equals(parameters('databaseType'), 'CosmosDB'), 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_POSTGRESQL_INFO": {
       "type": "string",

From af1e711b8df06f75b97a303ab9f88813a88eb27e Mon Sep 17 00:00:00 2001
From: Prasanjeet-Microsoft <v-singhprasa@microsoft.com>
Date: Thu, 29 May 2025 22:04:33 +0530
Subject: [PATCH 2/2] Added AZURE_COSMOSDB_ACCOUNT_KEY to env.sample for Cosmos
 DB key-based auth

---
 .env.sample | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.env.sample b/.env.sample
index 36abb1ee1..4cf6eb730 100644
--- a/.env.sample
+++ b/.env.sample
@@ -64,6 +64,7 @@ AZURE_KEY_VAULT_ENDPOINT=
 CONVERSATION_FLOW=
 # Chat History CosmosDB Integration Settings
 AZURE_COSMOSDB_ACCOUNT_NAME=
+AZURE_COSMOSDB_ACCOUNT_KEY=
 AZURE_COSMOSDB_DATABASE_NAME=
 AZURE_COSMOSDB_CONVERSATIONS_CONTAINER_NAME=
 AZURE_COSMOSDB_ENABLE_FEEDBACK=