From 1882b4634d4cc0e3cb20af4fd799c72b3bb50e42 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 22 Oct 2025 09:39:28 -0700
Subject: [PATCH 1/2] rebuild module.logo_upload_bucket with cloudfoundry
 provider

---
 terraform/staging/main.tf | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf
index 274be3206..d5ba4ec27 100644
--- a/terraform/staging/main.tf
+++ b/terraform/staging/main.tf
@@ -32,27 +32,15 @@ data "cloudfoundry_space" "space" {
   name     = local.cf_space_name
 }
 
-
-# IF we want to upgrade from cloudfoundry communit to official,
-# we need to do something like what's commented out below
-#
-# We also need to run
-#
-# terraform state replace-provider \
-#   -auto-approve \
-#  -state=terraform.tfstate
-#  'registry.terraform.io/cloudfoundry-community/cloudfoundry' \
-#  'registry.terraform.io/cloudfoundry/cloudfoundry' \
-#  module.logo_upload_bucket (or something like that)
-# module "logo_upload_bucket" {
-# source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
-# Right now the default is cfcommunity, remove this when default is cloudfoundry
-# providers = {
-# cloudfoundry = cloudfoundry.official
-# }
-# cf_space_id = data.cloudfoundry_space.space.id
-# name        = "${local.app_name}-logo-upload-bucket-${local.env}"
-# }
+module "logo_upload_bucket" {
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
+  # Right now the default is cfcommunity, remove this when default is cloudfoundry
+  providers = {
+    cloudfoundry = cloudfoundry.official
+  }
+  cf_space_id = data.cloudfoundry_space.space.id
+  name        = "${local.app_name}-logo-upload-bucket-${local.env}"
+}
 
 
 module "logo_upload_bucket" {

From 46b63353a74c75e6d3aecaea8c2498bc3b0667f3 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 22 Oct 2025 10:44:27 -0700
Subject: [PATCH 2/2] build the new moduule.logo_upload_bucket

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

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 1e1416785..4f04c31c7 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.logo_upload_bucket
 
 
     - name: Terraform apply
diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf
index d5ba4ec27..4394b2dec 100644
--- a/terraform/staging/main.tf
+++ b/terraform/staging/main.tf
@@ -43,15 +43,6 @@ module "logo_upload_bucket" {
 }
 
 
-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}"
-}
-
-
 module "api_network_route" {
   source = "../shared/container_networking"