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

Merge pull request #1098 from GSA/jskinne3-remove-deprecated-from-shared-module

Browse Source 
Shared: remove deprecated recursive_delete
This commit is contained in:
Carlo Costino
2024-06-25 11:48:52 -04:00
committed by GitHub
parent ec538dacda 1dacb1f29a
commit cac5ef7b34
8 changed files with 23 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
terraform/demo/main.tf
View File

@@ -1,12 +1,10 @@
locals { locals {
cf_org_name = "gsa-tts-benefits-studio" cf_org_name = "gsa-tts-benefits-studio"
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 # deprecated, still used in shared modules
} }
resource "null_resource" "prevent_destroy" { resource "null_resource" "prevent_destroy" {
lifecycle { lifecycle {

9
terraform/production/main.tf
View File

@@ -1,9 +1,8 @@
locals { locals {
cf_org_name = "gsa-tts-benefits-studio" cf_org_name = "gsa-tts-benefits-studio"
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 # deprecated, still used in shared
} }
resource "null_resource" "prevent_destroy" { resource "null_resource" "prevent_destroy" {

13
terraform/sandbox/main.tf
View File

@@ -1,9 +1,8 @@
locals { locals {
cf_org_name = "gsa-tts-benefits-studio" cf_org_name = "gsa-tts-benefits-studio"
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" {
@@ -38,7 +37,7 @@ module "redis-v70" {
cf_space_name = local.cf_space_name cf_space_name = local.cf_space_name
name = "${local.app_name}-redis-v70-${local.env}" name = "${local.app_name}-redis-v70-${local.env}"
redis_plan_name = "redis-dev" redis_plan_name = "redis-dev"
json_params = jsonencode( json_params = jsonencode(
{ {
"engineVersion" : "7.0", "engineVersion" : "7.0",
} }
@@ -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
} }

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

@@ -16,10 +16,9 @@ data "cloudfoundry_service" "ses" {
} }
resource "cloudfoundry_service_instance" "ses" { 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"

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

@@ -16,10 +16,9 @@ data "cloudfoundry_service" "sns" {
} }
resource "cloudfoundry_service_instance" "sns" { 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"

9
terraform/staging/main.tf
View File

@@ -1,9 +1,8 @@
locals { locals {
cf_org_name = "gsa-tts-benefits-studio" cf_org_name = "gsa-tts-benefits-studio"
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 # deprecated, still used in shared
} }
resource "null_resource" "prevent_destroy" { resource "null_resource" "prevent_destroy" {