From 92d417171792158c21d767e58dbde2f16af976fe Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Fri, 8 Mar 2024 11:35:26 -0500 Subject: [PATCH 1/7] We hope this is right. Signed-off-by: Cliff Hill --- terraform/shared/egress_space/main.tf | 1 + terraform/staging/main.tf | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/terraform/shared/egress_space/main.tf b/terraform/shared/egress_space/main.tf index 4b841ad14..a4cdd7311 100644 --- a/terraform/shared/egress_space/main.tf +++ b/terraform/shared/egress_space/main.tf @@ -11,6 +11,7 @@ data "cloudfoundry_org" "org" { ### resource "cloudfoundry_space" "public_egress" { + delete_recursive_allowed = false name = "${var.cf_restricted_space_name}-egress" org = data.cloudfoundry_org.org.id } diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index c46e0d3fa..4d14701ca 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -3,7 +3,6 @@ locals { cf_space_name = "notify-staging" env = "staging" app_name = "notify-api" - recursive_delete = true } module "database" { @@ -12,7 +11,6 @@ module "database" { cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name name = "${local.app_name}-rds-${local.env}" - recursive_delete = local.recursive_delete rds_plan_name = "micro-psql" } @@ -22,7 +20,6 @@ module "redis" { cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name name = "${local.app_name}-redis-${local.env}" - recursive_delete = local.recursive_delete redis_plan_name = "redis-dev" } @@ -31,7 +28,6 @@ module "csv_upload_bucket" { cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name - recursive_delete = local.recursive_delete name = "${local.app_name}-csv-upload-bucket-${local.env}" } @@ -53,7 +49,6 @@ module "ses_email" { cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name name = "${local.app_name}-ses-${local.env}" - recursive_delete = local.recursive_delete aws_region = "us-west-2" mail_from_subdomain = "mail" email_receipt_error = "notify-support@gsa.gov" @@ -65,7 +60,6 @@ module "sns_sms" { cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name name = "${local.app_name}-sns-${local.env}" - recursive_delete = local.recursive_delete aws_region = "us-west-2" monthly_spend_limit = 25 } From ed9896fdcefdd0d76aa79dedccf8e83b85a35342 Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Fri, 8 Mar 2024 11:37:36 -0500 Subject: [PATCH 2/7] Updating the versions for things. Signed-off-by: Cliff Hill --- terraform/shared/egress_space/providers.tf | 2 +- terraform/staging/providers.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/shared/egress_space/providers.tf b/terraform/shared/egress_space/providers.tf index 21ac567a2..01ab1f803 100644 --- a/terraform/shared/egress_space/providers.tf +++ b/terraform/shared/egress_space/providers.tf @@ -3,7 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = "0.53.0" + version = "0.53.1" } } } diff --git a/terraform/staging/providers.tf b/terraform/staging/providers.tf index 11dceea7d..0f09460ef 100644 --- a/terraform/staging/providers.tf +++ b/terraform/staging/providers.tf @@ -3,7 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = "0.53.0" + version = "0.53.1" } } From 23167c5f16796f6b0a2db5502355537f2f0fd8ed Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Fri, 8 Mar 2024 11:47:12 -0500 Subject: [PATCH 3/7] Formatting is annoying. Signed-off-by: Cliff Hill --- terraform/shared/egress_space/main.tf | 4 ++-- terraform/staging/main.tf | 30 +++++++++++++-------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/terraform/shared/egress_space/main.tf b/terraform/shared/egress_space/main.tf index a4cdd7311..5d4b53354 100644 --- a/terraform/shared/egress_space/main.tf +++ b/terraform/shared/egress_space/main.tf @@ -12,8 +12,8 @@ data "cloudfoundry_org" "org" { resource "cloudfoundry_space" "public_egress" { delete_recursive_allowed = false - name = "${var.cf_restricted_space_name}-egress" - org = data.cloudfoundry_org.org.id + name = "${var.cf_restricted_space_name}-egress" + org = data.cloudfoundry_org.org.id } ### diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index 4d14701ca..8cae5a8da 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -1,34 +1,34 @@ locals { - cf_org_name = "gsa-tts-benefits-studio" - cf_space_name = "notify-staging" - env = "staging" - app_name = "notify-api" + cf_org_name = "gsa-tts-benefits-studio" + cf_space_name = "notify-staging" + env = "staging" + app_name = "notify-api" } module "database" { source = "github.com/18f/terraform-cloudgov//database?ref=v0.7.1" - cf_org_name = local.cf_org_name - cf_space_name = local.cf_space_name - name = "${local.app_name}-rds-${local.env}" - rds_plan_name = "micro-psql" + cf_org_name = local.cf_org_name + cf_space_name = local.cf_space_name + name = "${local.app_name}-rds-${local.env}" + rds_plan_name = "micro-psql" } module "redis" { source = "github.com/18f/terraform-cloudgov//redis?ref=v0.7.1" - cf_org_name = local.cf_org_name - cf_space_name = local.cf_space_name - name = "${local.app_name}-redis-${local.env}" - redis_plan_name = "redis-dev" + cf_org_name = local.cf_org_name + cf_space_name = local.cf_space_name + name = "${local.app_name}-redis-${local.env}" + redis_plan_name = "redis-dev" } module "csv_upload_bucket" { source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1" - cf_org_name = local.cf_org_name - cf_space_name = local.cf_space_name - name = "${local.app_name}-csv-upload-bucket-${local.env}" + cf_org_name = local.cf_org_name + cf_space_name = local.cf_space_name + name = "${local.app_name}-csv-upload-bucket-${local.env}" } module "egress-space" { From b46bad8b7772d01f0246074ea31b6da10a2a5315 Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Fri, 8 Mar 2024 11:50:30 -0500 Subject: [PATCH 4/7] Version bumps aren't fun. Signed-off-by: Cliff Hill --- terraform/bootstrap/providers.tf | 2 +- terraform/development/providers.tf | 2 +- terraform/sandbox/providers.tf | 2 +- terraform/shared/ses/providers.tf | 2 +- terraform/shared/sns/providers.tf | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/terraform/bootstrap/providers.tf b/terraform/bootstrap/providers.tf index 5dcaece3e..3c699e728 100644 --- a/terraform/bootstrap/providers.tf +++ b/terraform/bootstrap/providers.tf @@ -3,7 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = "0.53.0" + version = "0.53.1" } } } diff --git a/terraform/development/providers.tf b/terraform/development/providers.tf index 5dcaece3e..3c699e728 100644 --- a/terraform/development/providers.tf +++ b/terraform/development/providers.tf @@ -3,7 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = "0.53.0" + version = "0.53.1" } } } diff --git a/terraform/sandbox/providers.tf b/terraform/sandbox/providers.tf index d5a3313de..590be4e3d 100644 --- a/terraform/sandbox/providers.tf +++ b/terraform/sandbox/providers.tf @@ -3,7 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = "0.53.0" + version = "0.53.1" } } diff --git a/terraform/shared/ses/providers.tf b/terraform/shared/ses/providers.tf index 21ac567a2..01ab1f803 100644 --- a/terraform/shared/ses/providers.tf +++ b/terraform/shared/ses/providers.tf @@ -3,7 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = "0.53.0" + version = "0.53.1" } } } diff --git a/terraform/shared/sns/providers.tf b/terraform/shared/sns/providers.tf index 21ac567a2..01ab1f803 100644 --- a/terraform/shared/sns/providers.tf +++ b/terraform/shared/sns/providers.tf @@ -3,7 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = "0.53.0" + version = "0.53.1" } } } From e843b05e00bb3401f6d44732b02aa965f9c46be1 Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Fri, 8 Mar 2024 12:00:36 -0500 Subject: [PATCH 5/7] Removing all the references! Signed-off-by: Cliff Hill --- terraform/development/main.tf | 2 -- terraform/sandbox/main.tf | 6 ------ terraform/shared/ses/main.tf | 6 +++--- terraform/shared/ses/variables.tf | 6 ------ terraform/shared/sns/main.tf | 6 +++--- terraform/shared/sns/variables.tf | 6 ------ 6 files changed, 6 insertions(+), 26 deletions(-) diff --git a/terraform/development/main.tf b/terraform/development/main.tf index 1f45b2b6a..3bb8ed886 100644 --- a/terraform/development/main.tf +++ b/terraform/development/main.tf @@ -1,7 +1,6 @@ locals { cf_org_name = "gsa-tts-benefits-studio" cf_space_name = "notify-local-dev" - recursive_delete = true key_name = "${var.username}-api-dev-key" } @@ -10,7 +9,6 @@ module "csv_upload_bucket" { cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name - recursive_delete = local.recursive_delete name = "${var.username}-csv-upload-bucket" } resource "cloudfoundry_service_key" "csv_key" { diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf index fae30073c..b60723fe7 100644 --- a/terraform/sandbox/main.tf +++ b/terraform/sandbox/main.tf @@ -3,7 +3,6 @@ locals { cf_space_name = "notify-sandbox" env = "sandbox" app_name = "notify-api" - recursive_delete = true } module "database" { @@ -12,7 +11,6 @@ module "database" { cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name name = "${local.app_name}-rds-${local.env}" - recursive_delete = local.recursive_delete rds_plan_name = "micro-psql" } @@ -22,7 +20,6 @@ module "redis" { cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name name = "${local.app_name}-redis-${local.env}" - recursive_delete = local.recursive_delete redis_plan_name = "redis-dev" } @@ -31,7 +28,6 @@ module "csv_upload_bucket" { cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name - recursive_delete = local.recursive_delete name = "${local.app_name}-csv-upload-bucket-${local.env}" } @@ -53,7 +49,6 @@ module "ses_email" { cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name name = "${local.app_name}-ses-${local.env}" - recursive_delete = local.recursive_delete aws_region = "us-west-2" email_receipt_error = "notify-support@gsa.gov" } @@ -64,7 +59,6 @@ module "sns_sms" { cf_org_name = local.cf_org_name cf_space_name = local.cf_space_name name = "${local.app_name}-sns-${local.env}" - recursive_delete = local.recursive_delete aws_region = "us-east-2" monthly_spend_limit = 1 } diff --git a/terraform/shared/ses/main.tf b/terraform/shared/ses/main.tf index a29a8ce10..3cf0edc73 100644 --- a/terraform/shared/ses/main.tf +++ b/terraform/shared/ses/main.tf @@ -3,8 +3,9 @@ ### data "cloudfoundry_space" "space" { - org_name = var.cf_org_name - name = var.cf_space_name + delete_recursive_allowed = true + org_name = var.cf_org_name + name = var.cf_space_name } ### @@ -19,7 +20,6 @@ resource "cloudfoundry_service_instance" "ses" { name = var.name space = data.cloudfoundry_space.space.id service_plan = data.cloudfoundry_service.ses.service_plans["base"] - recursive_delete = var.recursive_delete json_params = jsonencode({ region = var.aws_region domain = var.email_domain diff --git a/terraform/shared/ses/variables.tf b/terraform/shared/ses/variables.tf index 74e852cf6..a92261656 100644 --- a/terraform/shared/ses/variables.tf +++ b/terraform/shared/ses/variables.tf @@ -13,12 +13,6 @@ variable "name" { description = "name of the service instance" } -variable "recursive_delete" { - type = bool - description = "when true, deletes service bindings attached to the resource (not recommended for production)" - default = false -} - variable "aws_region" { type = string description = "AWS region the SES instance is in" diff --git a/terraform/shared/sns/main.tf b/terraform/shared/sns/main.tf index a23c4e872..b94728524 100644 --- a/terraform/shared/sns/main.tf +++ b/terraform/shared/sns/main.tf @@ -3,8 +3,9 @@ ### data "cloudfoundry_space" "space" { - org_name = var.cf_org_name - name = var.cf_space_name + delete_recursive_allowed = true + org_name = var.cf_org_name + name = var.cf_space_name } ### @@ -19,7 +20,6 @@ resource "cloudfoundry_service_instance" "sns" { name = var.name space = data.cloudfoundry_space.space.id service_plan = data.cloudfoundry_service.sns.service_plans["base"] - recursive_delete = var.recursive_delete json_params = jsonencode({ region = var.aws_region monthly_spend_limit = var.monthly_spend_limit diff --git a/terraform/shared/sns/variables.tf b/terraform/shared/sns/variables.tf index 611050337..acf7c5010 100644 --- a/terraform/shared/sns/variables.tf +++ b/terraform/shared/sns/variables.tf @@ -13,12 +13,6 @@ variable "name" { description = "name of the service instance" } -variable "recursive_delete" { - type = bool - description = "when true, deletes service bindings attached to the resource (not recommended for production)" - default = false -} - variable "aws_region" { type = string description = "AWS region the SNS settings are set in" From 9ce1e4816f587d46c87e5bf965bd0484fd97c8f3 Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Fri, 8 Mar 2024 12:01:06 -0500 Subject: [PATCH 6/7] Terraform formatting Signed-off-by: Cliff Hill --- terraform/development/main.tf | 12 ++++++------ terraform/sandbox/main.tf | 30 +++++++++++++++--------------- terraform/shared/ses/main.tf | 6 +++--- terraform/shared/sns/main.tf | 6 +++--- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/terraform/development/main.tf b/terraform/development/main.tf index 3bb8ed886..4cc26b4d7 100644 --- a/terraform/development/main.tf +++ b/terraform/development/main.tf @@ -1,15 +1,15 @@ locals { - cf_org_name = "gsa-tts-benefits-studio" - cf_space_name = "notify-local-dev" - key_name = "${var.username}-api-dev-key" + cf_org_name = "gsa-tts-benefits-studio" + cf_space_name = "notify-local-dev" + key_name = "${var.username}-api-dev-key" } module "csv_upload_bucket" { source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1" - cf_org_name = local.cf_org_name - cf_space_name = local.cf_space_name - name = "${var.username}-csv-upload-bucket" + cf_org_name = local.cf_org_name + cf_space_name = local.cf_space_name + name = "${var.username}-csv-upload-bucket" } resource "cloudfoundry_service_key" "csv_key" { name = local.key_name diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf index b60723fe7..4c93f8a2c 100644 --- a/terraform/sandbox/main.tf +++ b/terraform/sandbox/main.tf @@ -1,34 +1,34 @@ locals { - cf_org_name = "gsa-tts-benefits-studio" - cf_space_name = "notify-sandbox" - env = "sandbox" - app_name = "notify-api" + cf_org_name = "gsa-tts-benefits-studio" + cf_space_name = "notify-sandbox" + env = "sandbox" + app_name = "notify-api" } module "database" { source = "github.com/18f/terraform-cloudgov//database?ref=v0.7.1" - cf_org_name = local.cf_org_name - cf_space_name = local.cf_space_name - name = "${local.app_name}-rds-${local.env}" - rds_plan_name = "micro-psql" + cf_org_name = local.cf_org_name + cf_space_name = local.cf_space_name + name = "${local.app_name}-rds-${local.env}" + rds_plan_name = "micro-psql" } module "redis" { source = "github.com/18f/terraform-cloudgov//redis?ref=v0.7.1" - cf_org_name = local.cf_org_name - cf_space_name = local.cf_space_name - name = "${local.app_name}-redis-${local.env}" - redis_plan_name = "redis-dev" + cf_org_name = local.cf_org_name + cf_space_name = local.cf_space_name + name = "${local.app_name}-redis-${local.env}" + redis_plan_name = "redis-dev" } module "csv_upload_bucket" { source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1" - cf_org_name = local.cf_org_name - cf_space_name = local.cf_space_name - name = "${local.app_name}-csv-upload-bucket-${local.env}" + cf_org_name = local.cf_org_name + cf_space_name = local.cf_space_name + name = "${local.app_name}-csv-upload-bucket-${local.env}" } module "egress-space" { diff --git a/terraform/shared/ses/main.tf b/terraform/shared/ses/main.tf index 3cf0edc73..e4d63fb53 100644 --- a/terraform/shared/ses/main.tf +++ b/terraform/shared/ses/main.tf @@ -17,9 +17,9 @@ data "cloudfoundry_service" "ses" { } resource "cloudfoundry_service_instance" "ses" { - name = var.name - space = data.cloudfoundry_space.space.id - service_plan = data.cloudfoundry_service.ses.service_plans["base"] + 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 diff --git a/terraform/shared/sns/main.tf b/terraform/shared/sns/main.tf index b94728524..7b99c83af 100644 --- a/terraform/shared/sns/main.tf +++ b/terraform/shared/sns/main.tf @@ -17,9 +17,9 @@ data "cloudfoundry_service" "sns" { } resource "cloudfoundry_service_instance" "sns" { - name = var.name - space = data.cloudfoundry_space.space.id - service_plan = data.cloudfoundry_service.sns.service_plans["base"] + name = var.name + space = data.cloudfoundry_space.space.id + service_plan = data.cloudfoundry_service.sns.service_plans["base"] json_params = jsonencode({ region = var.aws_region monthly_spend_limit = var.monthly_spend_limit From 4d89e6451dc3eff108f1d6834981beabef2e7486 Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Fri, 8 Mar 2024 12:04:03 -0500 Subject: [PATCH 7/7] Reversing the over-engineering. Signed-off-by: Cliff Hill --- terraform/shared/ses/main.tf | 5 ++--- terraform/shared/sns/main.tf | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/terraform/shared/ses/main.tf b/terraform/shared/ses/main.tf index e4d63fb53..4c1bb54b9 100644 --- a/terraform/shared/ses/main.tf +++ b/terraform/shared/ses/main.tf @@ -3,9 +3,8 @@ ### data "cloudfoundry_space" "space" { - delete_recursive_allowed = true - org_name = var.cf_org_name - name = var.cf_space_name + org_name = var.cf_org_name + name = var.cf_space_name } ### diff --git a/terraform/shared/sns/main.tf b/terraform/shared/sns/main.tf index 7b99c83af..aa0079f92 100644 --- a/terraform/shared/sns/main.tf +++ b/terraform/shared/sns/main.tf @@ -3,9 +3,8 @@ ### data "cloudfoundry_space" "space" { - delete_recursive_allowed = true - org_name = var.cf_org_name - name = var.cf_space_name + org_name = var.cf_org_name + name = var.cf_space_name } ###