revert bootstrap and demo

terraform/development/main.tf

@@ -5,8 +5,8 @@ locals {
 }
 
 data "cloudfoundry_space" "dev" {
-  org_name = local.cf_org_name
-  name     = local.cf_space_name
+  org  = "9e428562-a2d9-41b4-9c23-1ef5237fb44e"
+  name = local.cf_space_name
 }
 
 module "logo_upload_bucket" {
@@ -17,15 +17,18 @@ module "logo_upload_bucket" {
   name          = "${var.username}-logo-upload-bucket"
 }
 resource "cloudfoundry_service_key" "logo_key" {
+
+  provider         = cloudfoundry-community.legacy
   name             = local.key_name
   service_instance = module.logo_upload_bucket.bucket_id
 }
 
 data "cloudfoundry_service_instance" "csv_bucket" {
-  name_or_id = "${var.username}-csv-upload-bucket"
-  space      = data.cloudfoundry_space.dev.id
+  name  = "${var.username}-csv-upload-bucket"
+  space = data.cloudfoundry_space.dev.id
 }
 resource "cloudfoundry_service_key" "csv_key" {
+  provider         = cloudfoundry-community.legacy
   name             = local.key_name
   service_instance = data.cloudfoundry_service_instance.csv_bucket.id
 }

terraform/development/providers.tf

@@ -2,13 +2,28 @@ terraform {
   required_version = "~> 1.7"
   required_providers {
     cloudfoundry = {
+      source  = "cloudfoundry/cloudfoundry"
+      version = "1.9.0"
+    }
+    cloudfoundry-community = {
       source  = "cloudfoundry-community/cloudfoundry"
       version = "0.53.1"
     }
   }
 }
 
+
+
+
 provider "cloudfoundry" {
+  api_url  = "https://api.fr.cloud.gov"
+  user     = var.cf_user
+  password = var.cf_password
+  # app_logs_max = 30
+}
+
+provider "cloudfoundry-community" {
+  alias        = "legacy"
   api_url      = "https://api.fr.cloud.gov"
   user         = var.cf_user
   password     = var.cf_password

terraform/production/main.tf

@@ -13,10 +13,9 @@ resource "null_resource" "prevent_destroy" {
 }
 
 module "redis-v70" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.0.0"
 
-  cf_org_name     = local.cf_org_name
-  cf_space_name   = local.cf_space_name
+  cf_space_id     = local.cf_space_name
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-3node-large"
   json_params = jsonencode(
@@ -27,11 +26,10 @@ module "redis-v70" {
 }
 
 module "logo_upload_bucket" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.0.0"
 
-  cf_org_name   = local.cf_org_name
-  cf_space_name = local.cf_space_name
-  name          = "${local.app_name}-logo-upload-bucket-${local.env}"
+  cf_space_id = local.cf_space_name
+  name        = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
 module "api_network_route" {
@@ -57,7 +55,7 @@ module "api_network_route" {
 #       https://cloud.gov/docs/services/external-domain-service/#how-to-create-an-instance-of-this-service
 ###########################################################################
 module "domain" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//domain?ref=v1.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//domain?ref=v2.0.0"
 
   cf_org_name    = local.cf_org_name
   cf_space_name  = local.cf_space_name

terraform/production/providers.tf

@@ -2,8 +2,8 @@ terraform {
   required_version = "~> 1.7"
   required_providers {
     cloudfoundry = {
-      source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.53.1"
+      source  = "cloudfoundry/cloudfoundry"
+      version = "1.9.0"
     }
   }
 
@@ -17,8 +17,8 @@ terraform {
 }
 
 provider "cloudfoundry" {
-  api_url      = "https://api.fr.cloud.gov"
-  user         = var.cf_user
-  password     = var.cf_password
-  app_logs_max = 30
+  api_url  = "https://api.fr.cloud.gov"
+  user     = var.cf_user
+  password = var.cf_password
+  # app_logs_max = 30
 }

terraform/sandbox/main.tf

@@ -13,10 +13,9 @@ resource "null_resource" "prevent_destroy" {
 }
 
 module "redis-v70" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.0.0"
 
-  cf_org_name     = local.cf_org_name
-  cf_space_name   = local.cf_space_name
+  cf_space_id     = local.cf_space_name
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-dev"
   json_params = jsonencode(
@@ -27,11 +26,10 @@ module "redis-v70" {
 }
 
 module "logo_upload_bucket" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.0.0"
 
-  cf_org_name   = local.cf_org_name
-  cf_space_name = local.cf_space_name
-  name          = "${local.app_name}-logo-upload-bucket-${local.env}"
+  cf_space_id = local.cf_space_name
+  name        = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
 module "api_network_route" { # API and Admin apps must both exist in Cloud

terraform/sandbox/providers.tf

@@ -2,8 +2,8 @@ terraform {
   required_version = "~> 1.7"
   required_providers {
     cloudfoundry = {
-      source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.53.1"
+      source  = "cloudfoundry/cloudfoundry"
+      version = "1.9.0"
     }
   }
 
@@ -17,8 +17,8 @@ terraform {
 }
 
 provider "cloudfoundry" {
-  api_url      = "https://api.fr.cloud.gov"
-  user         = var.cf_user
-  password     = var.cf_password
-  app_logs_max = 30
+  api_url  = "https://api.fr.cloud.gov"
+  user     = var.cf_user
+  password = var.cf_password
+  # app_logs_max = 30
 }

terraform/shared/container_networking/main.tf

@@ -1,22 +1,29 @@
+data "cloudfoundry_org" "org" {
+  name = var.cf_org_name
+}
+
 data "cloudfoundry_space" "space" {
-  org_name = var.cf_org_name
-  name     = var.cf_space_name
+  org = data.cloudfoundry_org.org.id
+  # org  = "9e428562-a2d9-41b4-9c23-1ef5237fb44e"
+  name = var.cf_space_name
 }
 
 data "cloudfoundry_app" "source_app" {
-  name_or_id = var.source_app_name
-  space      = data.cloudfoundry_space.space.id
+  org_name   = var.cf_org_name
+  name       = var.source_app_name
+  space_name = data.cloudfoundry_space.space.id
 }
 
 data "cloudfoundry_app" "destination_app" {
-  name_or_id = var.destination_app_name
-  space      = data.cloudfoundry_space.space.id
+  org_name   = var.cf_org_name
+  name       = var.destination_app_name
+  space_name = data.cloudfoundry_space.space.id
 }
 
 resource "cloudfoundry_network_policy" "internal_route" {
-  policy {
+  policies = [{
     source_app      = data.cloudfoundry_app.source_app.id
     destination_app = data.cloudfoundry_app.destination_app.id
     port            = var.destination_port
-  }
+  }]
 }

terraform/shared/container_networking/providers.tf

@@ -2,8 +2,8 @@ terraform {
   required_version = "~> 1.7"
   required_providers {
     cloudfoundry = {
-      source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.53.1"
+      source  = "cloudfoundry/cloudfoundry"
+      version = "1.9.0"
     }
   }
 }

terraform/staging/main.tf

@@ -13,10 +13,9 @@ resource "null_resource" "prevent_destroy" {
 }
 
 module "redis-v70" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
 
-  cf_org_name     = local.cf_org_name
-  cf_space_name   = local.cf_space_name
+  cf_space_id     = local.cf_space_name
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-dev"
   json_params = jsonencode(
@@ -27,11 +26,10 @@ module "redis-v70" {
 }
 
 module "logo_upload_bucket" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
 
-  cf_org_name   = local.cf_org_name
-  cf_space_name = local.cf_space_name
-  name          = "${local.app_name}-logo-upload-bucket-${local.env}"
+  cf_space_id = local.cf_space_name
+  name        = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
 module "api_network_route" {

terraform/staging/providers.tf

@@ -2,6 +2,10 @@ terraform {
   required_version = "~> 1.7"
   required_providers {
     cloudfoundry = {
+      source  = "cloudfoundry/cloudfoundry"
+      version = "1.9.0"
+    }
+    cloudfoundry-community = {
       source  = "cloudfoundry-community/cloudfoundry"
       version = "0.53.1"
     }
@@ -17,6 +21,14 @@ terraform {
 }
 
 provider "cloudfoundry" {
+  api_url  = "https://api.fr.cloud.gov"
+  user     = var.cf_user
+  password = var.cf_password
+  # app_logs_max = 30
+}
+
+provider "cloudfoundry-community" {
+  alias        = "legacy"
   api_url      = "https://api.fr.cloud.gov"
   user         = var.cf_user
   password     = var.cf_password