From 2fa1d5b444e3bf5abc6a3de7f6f9d8bb3456d88e Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 22 Oct 2025 13:08:55 -0700
Subject: [PATCH 1/3] actually destroy module.redis-v70 on staging

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 97e6935cf..4e8d9b113 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -46,7 +46,7 @@ jobs:
         TF_VAR_cf_user: ${{ secrets.CLOUDGOV_USERNAME }}
         TF_VAR_cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
       run: |
-        terraform plan -destroy -target=module.redis-v70
+        terraform destroy -target=module.redis-v70 -auto-approve
 
 
     - name: Terraform apply

From ab842ac9471c0952484f14871f5fb606a51908db Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 22 Oct 2025 13:20:47 -0700
Subject: [PATCH 2/3] recreate redis-v70 with the new terraform provider

---
 .github/workflows/deploy.yml | 18 +++++++++---------
 terraform/staging/main.tf    | 32 ++++++++++++++++----------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4e8d9b113..2f292f369 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -38,15 +38,15 @@ jobs:
       run: terraform init
 
 
-    - name: Terraform see if we can destroy a specific module
-      working-directory: terraform/staging
-      env:
-        AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }}
-        TF_VAR_cf_user: ${{ secrets.CLOUDGOV_USERNAME }}
-        TF_VAR_cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
-      run: |
-        terraform destroy -target=module.redis-v70 -auto-approve
+    # - name: Terraform see if we can destroy a specific module
+    #   working-directory: terraform/staging
+    #   env:
+    #     AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
+    #     AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }}
+    #     TF_VAR_cf_user: ${{ secrets.CLOUDGOV_USERNAME }}
+    #     TF_VAR_cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
+    #   run: |
+    #     terraform destroy -target=module.redis-v70 -auto-approve
 
 
     - name: Terraform apply
diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf
index 8420926db..dfefbce2d 100644
--- a/terraform/staging/main.tf
+++ b/terraform/staging/main.tf
@@ -12,22 +12,22 @@ resource "null_resource" "prevent_destroy" {
   }
 }
 
-# module "redis-v70" {
-# source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
-# Right now the default is cfcommunity, remove this when default is cloudfoundry
-# providers = {
-# cloudfoundry = cloudfoundry.official
-# }
-# org             = data.cloudfoundry_space.space.org
-# cf_space_id     = data.cloudfoundry_space.space.id
-# name            = "${local.app_name}-redis-v70-${local.env}"
-# redis_plan_name = "redis-dev"
-# json_params = jsonencode(
-# {
-# "engineVersion" : "7.0",
-# }
-# )
-# }
+module "redis-v70" {
+  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
+  # Right now the default is cfcommunity, remove this when default is cloudfoundry
+  providers = {
+    cloudfoundry = cloudfoundry.official
+  }
+  org             = data.cloudfoundry_space.space.org
+  cf_space_id     = data.cloudfoundry_space.space.id
+  name            = "${local.app_name}-redis-v70-${local.env}"
+  redis_plan_name = "redis-dev"
+  json_params = jsonencode(
+    {
+      "engineVersion" : "7.0",
+    }
+  )
+}
 
 data "cloudfoundry_space" "space" {
   provider = cloudfoundry.official

From 834a6c2ae5581b66ef7fb62deca6b01b46a09acd Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 22 Oct 2025 13:25:18 -0700
Subject: [PATCH 3/3] recreate redis-v70 with the new terraform provider

---
 terraform/staging/main.tf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf
index dfefbce2d..744a07df3 100644
--- a/terraform/staging/main.tf
+++ b/terraform/staging/main.tf
@@ -18,7 +18,6 @@ module "redis-v70" {
   providers = {
     cloudfoundry = cloudfoundry.official
   }
-  org             = data.cloudfoundry_space.space.org
   cf_space_id     = data.cloudfoundry_space.space.id
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-dev"