Removing all the references!

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>

terraform/development/main.tf

@@ -1,7 +1,6 @@
 locals {
   cf_org_name      = "gsa-tts-benefits-studio"
   cf_space_name    = "notify-local-dev"
-  recursive_delete = true
   key_name         = "${var.username}-api-dev-key"
 }
 
@@ -10,7 +9,6 @@ module "csv_upload_bucket" {
 
   cf_org_name      = local.cf_org_name
   cf_space_name    = local.cf_space_name
-  recursive_delete = local.recursive_delete
   name             = "${var.username}-csv-upload-bucket"
 }
 resource "cloudfoundry_service_key" "csv_key" {

terraform/sandbox/main.tf

@@ -3,7 +3,6 @@ locals {
   cf_space_name    = "notify-sandbox"
   env              = "sandbox"
   app_name         = "notify-api"
-  recursive_delete = true
 }
 
 module "database" {
@@ -12,7 +11,6 @@ module "database" {
   cf_org_name      = local.cf_org_name
   cf_space_name    = local.cf_space_name
   name             = "${local.app_name}-rds-${local.env}"
-  recursive_delete = local.recursive_delete
   rds_plan_name    = "micro-psql"
 }
 
@@ -22,7 +20,6 @@ module "redis" {
   cf_org_name      = local.cf_org_name
   cf_space_name    = local.cf_space_name
   name             = "${local.app_name}-redis-${local.env}"
-  recursive_delete = local.recursive_delete
   redis_plan_name  = "redis-dev"
 }
 
@@ -31,7 +28,6 @@ module "csv_upload_bucket" {
 
   cf_org_name      = local.cf_org_name
   cf_space_name    = local.cf_space_name
-  recursive_delete = local.recursive_delete
   name             = "${local.app_name}-csv-upload-bucket-${local.env}"
 }
 
@@ -53,7 +49,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"
 }
@@ -64,7 +59,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

@@ -3,8 +3,9 @@
 ###
 
 data "cloudfoundry_space" "space" {
-  org_name = var.cf_org_name
-  name     = var.cf_space_name
+  delete_recursive_allowed = true
+  org_name                 = var.cf_org_name
+  name                     = var.cf_space_name
 }
 
 ###
@@ -19,7 +20,6 @@ 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
   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

@@ -3,8 +3,9 @@
 ###
 
 data "cloudfoundry_space" "space" {
-  org_name = var.cf_org_name
-  name     = var.cf_space_name
+  delete_recursive_allowed = true
+  org_name                 = var.cf_org_name
+  name                     = var.cf_space_name
 }
 
 ###
@@ -19,7 +20,6 @@ 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
   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"