mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-02 17:31:14 -05:00
Merge pull request #1096 from GSA/jskinne3-upgrade-and-protect-staging-env
Staging: upgrade terraform-cloudgov, use prevent_destroy
This commit is contained in:
@@ -3,27 +3,32 @@ locals {
|
|||||||
cf_space_name = "notify-staging"
|
cf_space_name = "notify-staging"
|
||||||
env = "staging"
|
env = "staging"
|
||||||
app_name = "notify-api"
|
app_name = "notify-api"
|
||||||
recursive_delete = true
|
recursive_delete = true # deprecated, still used in shared
|
||||||
|
}
|
||||||
|
|
||||||
|
resource "null_resource" "prevent_destroy" {
|
||||||
|
|
||||||
|
lifecycle {
|
||||||
|
prevent_destroy = false # destroying staging is allowed
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
module "database" {
|
module "database" {
|
||||||
source = "github.com/18f/terraform-cloudgov//database?ref=v0.7.1"
|
source = "github.com/GSA-TTS/terraform-cloudgov//database?ref=v1.0.0"
|
||||||
|
|
||||||
cf_org_name = local.cf_org_name
|
cf_org_name = local.cf_org_name
|
||||||
cf_space_name = local.cf_space_name
|
cf_space_name = local.cf_space_name
|
||||||
name = "${local.app_name}-rds-${local.env}"
|
name = "${local.app_name}-rds-${local.env}"
|
||||||
recursive_delete = local.recursive_delete
|
rds_plan_name = "micro-psql"
|
||||||
rds_plan_name = "micro-psql"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
module "redis" { # default v6.2; delete after v7.0 resource is bound
|
module "redis" { # default v6.2; delete after v7.0 resource is bound
|
||||||
source = "github.com/18f/terraform-cloudgov//redis?ref=v0.7.1"
|
source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0"
|
||||||
|
|
||||||
cf_org_name = local.cf_org_name
|
cf_org_name = local.cf_org_name
|
||||||
cf_space_name = local.cf_space_name
|
cf_space_name = local.cf_space_name
|
||||||
name = "${local.app_name}-redis-${local.env}"
|
name = "${local.app_name}-redis-${local.env}"
|
||||||
recursive_delete = local.recursive_delete
|
redis_plan_name = "redis-dev"
|
||||||
redis_plan_name = "redis-dev"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
module "redis-v70" {
|
module "redis-v70" {
|
||||||
@@ -41,12 +46,11 @@ module "redis-v70" {
|
|||||||
}
|
}
|
||||||
|
|
||||||
module "csv_upload_bucket" {
|
module "csv_upload_bucket" {
|
||||||
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"
|
source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
|
||||||
|
|
||||||
cf_org_name = local.cf_org_name
|
cf_org_name = local.cf_org_name
|
||||||
cf_space_name = local.cf_space_name
|
cf_space_name = local.cf_space_name
|
||||||
recursive_delete = local.recursive_delete
|
name = "${local.app_name}-csv-upload-bucket-${local.env}"
|
||||||
name = "${local.app_name}-csv-upload-bucket-${local.env}"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
module "egress-space" {
|
module "egress-space" {
|
||||||
@@ -67,7 +71,6 @@ module "ses_email" {
|
|||||||
cf_org_name = local.cf_org_name
|
cf_org_name = local.cf_org_name
|
||||||
cf_space_name = local.cf_space_name
|
cf_space_name = local.cf_space_name
|
||||||
name = "${local.app_name}-ses-${local.env}"
|
name = "${local.app_name}-ses-${local.env}"
|
||||||
recursive_delete = local.recursive_delete
|
|
||||||
aws_region = "us-west-2"
|
aws_region = "us-west-2"
|
||||||
mail_from_subdomain = "mail"
|
mail_from_subdomain = "mail"
|
||||||
email_receipt_error = "notify-support@gsa.gov"
|
email_receipt_error = "notify-support@gsa.gov"
|
||||||
@@ -79,7 +82,6 @@ module "sns_sms" {
|
|||||||
cf_org_name = local.cf_org_name
|
cf_org_name = local.cf_org_name
|
||||||
cf_space_name = local.cf_space_name
|
cf_space_name = local.cf_space_name
|
||||||
name = "${local.app_name}-sns-${local.env}"
|
name = "${local.app_name}-sns-${local.env}"
|
||||||
recursive_delete = local.recursive_delete
|
|
||||||
aws_region = "us-west-2"
|
aws_region = "us-west-2"
|
||||||
monthly_spend_limit = 25
|
monthly_spend_limit = 25
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user