Merge branch 'main' into jskinne3-upgrade-and-protect-demo-modules

terraform/demo/main.tf

@@ -23,7 +23,7 @@ module "database" {
   rds_plan_name = "micro-psql"
 }
 
-module "redis" {
+module "redis" { # default v6.2; delete after v7.0 resource is bound
   source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0"
 
   cf_org_name     = local.cf_org_name
@@ -32,6 +32,20 @@ module "redis" {
   redis_plan_name = "redis-dev"
 }
 
+module "redis-v70" {
+  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-v70-${local.env}"
+  redis_plan_name = "redis-dev"
+  json_params = jsonencode(
+    {
+      "engineVersion" : "7.0",
+    }
+  )
+}
+
 module "csv_upload_bucket" {
   source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
 

terraform/sandbox/main.tf

@@ -6,6 +6,13 @@ locals {
   recursive_delete = true # deprecated, still used in shared modules
 }
 
+resource "null_resource" "prevent_destroy" {
+
+  lifecycle {
+    prevent_destroy = false
+  }
+}
+
 module "database" {
   source = "github.com/GSA-TTS/terraform-cloudgov//database?ref=v1.0.0"
 
@@ -15,7 +22,7 @@ module "database" {
   rds_plan_name = "micro-psql"
 }
 
-module "redis" {
+module "redis" { # default v6.2; delete after v7.0 resource is bound
   source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0"
 
   cf_org_name     = local.cf_org_name
@@ -24,6 +31,20 @@ module "redis" {
   redis_plan_name = "redis-dev"
 }
 
+module "redis-v70" {
+  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-v70-${local.env}"
+  redis_plan_name = "redis-dev"
+  json_params      = jsonencode(
+    {
+      "engineVersion" : "7.0",
+    }
+  )
+}
+
 module "csv_upload_bucket" {
   source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"