From be000ba9596cb979596d7135fcea8da91f6b4687 Mon Sep 17 00:00:00 2001 From: John Skiles Skinner Date: Tue, 18 Jun 2024 16:42:12 -0700 Subject: [PATCH 1/3] Upgrade terraform-cloudgov, remove recursive_delete, add prevent_destroy --- terraform/staging/main.tf | 42 ++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index c46e0d3fa..c73273785 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -3,36 +3,40 @@ locals { cf_space_name = "notify-staging" env = "staging" app_name = "notify-api" - recursive_delete = true + recursive_delete = true # deprecated, still used in shared +} + +resource "null_resource" "prevent_destroy" { + + lifecycle { + prevent_destroy = true + } } module "database" { - source = "github.com/18f/terraform-cloudgov//database?ref=v0.7.1" + source = "github.com/GSA-TTS/terraform-cloudgov//database?ref=v1.0.0" - 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" + 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" + source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0" - 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" + 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" + source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0" - 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}" + 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" { @@ -53,7 +57,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 +68,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 c57bdc2eba13aa99eb0a863b1608b2e046922b46 Mon Sep 17 00:00:00 2001 From: John Skiles Skinner Date: Tue, 18 Jun 2024 16:55:48 -0700 Subject: [PATCH 2/3] Make value of prevent_destroy match recursive_delete --- 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 c73273785..39eb4b540 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -9,7 +9,7 @@ locals { resource "null_resource" "prevent_destroy" { lifecycle { - prevent_destroy = true + prevent_destroy = false # destrying staging is allowed } } From d84a199170f840e3dc64f6e7ae7230e7d3c214d0 Mon Sep 17 00:00:00 2001 From: John Skiles Skinner Date: Tue, 18 Jun 2024 16:56:44 -0700 Subject: [PATCH 3/3] Typo --- 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 39eb4b540..79d90d323 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -9,7 +9,7 @@ locals { resource "null_resource" "prevent_destroy" { lifecycle { - prevent_destroy = false # destrying staging is allowed + prevent_destroy = false # destroying staging is allowed } }