From f5c2c392a721cee5e49c4140e26e4426abcfc3ae Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 22 Oct 2025 12:18:59 -0700
Subject: [PATCH] set up module.redis-v70 for upgrade

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

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4f04c31c7..97e6935cf 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 plan -destroy -target=module.logo_upload_bucket
+    - 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 plan -destroy -target=module.redis-v70
 
 
     - name: Terraform apply
diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf
index 1652db0b6..8420926db 100644
--- a/terraform/staging/main.tf
+++ b/terraform/staging/main.tf
@@ -12,19 +12,22 @@ resource "null_resource" "prevent_destroy" {
   }
 }
 
-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 "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
@@ -43,16 +46,6 @@ module "logo_upload_bucket" {
 }
 
 
-# This is the old form which used cfcommunity as a provider
-# module "logo_upload_bucket_old" {
-# 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
-# name          = "${local.app_name}-logo-upload-bucket-${local.env}"
-# }
-
-
 module "api_network_route" {
   source = "../shared/container_networking"