From 19e6959963daaaba8b162a80112fe7e7b0b43b70 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 22 Oct 2025 09:35:30 -0700
Subject: [PATCH 1/3] destroy module.logo_upload_bucket

---
 .github/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 1e1416785..2d224ee88 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -38,7 +38,7 @@ jobs:
       run: terraform init
 
 
-    - name: Terraform see if we can destroy a specific module
+    - name: Destroy (one-time) module.logo_upload_bucket then comment out
       working-directory: terraform/staging
       env:
         AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
@@ -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.logo_upload_bucket
+        terraform destroy -target=module.logo_upload_bucket
 
 
     - name: Terraform apply

From f2a9666cf3e187acd36a25377eca74041b063055 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 22 Oct 2025 09:58:18 -0700
Subject: [PATCH 2/3] destroy module.logo_upload_bucket

---
 .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 2d224ee88..b532a8889 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 destroy -target=module.logo_upload_bucket
+        terraform destroy -target=module.logo_upload_bucket -auto-approve
 
 
     - name: Terraform apply

From e2e17780c71a8dbdadfaeca51c1e55f071648f29 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 22 Oct 2025 10:20:27 -0700
Subject: [PATCH 3/3] comment out module.logo_upload_bucket so it doesnt get
 recreated

---
 terraform/staging/main.tf | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf
index 274be3206..b49319425 100644
--- a/terraform/staging/main.tf
+++ b/terraform/staging/main.tf
@@ -55,13 +55,14 @@ data "cloudfoundry_space" "space" {
 # }
 
 
-module "logo_upload_bucket" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
+# This is the old form which used cfcommunity as a provider
+# module "logo_upload_bucket" {
+# 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}"
-}
+# 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" {