app: Update template-infra:app to version 0.15.0.post3.dev0+cb15833

navapbc · Jan 15, 2025 · 33d4f36 · 33d4f36
1 parent 523e7b9
commit 33d4f36
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/.template-infra/app-app.yml b/.template-infra/app-app.yml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: v0.15.0-2-gfb1e6e6
+_commit: v0.15.0-3-gcb15833
 _src_path: ../template-infra
 app_has_dev_env_setup: true
 app_local_port: 3000

diff --git a/infra/app/service/identity_provider.tf b/infra/app/service/identity_provider.tf
@@ -22,7 +22,7 @@ module "identity_provider" {
   temporary_password_validity_days = local.identity_provider_config.password_policy.temporary_password_validity_days
   verification_email_message       = local.identity_provider_config.verification_email.verification_email_message
   verification_email_subject       = local.identity_provider_config.verification_email.verification_email_subject
-  domain_name                      = local.network_config.domain_config.hosted_zone
+  domain_name                      = local.domain_name
   domain_identity_arn              = local.notifications_config == null ? null : local.domain_identity_arn
   sender_email                     = local.notifications_config == null ? null : local.notifications_config.sender_email
   sender_display_name              = local.notifications_config == null ? null : local.notifications_config.sender_display_name

diff --git a/infra/app/service/main.tf b/infra/app/service/main.tf
@@ -50,7 +50,9 @@ locals {
 
   network_config = module.project_config.network_configs[local.environment_config.network_name]
 
-  service_name = "${local.prefix}${local.service_config.service_name}"
+  service_name   = "${local.prefix}${local.service_config.service_name}"
+  domain_name    = local.service_config.domain_name
+  hosted_zone_id = local.domain_name != null ? data.aws_route53_zone.zone[0].zone_id : null
 }
 
 terraform {
@@ -119,11 +121,11 @@ data "aws_security_groups" "aws_services" {
 
 data "aws_acm_certificate" "certificate" {
   count  = local.service_config.enable_https ? 1 : 0
-  domain = local.service_config.domain_name
+  domain = local.domain_name
 }
 
 data "aws_route53_zone" "zone" {
-  count = local.service_config.domain_name != null ? 1 : 0
+  count = local.domain_name != null ? 1 : 0
   name  = local.network_config.domain_config.hosted_zone
 }
 
@@ -140,8 +142,8 @@ module "service" {
   public_subnet_ids  = data.aws_subnets.public.ids
   private_subnet_ids = data.aws_subnets.private.ids
 
-  domain_name     = local.service_config.domain_name
-  hosted_zone_id  = local.service_config.domain_name != null ? data.aws_route53_zone.zone[0].zone_id : null
+  domain_name     = local.domain_name
+  hosted_zone_id  = local.hosted_zone_id
   certificate_arn = local.service_config.enable_https ? data.aws_acm_certificate.certificate[0].arn : null
 
   cpu                      = local.service_config.cpu

diff --git a/infra/app/service/notifications.tf b/infra/app/service/notifications.tf
@@ -18,7 +18,8 @@ module "notifications_email_domain" {
   count  = local.notifications_config != null && !local.is_temporary ? 1 : 0
   source = "../../modules/notifications-email-domain/resources"
 
-  domain_name = local.network_config.domain_config.hosted_zone
+  domain_name    = local.domain_name
+  hosted_zone_id = local.hosted_zone_id
 }
 
 # If the app has `enable_notifications` set to true AND this *is* a temporary
@@ -27,7 +28,7 @@ module "existing_notifications_email_domain" {
   count  = local.notifications_config != null && local.is_temporary ? 1 : 0
   source = "../../modules/notifications-email-domain/data"
 
-  domain_name = local.network_config.domain_config.hosted_zone
+  domain_name = local.domain_name
 }
 
 # If the app has `enable_notifications` set to true, create a new email notification