Health checks & deployment slot

DFE-Digital · Jan 27, 2025 · d7c0242 · d7c0242
1 parent 6afaa8c
commit d7c0242
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 8 deletions.
diff --git a/.github/workflows/deploy-env.yaml b/.github/workflows/deploy-env.yaml
@@ -144,5 +144,6 @@ jobs:
         uses: azure/webapps-deploy@v2
         with:
           app-name: ${{ vars.DEV_AZURE_WEBAPP_NAME }}
+          slot-name: 'staging'
           publish-profile: ${{ env.PUBLISHING_PROFILE }}
           images: 'ghcr.io/${{ env.REPO }}:${{ github.sha }}'
diff --git a/src/infrastructure/terraform/locals.tf b/src/infrastructure/terraform/locals.tf
@@ -9,4 +9,12 @@ locals {
   location       = "westeurope"
   frontdoor_name = "${local.service_prefix}-web-fd"
   frontdoor_url  = "${local.frontdoor_name}.azurefd.net"
+
+  web_app_settings = {
+    "ContentfulOptions__DeliveryApiKey"     = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.contentful-delivery-api-key.versionless_id})"
+    "ContentfulOptions__PreviewApiKey"      = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.contentful-preview-api-key.versionless_id})"
+    "ContentfulOptions__SpaceId"            = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.contentful-space-id.versionless_id})"
+    "BaseUrl"                               = "https://${local.frontdoor_url}"
+    "ApplicationInsights__ConnectionString" = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.application-insights-connection-string.versionless_id})"
+  }
 }
diff --git a/src/infrastructure/terraform/web.tf b/src/infrastructure/terraform/web.tf
@@ -9,11 +9,29 @@ resource "azurerm_service_plan" "web-app-service-plan" {
   name                = "${local.service_prefix}-web-app-service-plan"
   resource_group_name = azurerm_resource_group.web-rg.name
   os_type             = "Linux"
-  sku_name            = "B1"
+  sku_name            = "P0V3"
 
   tags = local.common_tags
 }
 
+resource "azurerm_linux_web_app_slot" "web-app-service-staging" {
+  app_service_id = azurerm_linux_web_app.web-app-service.id
+  name           = "staging"
+
+  site_config {
+    always_on = true
+
+    ip_restriction_default_action = "Deny"
+
+    ip_restriction {
+      name        = "Access from Front Door"
+      service_tag = "AzureFrontDoor.Backend"
+    }
+  }
+
+  app_settings = local.web_app_settings
+}
+
 resource "azurerm_linux_web_app" "web-app-service" {
   service_plan_id                 = azurerm_service_plan.web-app-service-plan.id
   location                        = local.location
@@ -31,6 +49,8 @@ resource "azurerm_linux_web_app" "web-app-service" {
       name        = "Access from Front Door"
       service_tag = "AzureFrontDoor.Backend"
     }
+
+    health_check_path = "health"
   }
 
   identity {
@@ -40,13 +60,7 @@ resource "azurerm_linux_web_app" "web-app-service" {
     ]
   }
 
-  app_settings = {
-    "ContentfulOptions__DeliveryApiKey"     = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.contentful-delivery-api-key.versionless_id})"
-    "ContentfulOptions__PreviewApiKey"      = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.contentful-preview-api-key.versionless_id})"
-    "ContentfulOptions__SpaceId"            = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.contentful-space-id.versionless_id})"
-    "BaseUrl"                               = "https://${local.frontdoor_url}"
-    "ApplicationInsights__ConnectionString" = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.application-insights-connection-string.versionless_id})"
-  }
+  app_settings = local.web_app_settings
 
   tags = local.common_tags
 }

diff --git a/src/web/CareLeavers.Web/Program.cs b/src/web/CareLeavers.Web/Program.cs
@@ -43,6 +43,8 @@
 
     builder.Services.AddContentful(builder.Configuration);
 
+    builder.Services.AddHealthChecks();
+
     builder.Services.AddTransient<HtmlRenderer>((c) =>
     {
         var renderer = new HtmlRenderer(new HtmlRendererOptions
@@ -99,6 +101,8 @@
     app.UseRouting();
 
     app.UseAuthorization();
+
+    app.MapHealthChecks("/health");
 
     app.MapControllerRoute(
         name: "default",