feat: make custom domain conditional on main

Author: johnnyreilly

.github/workflows/shared-build-and-deploy.yaml

@@ -1,4 +1,4 @@
-name: Build and deploy
+name: Shared build and deploy
 
 on:
   workflow_call:
@@ -108,6 +108,9 @@ jobs:
             webServiceImage="${{ needs.build.outputs.image-name }}:sha-${{ needs.build.outputs.sha-short }}"
             echo "webServiceImage=$webServiceImage"
 
+            webServiceContainerAppName='${{ env.BRANCH_NAME }}-web'
+            echo "webServiceContainerAppName=$webServiceContainerAppName"
+
             TAGS='{"owner":"johnnyreilly", "email":"johnny_reilly@hotmail.com"}'
             az deployment group create \
               --resource-group ${{ env.RESOURCE_GROUP }} \
@@ -118,10 +121,11 @@ jobs:
                   containerRegistry=${{ env.REGISTRY }} \
                   containerRegistryUsername=${{ github.actor }} \
                   containerRegistryPassword=${{ secrets.PACKAGES_TOKEN }} \
+                  branchName='${{ env.BRANCH_NAME }}' \
                   workspaceName='shared-log-analytics' \
                   appInsightsName='shared-app-insights' \
                   managedEnvironmentName='shared-env' \
-                  webServiceContainerAppName='${{ env.BRANCH_NAME }}-web' \
+                  webServiceContainerAppName="$webServiceContainerAppName" \
                   tags="$TAGS" \
                   APPSETTINGS_API_KEY="${{ secrets.APPSETTINGS_API_KEY }}" \
                   APPSETTINGS_DOMAIN="${{ vars.APPSETTINGS_DOMAIN }}" \
@@ -130,7 +134,7 @@ jobs:
 
             CONTAINER_APP_URL=$(az containerapp show \
               --resource-group '${{ env.RESOURCE_GROUP }}' \
-              --name '${{ env.BRANCH_NAME }}-web' \
+              --name "$webServiceContainerAppName" \
               --query properties.configuration.ingress.fqdn \
               --output tsv)
 

infra/main.bicep

@@ -5,6 +5,8 @@ param containerRegistryUsername string
 @secure()
 param containerRegistryPassword string
 
+param branchName string
+
 param workspaceName string
 param appInsightsName string
 param managedEnvironmentName string
@@ -96,19 +98,21 @@ resource webServiceContainerApp 'Microsoft.App/containerApps@2024-03-01' = {
       ingress: {
         external: true
         targetPort: 3000
-        customDomains: [
-          // {
-          //     name: 'poorclaresarundel.org'
-          //     certificateId: '/subscriptions/subscription-id/resourceGroups/rg-poor-clares-arundel-aca/providers/Microsoft.App/managedEnvironments/shared-env/certificates/poorclaresarundel.org'
-          //     bindingType: 'SniEnabled'
-          // }
+        customDomains: branchName == 'main'
+          ? [
+              // {
+              //     name: 'poorclaresarundel.org'
+              //     certificateId: '/subscriptions/subscription-id/resourceGroups/rg-poor-clares-arundel-aca/providers/Microsoft.App/managedEnvironments/shared-env/certificates/poorclaresarundel.org'
+              //     bindingType: 'SniEnabled'
+              // }
 
-          {
-            name: 'www.poorclaresarundel.org'
-            certificateId: '${managedEnvironment.id}/certificates/poorclaresarundel.org'
-            bindingType: 'SniEnabled'
-          }
-        ]
+              {
+                name: 'www.poorclaresarundel.org'
+                certificateId: '${managedEnvironment.id}/certificates/poorclaresarundel.org'
+                bindingType: 'SniEnabled'
+              }
+            ]
+          : []
       }
     }
     template: {