Replace CosmosDB with PostgreSQL in ACA Longhaul (#216)

* Removed CosmoDB as dependency. Its transactional support isn't great and we were having issues with it: ``` 2024-01-10T23:08:04.892494542Z time="2024-01-10T23:08:04.892429945Z" level=error msg="Transaction failed due to operation 0 which failed with status code 400" app_id=hashtag-actor component="statestore (state.azure.cosmosdb/v1)" instance=hashtag-actor--vo723vq-56bf46647c-c7v55 scope=dapr.contrib type=log ver=1.11.6 2024-01-10T23:08:04.892663298Z time="2024-01-10T23:08:04.892450433Z" level=debug msg="{ERR_ACTOR_STATE_TRANSACTION_SAVE error saving actor transaction state: transaction failed due to operation 0 which failed with status code 400}" app_id=hashtag-actor instance=hashtag-actor--vo723vq-56bf46647c-c7v55 scope=dapr.runtime.http type=log ver=1.11.6 ``` * Simplified dependency lists * Removed external network from applications -- there's no need to have them exposed to the public internet. * Make resource-names more subscription-dependent, so we can run multiple instances of the same application in different resource groups in the same subscription. Signed-off-by: Tiago Alves Macambira <[email protected]>
dapr · Jan 12, 2024 · 80ca515 · 80ca515
1 parent 16a7158
commit 80ca515
Show file tree

Hide file tree

Showing 15 changed files with 78 additions and 36 deletions.
diff --git a/deploy/aks/services/postgresql.bicep b/deploy/aks/services/postgresql.bicep
@@ -16,7 +16,6 @@ param administratorLoginPassword string = 'pgpass-${uniqueString(resourceGroup()
 @description('Azure database for PostgreSQL pricing tier')
 @allowed([
   'Burstable'
-  'Basic'
   'GeneralPurpose'
   'MemoryOptimized'
 ])
@@ -124,7 +123,7 @@ resource server 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = {
 // AAD support requires Dapr 1.12.0 or later
 resource addAddUser 'Microsoft.DBforPostgreSQL/flexibleServers/administrators@2022-12-01' = {
   parent: server
-  name: '${aadAdminObjectid}'
+  name: aadAdminObjectid
   dependsOn: [
     server
   ]

diff --git a/deploy/containerapps/README.md b/deploy/containerapps/README.md
@@ -11,5 +11,5 @@ az group create -n $RESOURCE_GROUP -l $LOCATION
 
 ### Deploy via Deployment Groups and Bicep
 ```bash
-az deployment group create -g $RESOURCE_GROUP -f ./deploy/main.bicep
+az deployment group create -g $RESOURCE_GROUP -f ./deploy/containerapps/main.bicep
 ```
diff --git a/deploy/containerapps/apps/hashtag-actor.bicep b/deploy/containerapps/apps/hashtag-actor.bicep
@@ -26,7 +26,7 @@ resource hashtagActor 'Microsoft.App/containerApps@2022-03-01' = {
     }
     configuration: {
       ingress: {
-        external: true
+        external: false
         targetPort: containerPort
       }
       dapr: {

diff --git a/deploy/containerapps/apps/hashtag-counter.bicep b/deploy/containerapps/apps/hashtag-counter.bicep
@@ -26,7 +26,7 @@ resource hashtagCounter 'Microsoft.App/containerApps@2022-03-01' = {
     }
     configuration: {
       ingress: {
-        external: true
+        external: false
         targetPort: containerPort
       }
       dapr: {

diff --git a/deploy/containerapps/apps/message-analyzer.bicep b/deploy/containerapps/apps/message-analyzer.bicep
@@ -26,7 +26,7 @@ resource messageAnalyzer 'Microsoft.App/containerApps@2022-03-01' = {
     }
     configuration: {
       ingress: {
-        external: true
+        external: false
         targetPort: containerPort
       }
       dapr: {

diff --git a/deploy/containerapps/apps/pubsub-workflow.bicep b/deploy/containerapps/apps/pubsub-workflow.bicep
@@ -26,7 +26,7 @@ resource pubsubWorkflow 'Microsoft.App/containerApps@2022-03-01' = {
     }
     configuration: {
       ingress: {
-        external: true
+        external: false
         targetPort: containerPort
       }
       dapr: {

diff --git a/deploy/containerapps/apps/snapshot.bicep b/deploy/containerapps/apps/snapshot.bicep
@@ -32,7 +32,7 @@ resource snapshot 'Microsoft.App/containerApps@2022-03-01' = {
     }
     configuration: {
       ingress: {
-        external: true
+        external: false
         targetPort: containerPort
       }
       dapr: {

diff --git a/deploy/containerapps/apps/validation-worker.bicep b/deploy/containerapps/apps/validation-worker.bicep
@@ -32,7 +32,7 @@ resource validationWorkflow 'Microsoft.App/containerApps@2022-03-01' = {
     }
     configuration: {
       ingress: {
-        external: true
+        external: false
         targetPort: containerPort
       }
       dapr: {

diff --git a/deploy/containerapps/azure/cosmos.bicep b/deploy/containerapps/azure/cosmos.bicep
@@ -1,4 +1,4 @@
-param cosmosAccountName string = 'dapr-longhaul-cosmosdb'
+param cosmosAccountName string = toLower('cosmosdb${uniqueString(resourceGroup().id)}')
 param cosmosDatabaseName string = 'longhauldb'
 param cosmosContainerName string = 'longhaulcontainer'
 param location string

diff --git a/deploy/containerapps/azure/environment.bicep b/deploy/containerapps/azure/environment.bicep
@@ -1,4 +1,4 @@
-param environmentName string = 'dapr-longhaul-env'
+param environmentName string = toLower('dapr-env-${uniqueString(resourceGroup().id)}')
 param appInsightsName string = '${environmentName}-ai'
 param logAnalyticsWorkspaceName string = '${environmentName}-la'
 param location string

diff --git a/deploy/containerapps/azure/servicebus.bicep b/deploy/containerapps/azure/servicebus.bicep
@@ -1,4 +1,4 @@
-param serviceBusNamespace string = 'dapr-longhaul-capps-servicebus'
+param serviceBusNamespace string = toLower('servicebus${uniqueString(resourceGroup().id)}')
 param location string
 
 resource servicebus 'Microsoft.ServiceBus/namespaces@2021-11-01' = {

diff --git a/deploy/containerapps/azure/storage-services.bicep b/deploy/containerapps/azure/storage-services.bicep
@@ -1,5 +1,5 @@
 param location string
-param accountName string = 'testlonghaulstorage'
+param accountName string = toLower('storage${uniqueString(resourceGroup().id)}')
 
 
 // Storage account and associated services.

diff --git a/deploy/containerapps/daprComponents/statestore-postgresql.bicep b/deploy/containerapps/daprComponents/statestore-postgresql.bicep
@@ -0,0 +1,40 @@
+
+param environmentName string
+
+@secure()
+param connectionString string
+
+param componentName string = 'statestore'
+
+resource environment 'Microsoft.App/managedEnvironments@2022-03-01' existing = {
+  name: environmentName
+}
+
+resource stateDaprComponent 'Microsoft.App/managedEnvironments/daprComponents@2022-03-01' = {
+  name: componentName
+  parent: environment
+  properties: {
+    componentType: 'state.postgresql'
+    version: 'v1'
+    secrets: [
+      {
+        name: 'secretconnectionstring'
+        value: connectionString
+      }
+    ]
+    metadata: [
+      {
+        name: 'connectionString'
+        secretRef: 'secretconnectionstring'
+      }
+      {
+        name: 'actorStateStore'
+        value: 'true'
+      }
+    ]
+    scopes: [
+      'hashtag-actor'
+      'snapshot'
+    ]
+  }
+}
diff --git a/deploy/containerapps/daprComponents/statestore.bicep b/deploy/containerapps/daprComponents/statestore.bicep
@@ -1,4 +1,4 @@
-param componentName string = 'statestore'
+param componentName string = 'statestore-cosmos'
 param environmentName string
 param databaseName string
 param collectionName string

diff --git a/deploy/containerapps/main.bicep b/deploy/containerapps/main.bicep
@@ -1,7 +1,21 @@
 // Global parameters
 param location string = resourceGroup().location
 
+@description('The unique discriminator of the solution. This is used to ensure that resource names are unique.')
+@minLength(3)
+@maxLength(16)
+param solutionName string = uniqueString(resourceGroup().id)
+
+param identityName string = '${solutionName}-identity'
+
 // === Azure Setup ===
+
+// Identity - Not a module so we can reference the resource below.
+resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = {
+  name: identityName
+  location: location
+}
+
 // Container Apps Environment 
 module environment 'azure/environment.bicep' = {
   name: '${deployment().name}--environment'
@@ -18,11 +32,15 @@ module storageServices 'azure/storage-services.bicep' = {
   }
 }
 
-// CosmosDB
-module cosmos 'azure/cosmos.bicep' = {
-  name: '${deployment().name}--cosmos'
+// PostgreSQL
+module postgresql '../aks/services/postgresql.bicep' = {
+  name: '${deployment().name}--postgresql'
   params: {
+    solutionName: solutionName
     location: location
+    allowAzureIPsFirewall: true
+    aadAdminName: managedIdentity.name
+    aadAdminObjectid: managedIdentity.properties.principalId
   }
 }
 
@@ -36,17 +54,15 @@ module servicebus 'azure/servicebus.bicep' = {
 
 // === Component Setup ===
 // Statestore (actors) component
-module statestore 'daprComponents/statestore.bicep' = {
+module statestore 'daprComponents/statestore-postgresql.bicep' = {
   name: '${deployment().name}--statestore-component'
   dependsOn: [
-    cosmos
+    postgresql
     environment
   ]
   params: {
     environmentName: environment.outputs.environmentName
-    cosmosAccountName: cosmos.outputs.cosmosAccountName
-    databaseName: cosmos.outputs.cosmosDatabaseName
-    collectionName: cosmos.outputs.cosmosContainerName
+    connectionString: postgresql.outputs.connectionString
   }
 }
 
@@ -80,8 +96,6 @@ module binding 'daprComponents/storagebinding.bicep' = {
 module pubsubWorkflow 'apps/pubsub-workflow.bicep' = {
   name: '${deployment().name}--pubsub-workflow'
   dependsOn: [
-    environment
-    servicebus
     pubsub
   ]
   params: {
@@ -93,8 +107,6 @@ module pubsubWorkflow 'apps/pubsub-workflow.bicep' = {
 module feedGenerator 'apps/feed-generator.bicep' = {
   name: '${deployment().name}--feed-generator'
   dependsOn: [
-    environment
-    servicebus
     pubsub
   ]
   params: {
@@ -106,8 +118,6 @@ module feedGenerator 'apps/feed-generator.bicep' = {
 module hashtagActor 'apps/hashtag-actor.bicep' = {
   name: '${deployment().name}--hashtag-actor'
   dependsOn: [
-    environment
-    cosmos
     statestore
   ]
   params: {
@@ -119,9 +129,8 @@ module hashtagActor 'apps/hashtag-actor.bicep' = {
 module hashtagCounter 'apps/hashtag-counter.bicep' = {
   name: '${deployment().name}--hashtag-counter'
   dependsOn: [
-    environment
-    storageServices
     binding
+    hashtagActor
   ]
   params: {
     environmentName: environment.outputs.environmentName
@@ -132,9 +141,6 @@ module hashtagCounter 'apps/hashtag-counter.bicep' = {
 module messageAnalyzer 'apps/message-analyzer.bicep' = {
   name: '${deployment().name}--message-analyzer'
   dependsOn: [
-    environment
-    servicebus
-    storageServices
     binding
     pubsub
   ]
@@ -147,8 +153,6 @@ module messageAnalyzer 'apps/message-analyzer.bicep' = {
 module snapshot 'apps/snapshot.bicep' = {
   name: '${deployment().name}--snapshot'
   dependsOn: [
-    environment
-    cosmos
     statestore
   ]
   params: {
@@ -160,7 +164,6 @@ module snapshot 'apps/snapshot.bicep' = {
 module validationWorker 'apps/validation-worker.bicep' = {
   name: '${deployment().name}--validation-worker'
   dependsOn: [
-    environment
     snapshot
   ]
   params: {