Merge branch 'main' into bugfix/dp-1097-exclusions-not-showing

cabinetoffice · Jan 23, 2025 · 87bb066 · 87bb066
2 parents 1a3dfd6 + 2349187
commit 87bb066
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/terragrunt/components/service/tools/terragrunt.hcl b/terragrunt/components/service/tools/terragrunt.hcl
@@ -35,10 +35,12 @@ dependency core_iam {
 dependency core_networking {
   config_path = "../../core/networking"
   mock_outputs = {
-    private_subnet_ids    = "mock"
-    public_domain         = "mock"
-    public_hosted_zone_id = "mock"
-    vpc_id                = "mock"
+    production_private_beta_hosted_zone_id = "mock"
+    production_private_beta_domain         = "mock"
+    private_subnet_ids                     = "mock"
+    public_domain                          = "mock"
+    public_hosted_zone_id                  = "mock"
+    vpc_id                                 = "mock"
   }
 }
 
@@ -123,8 +125,8 @@ inputs = {
   role_terraform_arn      = dependency.core_iam.outputs.terraform_arn
 
   private_subnet_ids    = dependency.core_networking.outputs.private_subnet_ids
-  public_domain         = dependency.core_networking.outputs.public_domain
-  public_hosted_zone_id = dependency.core_networking.outputs.public_hosted_zone_id
+  public_domain         = local.global_vars.locals.is_production ? dependency.core_networking.outputs.production_private_beta_domain : dependency.core_networking.outputs.public_domain                 # @todo (ABN) DP-1069 Remove condition once domain is propagated
+  public_hosted_zone_id = local.global_vars.locals.is_production ? dependency.core_networking.outputs.production_private_beta_hosted_zone_id : dependency.core_networking.outputs.public_hosted_zone_id # @todo (ABN) DP-1069 Remove condition once domain is propagated
   vpc_id                = dependency.core_networking.outputs.vpc_id
 
   db_postgres_sg_id = dependency.core_security_groups.outputs.db_postgres_sg_id

diff --git a/terragrunt/tools/pgadmin/configs/custom-entrypoint.sh b/terragrunt/tools/pgadmin/configs/custom-entrypoint.sh
@@ -68,9 +68,9 @@ configure_servers_json() {
 
     id=10
     for username in $(echo "$SUPPORT_USERNAMES" | tr ',' ' '); do
-      add_server_to_json "$id" "$username@cdp-sirsi" "Production Support" "$DB_SIRSI_ADDRESS" 5432 "$DB_SIRSI_NAME" "$username"
+      add_server_to_json "$id" "$username@cdp-sirsi" "Production Support" "$DB_SIRSI_CLUSTER_ADDRESS" 5432 "$DB_SIRSI_CLUSTER_NAME" "$username"
       id=$((id + 1))
-      add_server_to_json "$id" "$username@cdp-entity-verification" "Production Support" "$DB_ENTITY_VERIFICATION_ADDRESS" 5432 "$DB_ENTITY_VERIFICATION_NAME" "$username"
+      add_server_to_json "$id" "$username@cdp-entity-verification" "Production Support" "$DB_ENTITY_VERIFICATION_CLUSTER_ADDRESS" 5432 "$DB_ENTITY_VERIFICATION_CLUSTER_NAME" "$username"
       id=$((id + 1))
     done
   fi