#63 updated bicep with redis, postgres and azure service bus

Author: thangchung

.gitignore

@@ -355,6 +355,10 @@ src/web/shrinkwrap.yaml
 # git submodules
 **/*/healthchecksdb
 
+docker-compose.*.local.yml
+tye.*.local.yaml
+components/az/
+
 .tye/
 .logs/
 

NET6.md

@@ -1,8 +1,7 @@
 # TODO
-1. update refresh token flow in webapi, hard code now
-2. error when do checkout, double-check for saleapp
-3. scale rule with http concurrency (10)
-4. Traffic spliting (modify web to add rating and split traffic 50/50)
+1. error when do checkout, double-check for saleapp (we might add Azure Service Bus for pubsub)
+2. scale rule with http concurrency (10)
+3. Traffic spliting (modify web to add rating and split traffic 50/50)
 
 # APIs
 
@@ -81,16 +80,25 @@
 - POST: cron-complete-order
   - Request: CompleteOrderQuery (TODO: Command)
 
+# Get starting
 
-## ASP.NET Core Cert with docker-compose
+## docker-compose
+
+- Because dev cert isn't working in docker-compose env, so we need to generate the cert just like https://github.com/thangchung/Sample-Docker-Https, and maps it into docker-compose volume
+
+You need to copy the cert at `src/dotnet/certs/localhost.pfx` into `~/.aspnet/https` so that you can map the cert in local path into docker path when run `docker compose -f docker-compose.yml -f docker-compose.override.yml up -d`
+
+See more about this issue at https://github.com/MicrosoftDocs/visualstudio-docs/issues/5733
+
+## tye
 
 ```bash
 > dotnet dev-certs https -ep aspnetapp.pfx -p P@ssw0rd # then save it to %USERPROFILE%\.aspnet\https
 > dotnet dev-certs https --trust
-> docker compose up
+> tye run
 ```
 
-# Get starting 
+## Azure Container Apps with Bicep
 
 ```powershell
 > $rgName="coolstore-rg"
@@ -104,14 +112,8 @@
 ```powershell
 > az deployment group create `
   --resource-group $rgName `
-  --template-file core.bicep `
-  --parameters `
-      inventoryPostgresHost='<inventory postgres db>' `
-      productCategoryPostgresHost='<product catalog postgres db>' `
-      postgresDbPassword='<postgres password>' `
-      redisConnection='<full redis connection string>' `
-      redisHost='<redis host>' `
-      redisPassword='<redis password>'
+  --template-file main.bicep `
+  --parameters  postgresDbPassword='<postgres password>'
 ```
 
 ```powershell

deploys/bicep/main.bicep

@@ -1,7 +1,13 @@
 param location string = resourceGroup().location
-param environmentName string = 'env-${uniqueString(resourceGroup().id)}'
-param appInsightsName string = 'app-insights-${uniqueString(resourceGroup().id)}'
-param logAnalyticsWorkspaceName string = 'log-analytics-workspace-${uniqueString(resourceGroup().id)}'
+param uniqueSeed string = '${subscription().subscriptionId}-${resourceGroup().name}'
+param uniqueSuffix string = 'coolstore-${uniqueString(uniqueSeed)}'
+
+param environmentName string = 'env-${uniqueSuffix}'
+param appInsightsName string = 'app-insights-${uniqueSuffix}'
+param logAnalyticsWorkspaceName string = 'log-analytics-workspace-${uniqueSuffix}'
+
+param redisName string = 'redis-${uniqueSuffix}'
+param serviceBusNamespaceName string = 'sb-${uniqueSuffix}'
 
 param minReplicas int = 0
 
@@ -37,15 +43,42 @@ param identityAppName string = 'identityapp'
 param identityAppImage string = 'ghcr.io/vietnam-devs/coolstore-microservices/identityapp-v6:0.1.0'
 param identityAppPort int = 80
 
-param inventoryPostgresHost string
-param productCategoryPostgresHost string
-
 @secure()
 param postgresDbPassword string
-//redis
-param redisConnection string
-param redisHost string
-param redisPassword string
+
+module inventoryDb 'modules/postgres.bicep' = {
+  name: '${deployment().name}--inventory-db'
+  params: {
+    location: location
+    databaseName: 'inventory-db-${uniqueSuffix}'
+    postgresDbPassword: postgresDbPassword
+  }
+}
+
+module productCatalogDb 'modules/postgres.bicep' = {
+  name: '${deployment().name}--product-catalog-db'
+  params: {
+    location: location
+    databaseName: 'product--catalogdb-${uniqueSuffix}'
+    postgresDbPassword: postgresDbPassword
+  }
+}
+
+module serviceBusModule 'modules/servicebus.bicep' = {
+  name: '${deployment().name}--servicebus'
+  params: {
+    serviceBusNamespaceName: serviceBusNamespaceName
+    location: location
+  }
+}
+
+module redisModule 'modules/redis.bicep' = {
+  name: '${deployment().name}--redis'
+  params: {
+    redisName: redisName
+    location: location
+  }
+}
 
 // Container Apps Environment
 module environment 'modules/environment.bicep' = {
@@ -58,76 +91,30 @@ module environment 'modules/environment.bicep' = {
   }
 }
 
-// Dapr statestore component
-resource stateDaprComponent 'Microsoft.App/managedEnvironments/daprComponents@2022-01-01-preview' = {
-  name: '${environmentName}/statestore'
+module daprStateStore 'modules/dapr/statestore.bicep' = {
+  name: '${deployment().name}--dapr-statestore'
   dependsOn: [
-    identityApp
-    webApiGatewayApp
     environment
-    inventoryApp
-    productCatalogApp
-    shoppingCartApp
-    saleApp
+    redisModule
   ]
-  properties: {
-    componentType: 'state.redis'
-    version: 'v1'
-    secrets: [
-      {
-        name: 'redis-password'
-        value: redisPassword
-      }
-    ]
-    metadata: [
-      {
-        name: 'redisHost'
-        value: redisHost
-      }
-      {
-        name: 'redisPassword'
-        secretRef: 'redis-password'
-      }
-      {
-        name: 'actorStateStore'
-        value: 'false'
-      }
-    ]
-    scopes: [
-      identityAppName
-      webApiGatewayAppName
-      inventoryAppName
-      productCatalogAppName
-      shoppingCartAppName
-      saleAppName
-    ]
+  params: {
+    environmentName: environmentName
+    redisName: redisName
+    shoppingCartAppName: shoppingCartAppName
   }
 }
 
-// Dapr pubsub component
-resource pubsubDaprComponent 'Microsoft.App/managedEnvironments/daprComponents@2022-01-01-preview' = {
-  name: '${environmentName}/pubsub'
+module daprPubsub 'modules/dapr/pubsub.bicep' = {
+  name: '${deployment().name}--dapr-pubsub'
   dependsOn: [
     environment
-    identityApp
-    webApiGatewayApp
-    environment
-    inventoryApp
-    productCatalogApp
-    shoppingCartApp
-    saleApp
+    serviceBusModule
   ]
-  properties: {
-    componentType: 'pubsub.in-memory'
-    version: 'v1'
-    scopes: [
-      identityAppName
-      webApiGatewayAppName
-      inventoryAppName
-      productCatalogAppName
-      shoppingCartAppName
-      saleAppName
-    ]
+  params: {
+    environmentName: environmentName
+    serviceBusNamespaceName: serviceBusNamespaceName
+    saleAppName: saleAppName
+    shoppingCartAppName: shoppingCartAppName
   }
 }
 
@@ -136,6 +123,7 @@ module inventoryApp 'modules/container-http.bicep' = {
   name: '${deployment().name}--${inventoryAppName}'
   dependsOn: [
     environment
+    inventoryDb
   ]
   params: {
     enableIngress: true
@@ -157,15 +145,15 @@ module inventoryApp 'modules/container-http.bicep' = {
       }
       {
         name: 'PG_HOST'
-        value: inventoryPostgresHost
+        value: inventoryDb.outputs.postgresDbHost
       }
       {
         name: 'PG_PORT'
         value: '5432'
       }
       {
         name: 'PG_USER'
-        value: 'coolstore'
+        value: inventoryDb.outputs.postgresDbUserName
       }
       {
         name: 'PG_PASSWORD'
@@ -193,6 +181,7 @@ module productCatalogApp 'modules/container-http.bicep' = {
   name: '${deployment().name}--${productCatalogAppName}'
   dependsOn: [
     environment
+    productCatalogDb
     inventoryApp
   ]
   params: {
@@ -215,15 +204,15 @@ module productCatalogApp 'modules/container-http.bicep' = {
       }
       {
         name: 'PG_HOST'
-        value: productCategoryPostgresHost
+        value: productCatalogDb.outputs.postgresDbHost
       }
       {
         name: 'PG_PORT'
         value: '5432'
       }
       {
         name: 'PG_USER'
-        value: 'coolstore'
+        value: productCatalogDb.outputs.postgresDbUserName
       }
       {
         name: 'PG_PASSWORD'
@@ -300,11 +289,6 @@ module saleApp 'modules/container-http.bicep' = {
 }
 
 // WebApiGateway App
-// TODO: we need to modify this gateway to add configurations for identityapp and webapp as below
-// az containerapp update `
-//  --name webapigatewayapp `
-//  --resource-group $rgName `
-//  --set-env-vars 'OpenIdConnect__Authority=https://<identityapp output>' 'ReverseProxy__Clusters__appCluster__Destinations__destination1__Address=<webapp output>'
 module webApiGatewayApp 'modules/container-http.bicep' = {
   name: '${deployment().name}--${webApiGatewayAppName}'
   dependsOn: [
@@ -326,7 +310,7 @@ module webApiGatewayApp 'modules/container-http.bicep' = {
     env: [
       {
         name: 'Redis'
-        value: redisConnection
+        value: redisModule.outputs.redisHost
       }
       {
         name: 'ASPNETCORE_ENVIRONMENT'

deploys/bicep/modules/dapr/pubsub.bicep

@@ -0,0 +1,34 @@
+param environmentName string
+param serviceBusNamespaceName string
+
+param shoppingCartAppName string
+param saleAppName string
+
+resource serviceBus 'Microsoft.ServiceBus/namespaces@2021-06-01-preview' existing = {
+  name: serviceBusNamespaceName
+}
+
+// Dapr pubsub component
+resource pubsubDaprComponent 'Microsoft.App/managedEnvironments/daprComponents@2022-01-01-preview' = {
+  name: '${environmentName}/pubsub'
+  properties: {
+    componentType: 'pubsub.azure.servicebus'
+    version: 'v1'
+    metadata: [
+      {
+        name: 'connectionString'
+        secretRef: 'sb-root-connectionstring'
+      }
+    ]
+    secrets: [
+      {
+        name: 'sb-root-connectionstring'
+        value: listKeys('${serviceBus.id}/AuthorizationRules/RootManageSharedAccessKey', serviceBus.apiVersion).primaryConnectionString
+      }
+    ]
+    scopes: [
+      shoppingCartAppName
+      saleAppName
+    ]
+  }
+}

deploys/bicep/modules/dapr/statestore.bicep

@@ -0,0 +1,40 @@
+param environmentName string
+param redisName string
+
+param shoppingCartAppName string
+
+resource redis 'Microsoft.Cache/redis@2020-12-01' existing = {
+  name: redisName
+}
+
+// Dapr statestore component
+resource stateDaprComponent 'Microsoft.App/managedEnvironments/daprComponents@2022-01-01-preview' = {
+  name: '${environmentName}/statestore'
+  properties: {
+    componentType: 'state.redis'
+    version: 'v1'
+    secrets: [
+      {
+        name: 'redis-password'
+        value: listKeys(redis.id, redis.apiVersion).primaryKey
+      }
+    ]
+    metadata: [
+      {
+        name: 'redisHost'
+        value: '${redis.properties.hostName}:${redis.properties.port}'
+      }
+      {
+        name: 'redisPassword'
+        secretRef: 'redis-password'
+      }
+      {
+        name: 'actorStateStore'
+        value: 'false'
+      }
+    ]
+    scopes: [
+      shoppingCartAppName
+    ]
+  }
+}