From e3e44f68b119d879063a5155b11954407009c79c Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Fri, 24 Oct 2025 08:00:46 -0700 Subject: [PATCH 1/9] rebuild module.ses_email --- terraform/staging/main.tf | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index e44c357cb..7fb2a54f8 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -64,18 +64,18 @@ module "egress-space" { ] } -# module "ses_email" { -# source = "../shared/ses" -# providers = { -# cloudfoundry = cloudfoundry.official -# } -# cf_space_id = data.cloudfoundry_space.space.id +module "ses_email" { + source = "../shared/ses" + providers = { + cloudfoundry = cloudfoundry.official + } + cf_space_id = data.cloudfoundry_space.space.id -# name = "${local.app_name}-ses-${local.env}" -# aws_region = "us-west-2" -# mail_from_subdomain = "mail" -# email_receipt_error = "notify-support@gsa.gov" -# } + name = "${local.app_name}-ses-${local.env}" + aws_region = "us-west-2" + mail_from_subdomain = "mail" + email_receipt_error = "notify-support@gsa.gov" +} # module "ses_email_old" { # source = "../shared/ses" From 08f8104f76f9a8f150a2b8d469242ef30c6603c3 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Fri, 24 Oct 2025 08:12:33 -0700 Subject: [PATCH 2/9] rebuild module.ses_email --- terraform/shared/ses/providers.tf | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/terraform/shared/ses/providers.tf b/terraform/shared/ses/providers.tf index dec8379ee..803f07042 100644 --- a/terraform/shared/ses/providers.tf +++ b/terraform/shared/ses/providers.tf @@ -2,8 +2,28 @@ terraform { required_version = "~> 1.7" required_providers { cloudfoundry = { + source = "cloudfoundry/cloudfoundry" + version = "1.9.0" + } + cfcommunity = { source = "cloudfoundry-community/cloudfoundry" version = "0.53.1" } } } + +# Official provider (should be default but aliased for now) +provider "cloudfoundry" { + alias = "official" + api_url = "https://api.fr.cloud.gov" + user = var.cf_user + password = var.cf_password +} + +# Community provider (should be aliased but default for now) +provider "cfcommunity" { + api_url = "https://api.fr.cloud.gov" + user = var.cf_user + password = var.cf_password + app_logs_max = 30 +} From cfb645c5adb0b1c1bab46ae8aec00685a4805a45 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Fri, 24 Oct 2025 08:28:26 -0700 Subject: [PATCH 3/9] rebuild module.ses_email --- terraform/shared/ses/main.tf | 14 ++++++++++++++ terraform/staging/main.tf | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/terraform/shared/ses/main.tf b/terraform/shared/ses/main.tf index 4c1bb54b9..98e8c2f8c 100644 --- a/terraform/shared/ses/main.tf +++ b/terraform/shared/ses/main.tf @@ -27,3 +27,17 @@ resource "cloudfoundry_service_instance" "ses" { enable_feedback_notifications = true }) } + +resource "cloudfoundry_service_instance" "ses_official" { + provider = cloudfoundry.official + name = var.name + space = data.cloudfoundry_space.space.id + service_plan = data.cloudfoundry_service.ses.service_plans["base"] + json_params = jsonencode({ + region = var.aws_region + domain = var.email_domain + mail_from_subdomain = var.mail_from_subdomain + email_receipt_error = var.email_receipt_error + enable_feedback_notifications = true + }) +} diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index 7fb2a54f8..8ef3040db 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -65,7 +65,7 @@ module "egress-space" { } module "ses_email" { - source = "../shared/ses" + source = "../shared/ses_official" providers = { cloudfoundry = cloudfoundry.official } From 45792708304bb36d6a7216b66b9ff49b3657dad4 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Fri, 24 Oct 2025 08:37:04 -0700 Subject: [PATCH 4/9] rebuild module.ses_email --- terraform/shared/ses/main.tf | 26 +++++++++++++------------- terraform/staging/main.tf | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/terraform/shared/ses/main.tf b/terraform/shared/ses/main.tf index 98e8c2f8c..42adbe1d4 100644 --- a/terraform/shared/ses/main.tf +++ b/terraform/shared/ses/main.tf @@ -15,20 +15,20 @@ data "cloudfoundry_service" "ses" { name = "datagov-smtp" } -resource "cloudfoundry_service_instance" "ses" { - name = var.name - space = data.cloudfoundry_space.space.id - service_plan = data.cloudfoundry_service.ses.service_plans["base"] - json_params = jsonencode({ - region = var.aws_region - domain = var.email_domain - mail_from_subdomain = var.mail_from_subdomain - email_receipt_error = var.email_receipt_error - enable_feedback_notifications = true - }) -} +# resource "cloudfoundry_service_instance" "ses_community" { +# name = var.name +# space = data.cloudfoundry_space.space.id +# service_plan = data.cloudfoundry_service.ses.service_plans["base"] +# json_params = jsonencode({ +# region = var.aws_region +# domain = var.email_domain +# mail_from_subdomain = var.mail_from_subdomain +# email_receipt_error = var.email_receipt_error +# enable_feedback_notifications = true +# }) +#} -resource "cloudfoundry_service_instance" "ses_official" { +resource "cloudfoundry_service_instance" "ses" { provider = cloudfoundry.official name = var.name space = data.cloudfoundry_space.space.id diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index 8ef3040db..7fb2a54f8 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -65,7 +65,7 @@ module "egress-space" { } module "ses_email" { - source = "../shared/ses_official" + source = "../shared/ses" providers = { cloudfoundry = cloudfoundry.official } From c88c25d1677baa13f978abd3692514a3710bb154 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Fri, 24 Oct 2025 08:57:09 -0700 Subject: [PATCH 5/9] rebuild module.ses_email --- terraform/shared/ses/main.tf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/terraform/shared/ses/main.tf b/terraform/shared/ses/main.tf index 42adbe1d4..1bd3c4a9c 100644 --- a/terraform/shared/ses/main.tf +++ b/terraform/shared/ses/main.tf @@ -29,7 +29,9 @@ data "cloudfoundry_service" "ses" { #} resource "cloudfoundry_service_instance" "ses" { - provider = cloudfoundry.official + providers = { + cloudfoundry = cloudfoundry.official + } name = var.name space = data.cloudfoundry_space.space.id service_plan = data.cloudfoundry_service.ses.service_plans["base"] From 10810732939241e76d7033041f08728d75cfa6c9 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Fri, 24 Oct 2025 09:17:24 -0700 Subject: [PATCH 6/9] revert --- terraform/shared/ses/main.tf | 16 ---------------- terraform/staging/main.tf | 17 ++--------------- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/terraform/shared/ses/main.tf b/terraform/shared/ses/main.tf index 1bd3c4a9c..4c1bb54b9 100644 --- a/terraform/shared/ses/main.tf +++ b/terraform/shared/ses/main.tf @@ -15,23 +15,7 @@ data "cloudfoundry_service" "ses" { name = "datagov-smtp" } -# resource "cloudfoundry_service_instance" "ses_community" { -# name = var.name -# space = data.cloudfoundry_space.space.id -# service_plan = data.cloudfoundry_service.ses.service_plans["base"] -# json_params = jsonencode({ -# region = var.aws_region -# domain = var.email_domain -# mail_from_subdomain = var.mail_from_subdomain -# email_receipt_error = var.email_receipt_error -# enable_feedback_notifications = true -# }) -#} - resource "cloudfoundry_service_instance" "ses" { - providers = { - cloudfoundry = cloudfoundry.official - } name = var.name space = data.cloudfoundry_space.space.id service_plan = data.cloudfoundry_service.ses.service_plans["base"] diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index 7fb2a54f8..77189085a 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -66,28 +66,15 @@ module "egress-space" { module "ses_email" { source = "../shared/ses" - providers = { - cloudfoundry = cloudfoundry.official - } - cf_space_id = data.cloudfoundry_space.space.id + cf_org_name = local.cf_org_name + cf_space_name = local.cf_space_name name = "${local.app_name}-ses-${local.env}" aws_region = "us-west-2" mail_from_subdomain = "mail" email_receipt_error = "notify-support@gsa.gov" } -# module "ses_email_old" { -# source = "../shared/ses" - -# cf_org_name = local.cf_org_name -# cf_space_name = local.cf_space_name -# name = "${local.app_name}-ses-${local.env}" -# aws_region = "us-west-2" -# mail_from_subdomain = "mail" -# email_receipt_error = "notify-support@gsa.gov" -# } - module "sns_sms" { source = "../shared/sns" From 96a584a124fdbf9cf575295103c870e7acb5e4eb Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Fri, 24 Oct 2025 09:24:08 -0700 Subject: [PATCH 7/9] revert --- terraform/shared/ses/providers.tf | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/terraform/shared/ses/providers.tf b/terraform/shared/ses/providers.tf index 803f07042..77d2a2fdb 100644 --- a/terraform/shared/ses/providers.tf +++ b/terraform/shared/ses/providers.tf @@ -1,10 +1,7 @@ terraform { required_version = "~> 1.7" required_providers { - cloudfoundry = { - source = "cloudfoundry/cloudfoundry" - version = "1.9.0" - } + cfcommunity = { source = "cloudfoundry-community/cloudfoundry" version = "0.53.1" @@ -12,13 +9,6 @@ terraform { } } -# Official provider (should be default but aliased for now) -provider "cloudfoundry" { - alias = "official" - api_url = "https://api.fr.cloud.gov" - user = var.cf_user - password = var.cf_password -} # Community provider (should be aliased but default for now) provider "cfcommunity" { From f447f2b962e77f0a5d9db3761e0a79c6ecc6146e Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Fri, 24 Oct 2025 09:29:20 -0700 Subject: [PATCH 8/9] revert --- terraform/shared/ses/providers.tf | 12 +----------- terraform/staging/main.tf | 1 - 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/terraform/shared/ses/providers.tf b/terraform/shared/ses/providers.tf index 77d2a2fdb..dec8379ee 100644 --- a/terraform/shared/ses/providers.tf +++ b/terraform/shared/ses/providers.tf @@ -1,19 +1,9 @@ terraform { required_version = "~> 1.7" required_providers { - - cfcommunity = { + cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" version = "0.53.1" } } } - - -# Community provider (should be aliased but default for now) -provider "cfcommunity" { - api_url = "https://api.fr.cloud.gov" - user = var.cf_user - password = var.cf_password - app_logs_max = 30 -} diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index 77189085a..47b554de5 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -66,7 +66,6 @@ module "egress-space" { module "ses_email" { source = "../shared/ses" - cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name name = "${local.app_name}-ses-${local.env}" From 287c051234feb492f8836f0512682604e6a3b50d Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Fri, 24 Oct 2025 09:30:12 -0700 Subject: [PATCH 9/9] revert --- terraform/staging/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index 47b554de5..bf6b87c8e 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -65,7 +65,7 @@ module "egress-space" { } module "ses_email" { - source = "../shared/ses" + source = "../shared/ses" cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name name = "${local.app_name}-ses-${local.env}"