Merge pull request #891 from GSA/revert-recent-terraform

Revert recent Terraform changes to prod and demo

terraform/demo/main.tf

@@ -3,17 +3,7 @@ locals {
   cf_space_name    = "notify-demo"
   env              = "demo"
   app_name         = "notify-api"
-  delete_recursive_allowed = false
+  recursive_delete = false
-}
-
-data "cloudfoundry_org" "org" {
-  name = local.cf_org_name
-}
-
-resource "cloudfoundry_space" "notify-demo" {
-  delete_recursive_allowed = local.delete_recursive_allowed
-  name                     = local.cf_space_name
-  org                      = data.cloudfoundry_org.org.id
 }
 
 module "database" {
@@ -22,6 +12,7 @@ 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"
 }
 
@@ -31,6 +22,7 @@ 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"
 }
 
@@ -39,6 +31,7 @@ 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}"
 }
 
@@ -47,7 +40,6 @@ module "egress-space" {
 
   cf_org_name              = local.cf_org_name
   cf_restricted_space_name = local.cf_space_name
-  delete_recursive_allowed = local.delete_recursive_allowed
   deployers = [
     var.cf_user,
     "steven.reilly@gsa.gov"
@@ -60,6 +52,7 @@ 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_domain        = "notify.sandbox.10x.gsa.gov"
   email_receipt_error = "notify-support@gsa.gov"
@@ -71,6 +64,7 @@ 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-1"
   monthly_spend_limit = 25
 }

terraform/demo/providers.tf

@@ -3,7 +3,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.53.1"
+      version = "0.53.0"
     }
   }
 

terraform/production/main.tf

@@ -3,19 +3,7 @@ locals {
   cf_space_name    = "notify-production"
   env              = "production"
   app_name         = "notify-api"
-  delete_recursive_allowed = false
+  recursive_delete = false
-  allow_ssh                = false
-}
-
-data "cloudfoundry_org" "org" {
-  name = local.cf_org_name
-}
-
-resource "cloudfoundry_space" "notify-production" {
-  allow_ssh                = local.allow_ssh
-  delete_recursive_allowed = local.delete_recursive_allowed
-  name                     = local.cf_space_name
-  org                      = data.cloudfoundry_org.org.id
 }
 
 module "database" {
@@ -24,6 +12,7 @@ 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    = "small-psql-redundant"
 }
 
@@ -33,6 +22,7 @@ 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-3node-large"
 }
 
@@ -41,16 +31,15 @@ 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}"
 }
 
 module "egress-space" {
   source = "../shared/egress_space"
 
-  allow_ssh                = local.allow_ssh
   cf_org_name              = local.cf_org_name
   cf_restricted_space_name = local.cf_space_name
-  delete_recursive_allowed = local.delete_recursive_allowed
   deployers = [
     var.cf_user
   ]
@@ -62,6 +51,7 @@ 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-gov-west-1"
   email_domain        = "notify.gov"
   mail_from_subdomain = "mail"
@@ -74,6 +64,7 @@ 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-gov-west-1"
   monthly_spend_limit = 1000
 }

terraform/production/providers.tf

@@ -3,7 +3,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.53.1"
+      version = "0.53.0"
     }
   }