Merge pull request #342 from NHSDigital/PPHA-641-Get-the-review-app-environment-up-and-running-CICD

PPH-641: Get the review app working with CI/CD

Author: mrlockstar

.github/workflows/stage-5-deploy.yaml

@@ -47,7 +47,7 @@ jobs:
           if [[ -n "$PR_NUMBER" ]]; then
             pr_argument="prNumber=$PR_NUMBER"
           else
-            pr_argument=""
+            pr_argument="$ENVIRONMENT"
           fi
 
           source infrastructure/environments/$ENVIRONMENT/variables.sh

infrastructure/modules/container-apps/data.tf

@@ -1,9 +1,8 @@
 data "azurerm_client_config" "current" {}
 
-# This will be added back in once Groups Reader role is added to the GitHub MI
-# data "azuread_group" "postgres_sql_admin_group" {
-#   display_name = var.postgres_sql_admin_group
-# }
+data "azuread_group" "postgres_sql_admin_group" {
+  display_name = var.postgres_sql_admin_group
+}
 
 data "azurerm_private_dns_zone" "storage" {
   count = var.features.private_networking ? 1 : 0

infrastructure/modules/container-apps/postgres.tf

@@ -20,9 +20,7 @@ module "postgres" {
 
   backup_retention_days           = var.postgres_backup_retention_days
   geo_redundant_backup_enabled    = var.postgres_geo_redundant_backup_enabled
-  # This will be added back in once Groups Reader role is added to the GitHub MI
-  # postgresql_admin_object_id      = data.azuread_group.postgres_sql_admin_group.object_id
-  postgresql_admin_object_id      = "3466794b-ae91-4039-a834-c2d888c78a53"
+  postgresql_admin_object_id      = data.azuread_group.postgres_sql_admin_group.object_id
   postgresql_admin_principal_name = var.postgres_sql_admin_group
   postgresql_admin_principal_type = "Group"
   administrator_login             = local.database_user