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

Shared: remove deprecated recursive_delete

terraform/demo/main.tf

@@ -1,12 +1,10 @@
 locals {
-  cf_org_name      = "gsa-tts-benefits-studio"
-  cf_space_name    = "notify-demo"
-  env              = "demo"
-  app_name         = "notify-api"
-  recursive_delete = false # deprecated, still used in shared modules
+  cf_org_name   = "gsa-tts-benefits-studio"
+  cf_space_name = "notify-demo"
+  env           = "demo"
+  app_name      = "notify-api"
 }
 
-
 resource "null_resource" "prevent_destroy" {
 
   lifecycle {

terraform/production/main.tf

@@ -1,9 +1,8 @@
 locals {
-  cf_org_name      = "gsa-tts-benefits-studio"
-  cf_space_name    = "notify-production"
-  env              = "production"
-  app_name         = "notify-api"
-  recursive_delete = false # deprecated, still used in shared
+  cf_org_name   = "gsa-tts-benefits-studio"
+  cf_space_name = "notify-production"
+  env           = "production"
+  app_name      = "notify-api"
 }
 
 resource "null_resource" "prevent_destroy" {

terraform/sandbox/main.tf

@@ -1,9 +1,8 @@
 locals {
-  cf_org_name      = "gsa-tts-benefits-studio"
-  cf_space_name    = "notify-sandbox"
-  env              = "sandbox"
-  app_name         = "notify-api"
-  recursive_delete = true # deprecated, still used in shared modules
+  cf_org_name   = "gsa-tts-benefits-studio"
+  cf_space_name = "notify-sandbox"
+  env           = "sandbox"
+  app_name      = "notify-api"
 }
 
 resource "null_resource" "prevent_destroy" {
@@ -38,7 +37,7 @@ module "redis-v70" {
   cf_space_name   = local.cf_space_name
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-dev"
-  json_params      = jsonencode(
+  json_params = jsonencode(
     {
       "engineVersion" : "7.0",
     }
@@ -71,7 +70,6 @@ module "ses_email" {
   cf_org_name         = local.cf_org_name
   cf_space_name       = local.cf_space_name
   name                = "${local.app_name}-ses-${local.env}"
-  recursive_delete    = local.recursive_delete
   aws_region          = "us-west-2"
   email_receipt_error = "notify-support@gsa.gov"
 }
@@ -82,7 +80,6 @@ module "sns_sms" {
   cf_org_name         = local.cf_org_name
   cf_space_name       = local.cf_space_name
   name                = "${local.app_name}-sns-${local.env}"
-  recursive_delete    = local.recursive_delete
   aws_region          = "us-east-2"
   monthly_spend_limit = 1
 }

terraform/shared/ses/main.tf

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

terraform/shared/ses/variables.tf

@@ -13,12 +13,6 @@ variable "name" {
   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" {
   type        = string
   description = "AWS region the SES instance is in"

terraform/shared/sns/main.tf

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

terraform/shared/sns/variables.tf

@@ -13,12 +13,6 @@ variable "name" {
   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" {
   type        = string
   description = "AWS region the SNS settings are set in"

terraform/staging/main.tf

@@ -1,9 +1,8 @@
 locals {
-  cf_org_name      = "gsa-tts-benefits-studio"
-  cf_space_name    = "notify-staging"
-  env              = "staging"
-  app_name         = "notify-api"
-  recursive_delete = true # deprecated, still used in shared
+  cf_org_name   = "gsa-tts-benefits-studio"
+  cf_space_name = "notify-staging"
+  env           = "staging"
+  app_name      = "notify-api"
 }
 
 resource "null_resource" "prevent_destroy" {