darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-15 01:32:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove recursive_delete from SNS & SES shared modules

Browse Source
This commit is contained in:
John Skiles Skinner
2024-06-18 17:26:08 -07:00
parent 833ebfa469
commit 76cc718b32
8 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
terraform/demo/main.tf
View File

@@ -3,7 +3,6 @@ locals {
cf_space_name = "notify-demo" cf_space_name = "notify-demo"
env = "demo" env = "demo"
app_name = "notify-api" app_name = "notify-api"
recursive_delete = false
} }
module "database" { module "database" {
@@ -66,7 +65,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"
email_domain = "notify.sandbox.10x.gsa.gov" email_domain = "notify.sandbox.10x.gsa.gov"
email_receipt_error = "notify-support@gsa.gov" email_receipt_error = "notify-support@gsa.gov"
@@ -78,7 +76,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-east-1" aws_region = "us-east-1"
monthly_spend_limit = 25 monthly_spend_limit = 25
} }

3
terraform/production/main.tf
View File

@@ -3,7 +3,6 @@ locals {
cf_space_name = "notify-production" cf_space_name = "notify-production"
env = "production" env = "production"
app_name = "notify-api" app_name = "notify-api"
recursive_delete = false
} }
module "database" { module "database" {
@@ -51,7 +50,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-gov-west-1" aws_region = "us-gov-west-1"
email_domain = "notify.gov" email_domain = "notify.gov"
mail_from_subdomain = "mail" mail_from_subdomain = "mail"
@@ -64,7 +62,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-gov-west-1" aws_region = "us-gov-west-1"
monthly_spend_limit = 1000 monthly_spend_limit = 1000
} }

3
terraform/sandbox/main.tf
View File

@@ -3,7 +3,6 @@ locals {
cf_space_name = "notify-sandbox" cf_space_name = "notify-sandbox"
env = "sandbox" env = "sandbox"
app_name = "notify-api" app_name = "notify-api"
recursive_delete = true # deprecated, still used in shared modules
} }
resource "null_resource" "prevent_destroy" { resource "null_resource" "prevent_destroy" {
@@ -71,7 +70,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"
email_receipt_error = "notify-support@gsa.gov" email_receipt_error = "notify-support@gsa.gov"
} }
@@ -82,7 +80,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-east-2" aws_region = "us-east-2"
monthly_spend_limit = 1 monthly_spend_limit = 1
} }

1
terraform/shared/ses/main.tf
View File

@@ -19,7 +19,6 @@ resource "cloudfoundry_service_instance" "ses" {
name = var.name name = var.name
space = data.cloudfoundry_space.space.id space = data.cloudfoundry_space.space.id
service_plan = data.cloudfoundry_service.ses.service_plans["base"] service_plan = data.cloudfoundry_service.ses.service_plans["base"]
recursive_delete = var.recursive_delete
json_params = jsonencode({ json_params = jsonencode({
region = var.aws_region region = var.aws_region
domain = var.email_domain domain = var.email_domain

6
terraform/shared/ses/variables.tf
View File

@@ -13,12 +13,6 @@ variable "name" {
description = "name of the service instance" description = "name of the service instance"
} }
variable "recursive_delete" {
type = bool
description = "when true, deletes service bindings attached to the resource (not recommended for production)"
default = false
}
variable "aws_region" { variable "aws_region" {
type = string type = string
description = "AWS region the SES instance is in" description = "AWS region the SES instance is in"

1
terraform/shared/sns/main.tf
View File

@@ -19,7 +19,6 @@ resource "cloudfoundry_service_instance" "sns" {
name = var.name name = var.name
space = data.cloudfoundry_space.space.id space = data.cloudfoundry_space.space.id
service_plan = data.cloudfoundry_service.sns.service_plans["base"] service_plan = data.cloudfoundry_service.sns.service_plans["base"]
recursive_delete = var.recursive_delete
json_params = jsonencode({ json_params = jsonencode({
region = var.aws_region region = var.aws_region
monthly_spend_limit = var.monthly_spend_limit monthly_spend_limit = var.monthly_spend_limit

6
terraform/shared/sns/variables.tf
View File

@@ -13,12 +13,6 @@ variable "name" {
description = "name of the service instance" description = "name of the service instance"
} }
variable "recursive_delete" {
type = bool
description = "when true, deletes service bindings attached to the resource (not recommended for production)"
default = false
}
variable "aws_region" { variable "aws_region" {
type = string type = string
description = "AWS region the SNS settings are set in" description = "AWS region the SNS settings are set in"

3
terraform/staging/main.tf
View File

@@ -3,7 +3,6 @@ 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
} }
module "database" { module "database" {
@@ -53,7 +52,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"
@@ -65,7 +63,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
} }