Merge pull request #39 from microsoft/adesousa_microsoft/update-arm-with-cosmos

update bicep with cosmos db configuration

Author: hunterjam

azure.yaml

@@ -35,11 +35,11 @@ hooks:
     postprovision:
       windows:
         shell: pwsh
-        run: ./scripts/auth_update.ps1;./scripts/prepdocs.ps1;
+        run: ./scripts/auth_update.ps1;
         interactive: true
         continueOnError: false
       posix:
         shell: sh
-        run: ./scripts/auth_update.sh;./scripts/prepdocs.sh;
+        run: ./scripts/auth_update.sh;
         interactive: true
         continueOnError: false

infra/main.bicep

@@ -42,19 +42,13 @@ param openAIStream bool = true
 param embeddingDeploymentName string = 'embedding'
 param embeddingModelName string = 'text-embedding-ada-002'
 
-// Used by prepdocs.py: Form recognizer
-param formRecognizerServiceName string = ''
-param formRecognizerResourceGroupName string = ''
-param formRecognizerResourceGroupLocation string = location
-param formRecognizerSkuName string = ''
-
 // Used for the Azure AD application
 param authClientId string
 @secure()
 param authClientSecret string
 
 // Used for Cosmos DB
-// param cosmosAccountName string = ''
+param cosmosAccountName string = ''
 
 @description('Id of the user or app to assign application roles')
 param principalId string = ''
@@ -88,7 +82,7 @@ module appServicePlan 'core/host/appserviceplan.bicep' = {
     location: location
     tags: tags
     sku: {
-      name: 'B1'
+      name: 'P2v3'
       capacity: 1
     }
     kind: 'linux'
@@ -195,16 +189,16 @@ module searchService 'core/search/search-services.bicep' = {
 }
 
 // The application database
-// module cosmos 'db.bicep' = {
-//   name: 'cosmos'
-//   scope: resourceGroup
-//   params: {
-//     accountName: !empty(cosmosAccountName) ? cosmosAccountName : '${abbrs.documentDBDatabaseAccounts}${resourceToken}'
-//     location: 'eastus'
-//     tags: tags
-//     principalIds: [principalId, backend.outputs.identityPrincipalId]
-//   }
-// }
+module cosmos 'db.bicep' = {
+  name: 'cosmos'
+  scope: resourceGroup
+  params: {
+    accountName: !empty(cosmosAccountName) ? cosmosAccountName : '${abbrs.documentDBDatabaseAccounts}${resourceToken}'
+    location: location
+    tags: tags
+    principalIds: [principalId, backend.outputs.identityPrincipalId]
+  }
+}
 
 
 // USER ROLES
@@ -269,21 +263,6 @@ module searchRoleBackend 'core/security/role.bicep' = {
   }
 }
 
-// For doc prep
-module docPrepResources 'docprep.bicep' = {
-  name: 'docprep-resources${resourceToken}'
-  params: {
-    location: location
-    resourceToken: resourceToken
-    tags: tags
-    principalId: principalId
-    resourceGroupName: resourceGroup.name
-    formRecognizerServiceName: formRecognizerServiceName
-    formRecognizerResourceGroupName: formRecognizerResourceGroupName
-    formRecognizerResourceGroupLocation: formRecognizerResourceGroupLocation
-    formRecognizerSkuName: !empty(formRecognizerSkuName) ? formRecognizerSkuName : 'S0'
-  }
-}
 output AZURE_LOCATION string = location
 output AZURE_TENANT_ID string = tenant().tenantId
 output AZURE_RESOURCE_GROUP string = resourceGroup.name
@@ -321,14 +300,9 @@ output AZURE_OPENAI_STOP_SEQUENCE string = openAIStopSequence
 output AZURE_OPENAI_SYSTEM_MESSAGE string = openAISystemMessage
 output AZURE_OPENAI_STREAM bool = openAIStream
 
-// Used by prepdocs.py:
-output AZURE_FORMRECOGNIZER_SERVICE string = docPrepResources.outputs.AZURE_FORMRECOGNIZER_SERVICE
-output AZURE_FORMRECOGNIZER_RESOURCE_GROUP string = docPrepResources.outputs.AZURE_FORMRECOGNIZER_RESOURCE_GROUP
-output AZURE_FORMRECOGNIZER_SKU_NAME string = docPrepResources.outputs.AZURE_FORMRECOGNIZER_SKU_NAME
-
 // cosmos
-// output AZURE_COSMOSDB_ACCOUNT string = cosmos.outputs.accountName
-// output AZURE_COSMOSDB_DATABASE string = cosmos.outputs.databaseName
-// output AZURE_COSMOSDB_CONVERSATIONS_CONTAINER string = cosmos.outputs.containerName
+output AZURE_COSMOSDB_ACCOUNT string = cosmos.outputs.accountName
+output AZURE_COSMOSDB_DATABASE string = cosmos.outputs.databaseName
+output AZURE_COSMOSDB_CONVERSATIONS_CONTAINER string = cosmos.outputs.containerName
 
 output AUTH_ISSUER_URI string = authIssuerUri