feat: add productionRevisionName parameter and update traffic management logic for API and UI

MarcelMichau · MarcelMichau · commit de9ddab1f027 · 2026-02-20T16:47:11.000+02:00
diff --git a/.azdo/pipelines/azure-dev.yml b/.azdo/pipelines/azure-dev.yml
@@ -38,10 +38,6 @@ variables:
   azureResourceGroup: rg-fake-survey-generator
   azureResourceManagerConnection: "Azure Service Connection"
   azureLocation: "South Africa North"
-  apiActiveLabel: "blue"
-  apiPromotePreview: "false"
-  uiActiveLabel: "blue"
-  uiPromotePreview: "false"
   NUGET_PACKAGES: $(Pipeline.Workspace)/.nuget/packages
 
 stages:
@@ -258,6 +254,82 @@ stages:
               AZURE_LOCATION: $(azureLocation)
               AZURE_RESOURCE_GROUP: $(azureResourceGroup)
 
+          - task: AzureCLI@2
+            displayName: Resolve Active/Preview Labels + Production Revisions
+            inputs:
+              azureSubscription: $(azureResourceManagerConnection)
+              scriptType: bash
+              scriptLocation: inlineScript
+              inlineScript: |
+                set -euo pipefail
+
+                API_APP_NAME=$(azd env get-values | sed -n 's/^SERVICE_API_NAME="\(.*\)"/\1/p')
+                UI_APP_NAME=$(azd env get-values | sed -n 's/^SERVICE_UI_NAME="\(.*\)"/\1/p')
+
+                API_ACTIVE_LABEL="blue"
+                UI_ACTIVE_LABEL="blue"
+                API_PREVIEW_LABEL="green"
+                UI_PREVIEW_LABEL="green"
+                API_REVISION=""
+                UI_REVISION=""
+
+                if [[ -n "${API_APP_NAME}" ]]; then
+                  API_ACTIVE_LABEL=$(az containerapp ingress traffic show \
+                    --resource-group "${AZURE_RESOURCE_GROUP}" \
+                    --name "${API_APP_NAME}" \
+                    --query "[?weight==\`100\` && label!=null].label | [0]" \
+                    -o tsv 2>/dev/null || true)
+
+                  if [[ -z "${API_ACTIVE_LABEL}" ]]; then
+                    API_ACTIVE_LABEL="blue"
+                  fi
+
+                  API_PREVIEW_LABEL=$([[ "${API_ACTIVE_LABEL}" == "blue" ]] && echo "green" || echo "blue")
+
+                  API_REVISION=$(az containerapp ingress traffic show \
+                    --resource-group "${AZURE_RESOURCE_GROUP}" \
+                    --name "${API_APP_NAME}" \
+                    --query "[?label=='${API_ACTIVE_LABEL}'].revisionName | [0]" \
+                    -o tsv 2>/dev/null || true)
+                fi
+
+                if [[ -n "${UI_APP_NAME}" ]]; then
+                  UI_ACTIVE_LABEL=$(az containerapp ingress traffic show \
+                    --resource-group "${AZURE_RESOURCE_GROUP}" \
+                    --name "${UI_APP_NAME}" \
+                    --query "[?weight==\`100\` && label!=null].label | [0]" \
+                    -o tsv 2>/dev/null || true)
+
+                  if [[ -z "${UI_ACTIVE_LABEL}" ]]; then
+                    UI_ACTIVE_LABEL="blue"
+                  fi
+
+                  UI_PREVIEW_LABEL=$([[ "${UI_ACTIVE_LABEL}" == "blue" ]] && echo "green" || echo "blue")
+
+                  UI_REVISION=$(az containerapp ingress traffic show \
+                    --resource-group "${AZURE_RESOURCE_GROUP}" \
+                    --name "${UI_APP_NAME}" \
+                    --query "[?label=='${UI_ACTIVE_LABEL}'].revisionName | [0]" \
+                    -o tsv 2>/dev/null || true)
+                fi
+
+                echo "Resolved API labels: active=${API_ACTIVE_LABEL}, preview=${API_PREVIEW_LABEL}"
+                echo "Resolved UI labels: active=${UI_ACTIVE_LABEL}, preview=${UI_PREVIEW_LABEL}"
+                echo "Resolved API production revision: ${API_REVISION:-<none>}"
+                echo "Resolved UI production revision: ${UI_REVISION:-<none>}"
+
+                echo "##vso[task.setvariable variable=apiActiveLabel]${API_ACTIVE_LABEL}"
+                echo "##vso[task.setvariable variable=uiActiveLabel]${UI_ACTIVE_LABEL}"
+                echo "##vso[task.setvariable variable=apiPreviewLabel]${API_PREVIEW_LABEL}"
+                echo "##vso[task.setvariable variable=uiPreviewLabel]${UI_PREVIEW_LABEL}"
+                echo "##vso[task.setvariable variable=apiProductionRevisionName]${API_REVISION}"
+                echo "##vso[task.setvariable variable=uiProductionRevisionName]${UI_REVISION}"
+            env:
+              AZURE_SUBSCRIPTION_ID: $(azureSubscriptionId)
+              AZURE_ENV_NAME: $(azureEnvName)
+              AZURE_LOCATION: $(azureLocation)
+              AZURE_RESOURCE_GROUP: $(azureResourceGroup)
+
           - task: AzureCLI@2
             displayName: Deploy Application (Preview)
             inputs:
@@ -275,8 +347,10 @@ stages:
               API_VERSION: $(apiSemVerVersionTag)
               UI_ACTIVE_LABEL: $(uiActiveLabel)
               UI_PROMOTE_PREVIEW: "false"
+              UI_PRODUCTION_REVISION_NAME: $(uiProductionRevisionName)
               API_ACTIVE_LABEL: $(apiActiveLabel)
               API_PROMOTE_PREVIEW: "false"
+              API_PRODUCTION_REVISION_NAME: $(apiProductionRevisionName)
               VITE_APP_VERSION: $(uiSemVerVersionTag)
 
           - task: AzureCLI@2
@@ -296,11 +370,14 @@ stages:
                   exit 1
                 fi
 
-                API_HOST=$(az containerapp show --resource-group "${AZURE_RESOURCE_GROUP}" --name "${API_APP_NAME}" --query properties.latestRevisionFqdn -o tsv)
-                UI_HOST=$(az containerapp show --resource-group "${AZURE_RESOURCE_GROUP}" --name "${UI_APP_NAME}" --query properties.latestRevisionFqdn -o tsv)
+                API_FQDN=$(az containerapp show --resource-group "${AZURE_RESOURCE_GROUP}" --name "${API_APP_NAME}" --query properties.configuration.ingress.fqdn -o tsv)
+                UI_FQDN=$(az containerapp show --resource-group "${AZURE_RESOURCE_GROUP}" --name "${UI_APP_NAME}" --query properties.configuration.ingress.fqdn -o tsv)
+
+                API_DOMAIN="${API_FQDN#${API_APP_NAME}.}"
+                UI_DOMAIN="${UI_FQDN#${UI_APP_NAME}.}"
 
-                API_URL="https://${API_HOST}/health/ready"
-                UI_URL="https://${UI_HOST}"
+                API_URL="https://${API_APP_NAME}---${API_PREVIEW_LABEL}.${API_DOMAIN}/health/ready"
+                UI_URL="https://${UI_APP_NAME}---${UI_PREVIEW_LABEL}.${UI_DOMAIN}"
 
                 echo "Validating API URL: ${API_URL}"
                 echo "Validating UI URL: ${UI_URL}"
@@ -325,6 +402,8 @@ stages:
               AZURE_ENV_NAME: $(azureEnvName)
               AZURE_LOCATION: $(azureLocation)
               AZURE_RESOURCE_GROUP: $(azureResourceGroup)
+              API_PREVIEW_LABEL: $(apiPreviewLabel)
+              UI_PREVIEW_LABEL: $(uiPreviewLabel)
 
           - task: AzureCLI@2
             displayName: Promote Preview to Production Label
@@ -343,8 +422,10 @@ stages:
               API_VERSION: $(apiSemVerVersionTag)
               UI_ACTIVE_LABEL: $(uiActiveLabel)
               UI_PROMOTE_PREVIEW: "true"
+              UI_PRODUCTION_REVISION_NAME: ""
               API_ACTIVE_LABEL: $(apiActiveLabel)
               API_PROMOTE_PREVIEW: "true"
+              API_PRODUCTION_REVISION_NAME: ""
               VITE_APP_VERSION: $(uiSemVerVersionTag)
 
   - stage: Database_Deployment
diff --git a/infra/api.bicep b/infra/api.bicep
@@ -15,6 +15,7 @@ param version string
 ])
 param activeLabel string = 'blue'
 param promotePreview bool = false
+param productionRevisionName string = ''
 
 resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2025-01-31-preview' existing = {
   name: managedIdentityName
@@ -39,6 +40,8 @@ resource applicationInsights 'Microsoft.Insights/components@2020-02-02' existing
 
 var previewLabel = activeLabel == 'blue' ? 'green' : 'blue'
 var productionLabel = promotePreview ? previewLabel : activeLabel
+var targetLabel = promotePreview ? productionLabel : previewLabel
+var useLatestForProductionTraffic = promotePreview || empty(productionRevisionName)
 
 var apiEnvironmentVariables = [
   {
@@ -83,7 +86,7 @@ resource containerApp 'Microsoft.App/containerApps@2025-10-02-preview' = {
     managedEnvironmentId: containerAppEnvironmentId
     configuration: {
       activeRevisionsMode: 'Labels'
-      targetLabel: productionLabel
+      targetLabel: targetLabel
       maxInactiveRevisions: 5
       registries: [
         {
@@ -101,10 +104,17 @@ resource containerApp 'Microsoft.App/containerApps@2025-10-02-preview' = {
             latestRevision: true
             weight: 0
           }
-          {
-            label: productionLabel
-            weight: 100
-          }
+          useLatestForProductionTraffic
+            ? {
+                label: productionLabel
+                latestRevision: true
+                weight: 100
+              }
+            : {
+                label: productionLabel
+                revisionName: productionRevisionName
+                weight: 100
+              }
         ]
       }
       dapr: {
diff --git a/infra/api.bicepparam b/infra/api.bicepparam
@@ -12,3 +12,4 @@ param applicationInsightsName = readEnvironmentVariable('AZURE_APPLICATION_INSIG
 param version = readEnvironmentVariable('API_VERSION', 'latest')
 param activeLabel = readEnvironmentVariable('API_ACTIVE_LABEL', 'blue')
 param promotePreview = toLower(readEnvironmentVariable('API_PROMOTE_PREVIEW', 'false')) == 'true'
+param productionRevisionName = readEnvironmentVariable('API_PRODUCTION_REVISION_NAME', '')
diff --git a/infra/ui.bicep b/infra/ui.bicep
@@ -11,13 +11,16 @@ param version string
 ])
 param activeLabel string = 'blue'
 param promotePreview bool = false
+param productionRevisionName string = ''
 
 resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2025-01-31-preview' existing = {
   name: managedIdentityName
 }
 
 var previewLabel = activeLabel == 'blue' ? 'green' : 'blue'
 var productionLabel = promotePreview ? previewLabel : activeLabel
+var targetLabel = promotePreview ? productionLabel : previewLabel
+var useLatestForProductionTraffic = promotePreview || empty(productionRevisionName)
 
 resource containerApp 'Microsoft.App/containerApps@2025-10-02-preview' = {
   name: containerAppName
@@ -35,7 +38,7 @@ resource containerApp 'Microsoft.App/containerApps@2025-10-02-preview' = {
     managedEnvironmentId: containerAppEnvironmentId
     configuration: {
       activeRevisionsMode: 'Labels'
-      targetLabel: productionLabel
+      targetLabel: targetLabel
       maxInactiveRevisions: 5
       registries: [
         {
@@ -53,10 +56,17 @@ resource containerApp 'Microsoft.App/containerApps@2025-10-02-preview' = {
             latestRevision: true
             weight: 0
           }
-          {
-            label: productionLabel
-            weight: 100
-          }
+          useLatestForProductionTraffic
+            ? {
+                label: productionLabel
+                latestRevision: true
+                weight: 100
+              }
+            : {
+                label: productionLabel
+                revisionName: productionRevisionName
+                weight: 100
+              }
         ]
       }
     }
diff --git a/infra/ui.bicepparam b/infra/ui.bicepparam
@@ -8,3 +8,4 @@ param managedIdentityName = readEnvironmentVariable('SERVICE_UI_IDENTITY_NAME',
 param version = readEnvironmentVariable('UI_VERSION', 'latest')
 param activeLabel = readEnvironmentVariable('UI_ACTIVE_LABEL', 'blue')
 param promotePreview = toLower(readEnvironmentVariable('UI_PROMOTE_PREVIEW', 'false')) == 'true'
+param productionRevisionName = readEnvironmentVariable('UI_PRODUCTION_REVISION_NAME', '')
