darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-05-27 09:29:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3038 from GSA/terraform_upgrade6

Browse Source 
rebuild module.logo_upload_bucket with cloudfoundry provider
This commit is contained in:
ccostino
2025-10-22 14:27:12 -04:00
committed by GitHub
parent 0d949ca69c 818264cdea
commit e885542bf3
2 changed files with 19 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/deploy.yml vendored
View File

@@ -38,15 +38,15 @@ jobs:
run: terraform init
- 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 }}
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.logo_upload_bucket -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 plan -destroy -target=module.logo_upload_bucket
- name: Terraform apply

32
terraform/staging/main.tf
View File

@@ -32,31 +32,19 @@ 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}"
}
# This is the old form which used cfcommunity as a provider
# module "logo_upload_bucket" {
# module "logo_upload_bucket_old" {
# source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
# cf_org_name = local.cf_org_name