Merge pull request Azure#72 from Azure/tj/fix/bicep-ports

Parameterize ports and sendgrid integration setting

Author: waelkdouh

bicep/main.bicep

@@ -66,27 +66,27 @@ param externalTasksQueueName string
 @description('The name of the external blob container in Azure Storage.')
 param externalTasksContainerBlobName string
 
-@description('The name of the secret containing the External Azure Storage Access key for the Backend Background Processor Service.')
+@description('The name of the secret containing the External Azure Storage Access key for the backend processor service.')
 param externalStorageKeySecretName string 
 
-//Send grid
-@description('The name of the secret containing the SendGrid API key value for the Backend Background Processor Service.')
-param sendGridKeySecretName string
+//SendGrid
+@description('The name of the secret containing the SendGrid API key value for the backend processor service.')
+param sendGridKeySecretName string = 'sendgrid-api-key'
 
-@description('The name of the Send Grid Email From.')
+@description('The name of the SendGrid Email From.')
 param sendGridEmailFrom string
 
-@description('The name of the Send Grid Email From Name.')
+@description('The name of the SendGrid Email From Name.')
 param sendGridEmailFromName string
 
+@secure()
+@description('The SendGrid API key for the backend processor service. If not provided, SendGrid integration will be disabled.')
+param sendGridKeySecretValue string
+
 //Cron Shedule Jon
 @description('The cron settings for scheduled job.')
 param scheduledJobCron string
 
-@secure()
-@description('The SendGrid API key for for Backend Background Processor Service.')
-param sendGridKeySecretValue string
-
 // Dapr components
 @description('The name of Dapr component for the secret store building block.')
 // We disable lint of this line as it is not a secret but the name of the Dapr component
@@ -109,6 +109,16 @@ param backendApiServiceImage string
 @description('The image for the frontend web app service.')
 param frontendWebAppServiceImage string
 
+// App Ports
+@description('The target and dapr port for the frontend web app service.')
+param frontendWebAppPortNumber int = 80
+
+@description('The target and dapr port for the backend api service.')
+param backendApiPortNumber int = 80
+
+@description('The dapr port for the backend processor service.')
+param backendProcessorPortNumber int = 80
+
 // ------------------
 // RESOURCES
 // ------------------
@@ -217,6 +227,9 @@ module containerApps 'modules/container-apps.bicep' = {
     applicationInsightsName: containerAppsEnvironment.outputs.applicationInsightsName
     externalStorageAccountName: externalStorageAccount.outputs.storageAccountName
     externalStorageKeySecretName: externalStorageKeySecretName
+    frontendWebAppPortNumber: frontendWebAppPortNumber
+    backendApiPortNumber: backendApiPortNumber
+    backendProcessorPortNumber: backendProcessorPortNumber
   }
   dependsOn: [
     daprComponents

bicep/main.parameters.json

@@ -32,11 +32,8 @@
     "cosmosDbCollectionName": {
       "value": "taskscollection"
     },
-    "sendGridKeySecretName": {
-      "value": "sendgrid-api-key"
-    },
     "sendGridKeySecretValue": {
-      "value": "<SEND_GRID_API_KEY>"
+      "value": ""
     },
     "sendGridEmailFrom": {
       "value": "<SEND_GRID_FROM_EMAIL>"
@@ -70,6 +67,15 @@
     },
     "frontendWebAppServiceImage": {
       "value": "<CONTAINER_REGISTRY_NAME>.azurecr.io/tasksmanager/tasksmanager-frontend-webapp:latest"
+    },
+    "frontendWebAppPortNumber": {
+      "value": 80
+    },
+    "backendApiPortNumber": {
+      "value": 80
+    },
+    "backendProcessorPortNumber": {
+      "value": 80
     }
   }
 }

bicep/modules/container-apps-environment.bicep

@@ -18,10 +18,6 @@ param logAnalyticsWorkspaceName string
 @description(' The name of the application insights. If set, it overrides the name generated by the template.')
 param applicationInsightName string 
 
-// ------------------
-// VARIABLES
-// ------------------
-
 
 // ------------------
 // RESOURCES

bicep/modules/container-apps.bicep

@@ -77,8 +77,21 @@ param frontendWebAppServiceImage string
 @description('The name of the application insights.')
 param applicationInsightsName string
 
-var containerRegistryPullRoleGuid='7f951dda-4ed3-4680-a7ca-43fe172d538d'
+// App Ports
+@description('The target and dapr port for the frontend web app service.')
+param frontendWebAppPortNumber int
+
+@description('The target and dapr port for the backend api service.')
+param backendApiPortNumber int
 
+@description('The dapr port for the backend processor service.')
+param backendProcessorPortNumber int
+
+// ------------------
+// VARIABLES
+// ------------------
+
+var containerRegistryPullRoleGuid='7f951dda-4ed3-4680-a7ca-43fe172d538d'
 
 // ------------------
 // RESOURCES
@@ -124,6 +137,7 @@ module frontendWebAppService 'container-apps/webapp-frontend-service.bicep' = {
     containerRegistryUserAssignedIdentityId: containerRegistryUserAssignedIdentity.id
     frontendWebAppServiceImage: frontendWebAppServiceImage
     appInsightsInstrumentationKey: applicationInsights.properties.InstrumentationKey
+    frontendWebAppPortNumber: frontendWebAppPortNumber
 
   }
 }
@@ -144,6 +158,7 @@ module backendApiService 'container-apps/webapi-backend-service.bicep' = {
     cosmosDbDatabaseName: cosmosDbDatabaseName
     cosmosDbCollectionName: cosmosDbCollectionName
     appInsightsInstrumentationKey: applicationInsights.properties.InstrumentationKey
+    backendApiPortNumber: backendApiPortNumber
   }
 }
 
@@ -166,6 +181,7 @@ module backendProcessorService 'container-apps/processor-backend-service.bicep'
     externalStorageKeySecretName:externalStorageKeySecretName
     backendProcessorServiceImage: backendProcessorServiceImage
     appInsightsInstrumentationKey: applicationInsights.properties.InstrumentationKey
+    backendProcessorPortNumber: backendProcessorPortNumber
   }
 }
 

bicep/modules/container-apps/processor-backend-service.bicep

@@ -60,6 +60,9 @@ param containerRegistryUserAssignedIdentityId string
 @description('The image for the backend processor service.')
 param backendProcessorServiceImage string
 
+@description('The dapr port for the backend processor service.')
+param backendProcessorPortNumber int
+
 
 // ------------------
 // VARIABLES
@@ -111,7 +114,7 @@ resource backendProcessorService 'Microsoft.App/containerApps@2022-06-01-preview
         enabled: true
         appId: backendProcessorServiceName
         appProtocol: 'http'
-        appPort: 80
+        appPort: backendProcessorPortNumber
         logLevel: 'info'
         enableApiLogging: true
       }
@@ -144,7 +147,7 @@ resource backendProcessorService 'Microsoft.App/containerApps@2022-06-01-preview
           env: [
             {
               name: 'SendGrid__IntegrationEnabled'
-              value: 'true'
+              value: empty(sendGridKeySecretValue) ? 'false' : 'true'
             }
             {
               name: 'ApplicationInsights__InstrumentationKey'

bicep/modules/container-apps/webapi-backend-service.bicep

@@ -47,6 +47,9 @@ param backendApiServiceImage string
 @description('The Application Insights Instrumentation.')
 param appInsightsInstrumentationKey string
 
+@description('The target and dapr port for the backend api service.')
+param backendApiPortNumber int
+
 // ------------------
 // RESOURCES
 // ------------------
@@ -90,13 +93,13 @@ resource backendApiService 'Microsoft.App/containerApps@2022-06-01-preview' = {
       activeRevisionsMode: 'single'
       ingress: {
         external: false
-        targetPort: 80
+        targetPort: backendApiPortNumber
       }
       dapr: {
         enabled: true
         appId: backendApiServiceName
         appProtocol: 'http'
-        appPort: 80
+        appPort: backendApiPortNumber
         logLevel: 'info'
         enableApiLogging: true
       }

bicep/modules/container-apps/webapp-frontend-service.bicep

@@ -30,6 +30,9 @@ param frontendWebAppServiceImage string
 @description('The Application Insights Instrumentation.')
 param appInsightsInstrumentationKey string
 
+@description('The target and dapr port for the frontend web app service.')
+param frontendWebAppPortNumber int
+
 // ------------------
 // RESOURCES
 // ------------------
@@ -50,13 +53,13 @@ resource frontendWebAppService 'Microsoft.App/containerApps@2022-06-01-preview'
       activeRevisionsMode: 'single'
       ingress: {
         external: true
-        targetPort: 80
+        targetPort: frontendWebAppPortNumber
       }
       dapr: {
         enabled: true
         appId: frontendWebAppServiceName
         appProtocol: 'http'
-        appPort: 80
+        appPort: frontendWebAppPortNumber
         logLevel: 'info'
         enableApiLogging: true
       }