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

Merge pull request #2057 from GSA/terraform_upgrade1

Browse Source 
migrate module.ses_email to new provider
This commit is contained in:
Kenneth Kehl
2025-10-24 07:59:28 -07:00
committed by GitHub
parent a907a63a97 43beeae5c6
commit bb6438f29b
3 changed files with 23 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,34 +37,6 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }}
run: terraform init
# Some excitement for later. When we have a module we cannot just delete
# (db, csv_bucket) we need to modify the state in the tfstate file.
#
# Once both providers are defined in the providers.tf, the order of operations should be
#
# 1. Uncomment this command and let it run as part of CI/CD. This alters the state,
# but the module will be temporarily unusable
# 2. Go back to main.tf and update the module syntax and parameters for the new provider
# 3. Go through the CI/CD again, at this point it should work.
#
# - name: Terraform change provider
# 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 state pull | jq '
# .resources |= map(select(.module == "module.csv_upload_bucket"))
# ' > module-csv_upload_bucket.tfstate
# terraform state replace-provider \
# -state=module-csv_upload_bucket.tfstate \
# 'registry.terraform.io/cloudfoundry-community/cloudfoundry' \
# 'registry.terraform.io/cloudfoundry/cloudfoundry'
# terraform state push module-csv_upload_bucket.tfstate
- name: Terraform apply
working-directory: terraform/staging
env:

1
.github/workflows/terraform-staging.yml vendored
View File

@@ -41,6 +41,7 @@ jobs:
id: validation
run: terraform validate -no-color
- name: Terraform plan
id: plan
env:

40
terraform/staging/main.tf
View File

@@ -53,15 +53,6 @@ module "csv_upload_bucket" {
name = "${local.app_name}-csv-upload-bucket-${local.env}"
}
# module "csv_upload_bucket_new" {
# source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
# providers = {
# cloudfoundry = cloudfoundry.official
# }
# cf_space_id = data.cloudfoundry_space.space.id
# name = "${local.app_name}-csv-upload-bucket-${local.env}"
# }
module "egress-space" {
source = "../shared/egress_space"
@@ -73,16 +64,29 @@ module "egress-space" {
]
}
module "ses_email" {
source = "../shared/ses"
# module "ses_email" {
# source = "../shared/ses"
# providers = {
# cloudfoundry = cloudfoundry.official
# }
# cf_space_id = data.cloudfoundry_space.space.id
cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name
name = "${local.app_name}-ses-${local.env}"
aws_region = "us-west-2"
mail_from_subdomain = "mail"
email_receipt_error = "notify-support@gsa.gov"
}
# name = "${local.app_name}-ses-${local.env}"
# aws_region = "us-west-2"
# mail_from_subdomain = "mail"
# email_receipt_error = "notify-support@gsa.gov"
# }
# module "ses_email_old" {
# source = "../shared/ses"
# cf_org_name = local.cf_org_name
# cf_space_name = local.cf_space_name
# name = "${local.app_name}-ses-${local.env}"
# aws_region = "us-west-2"
# mail_from_subdomain = "mail"
# email_receipt_error = "notify-support@gsa.gov"
# }
module "sns_sms" {
source = "../shared/sns"