From fbf0f33da737f51cc57b4f8e98a3bd6860641c60 Mon Sep 17 00:00:00 2001 From: John Skiles Skinner Date: Mon, 3 Jun 2024 13:33:11 -0700 Subject: [PATCH 1/2] Upgrade terraform-cloudgov to v1.0.0, remove recursive_delete params --- terraform/sandbox/main.tf | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf index f194efdd4..34f6227d5 100644 --- a/terraform/sandbox/main.tf +++ b/terraform/sandbox/main.tf @@ -3,35 +3,32 @@ locals { cf_space_name = "notify-sandbox" env = "sandbox" app_name = "notify-api" - recursive_delete = true + recursive_delete = true # deprecated, still used in shared modules } module "database" { - source = "github.com/18f/terraform-cloudgov//database?ref=v0.7.1" + source = "github.com/18f/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" } module "redis" { - source = "github.com/18f/terraform-cloudgov//redis?ref=v0.9.1" + source = "github.com/18f/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" } module "csv_upload_bucket" { - source = "github.com/18f/terraform-cloudgov//s3?ref=v0.9.1" + source = "github.com/18f/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}" } From a1a312fce9bcefd03483f7028296bb1e8e17612b Mon Sep 17 00:00:00 2001 From: John Skiles Skinner Date: Mon, 3 Jun 2024 15:01:03 -0700 Subject: [PATCH 2/2] Avoid redirect by updating module path name --- terraform/sandbox/main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf index 34f6227d5..cc99b033b 100644 --- a/terraform/sandbox/main.tf +++ b/terraform/sandbox/main.tf @@ -7,7 +7,7 @@ locals { } module "database" { - source = "github.com/18f/terraform-cloudgov//database?ref=v1.0.0" + 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 @@ -16,7 +16,7 @@ module "database" { } module "redis" { - source = "github.com/18f/terraform-cloudgov//redis?ref=v1.0.0" + 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 @@ -25,7 +25,7 @@ module "redis" { } module "csv_upload_bucket" { - source = "github.com/18f/terraform-cloudgov//s3?ref=v1.0.0" + 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