Merge pull request #361 from NHSDigital/fix-possible-db-container-bug-3

Fix container app port clashing

Author: mrlockstar

infrastructure/modules/container-apps/postgres.tf

@@ -97,5 +97,7 @@ module "database_container" {
   infra_key_vault_name             = "kv-${var.app_short_name}-${var.env_config}-inf"
   infra_key_vault_rg               = "rg-${var.app_short_name}-${var.env_config}-infra"
   is_tcp_app                       = true
-  port                             = 5432
+  # postgres has a port of 5432
+  port         = 5432
+  exposed_port = local.database_port
 }

infrastructure/modules/container-apps/variables.tf

@@ -136,6 +136,8 @@ locals {
 
   database_user = "admin"
   database_name = "manage_breast_screening"
+  # Here we expect the environment to be in format pr-XXX. For example PR 1234 would have environment pr-1234 and port 2234
+  database_port = var.deploy_database_as_container ? tonumber(regex("\\d+", var.environment)) + 1000 : 5432
 
   common_env = {
     SSL_MODE         = "require"
@@ -147,6 +149,7 @@ locals {
     DATABASE_HOST = var.deploy_database_as_container ? module.database_container[0].container_app_fqdn : null
     DATABASE_NAME = local.database_name
     DATABASE_USER = local.database_user
+    DATABASE_PORT = local.database_port
   }
 
   azure_db_env = {

manage_breast_screening/config/settings.py

@@ -147,7 +147,7 @@ def boolean_env(key, default=None):
         "USER": environ.get("DATABASE_USER", ""),
         "PASSWORD": environ.get("DATABASE_PASSWORD", ""),
         "HOST": environ.get("DATABASE_HOST", ""),
-        "PORT": "5432",
+        "PORT": environ.get("DATABASE_PORT", "5432"),
         "OPTIONS": {"sslmode": environ.get("DATABASE_SSLMODE", "prefer")},
     }
 }