app_logs_max

terraform/bootstrap/main.tf

@@ -3,11 +3,11 @@ locals {
 }
 
 module "s3" {
-  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   = "gsa-tts-benefits-studio"
-  cf_space_name = "notify-management"
-  name          = local.s3_service_name
+  cf_org_name = "gsa-tts-benefits-studio"
+  cf_space_id = "notify-management"
+  name        = local.s3_service_name
 }
 
 resource "cloudfoundry_service_key" "bucket_creds" {

terraform/bootstrap/providers.tf

@@ -2,15 +2,15 @@ terraform {
   required_version = "~> 1.7"
   required_providers {
     cloudfoundry = {
-      source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.53.1"
+      source  = "cloudfoundry/cloudfoundry"
+      version = "1.9.0"
     }
   }
 }
 
 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/demo/main.tf

@@ -1,8 +1,8 @@
 locals {
-  cf_org_name   = "gsa-tts-benefits-studio"
-  cf_space_name = "notify-demo"
-  env           = "demo"
-  app_name      = "notify-admin"
+  cf_org_name = "gsa-tts-benefits-studio"
+  cf_space_id = "notify-demo"
+  env         = "demo"
+  app_name    = "notify-admin"
 }
 
 resource "null_resource" "prevent_destroy" {
@@ -13,10 +13,10 @@ 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_org_name     = local.cf_org_name
+  cf_space_id     = local.cf_space_id
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-dev"
   json_params = jsonencode(
@@ -27,18 +27,18 @@ 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_org_name = local.cf_org_name
+  cf_space_id = local.cf_space_id
+  name        = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
 module "api_network_route" {
   source = "../shared/container_networking"
 
   cf_org_name          = local.cf_org_name
-  cf_space_name        = local.cf_space_name
+  cf_space_id          = local.cf_space_id
   source_app_name      = "${local.app_name}-${local.env}"
   destination_app_name = "notify-api-${local.env}"
 }

terraform/demo/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/development/main.tf

@@ -1,34 +1,31 @@
 locals {
-  cf_org_name   = "gsa-tts-benefits-studio"
-  cf_space_name = "notify-local-dev"
-  key_name      = "${var.username}-admin-dev-key"
+  cf_org_name = "gsa-tts-benefits-studio"
+  cf_space_id = "notify-local-dev"
+  key_name    = "${var.username}-admin-dev-key"
 }
 
 data "cloudfoundry_space" "dev" {
-  org  = "9e428562-a2d9-41b4-9c23-1ef5237fb44e"
-  name = local.cf_space_name
+  org_name = local.cf_org_name
+  name     = local.cf_space_id
 }
 
 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          = "${var.username}-logo-upload-bucket"
+  # cf_org_name = local.cf_org_name
+  cf_space_id = local.cf_space_id
+  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  = "${var.username}-csv-upload-bucket"
-  space = data.cloudfoundry_space.dev.id
+  name_or_id = "${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

@@ -5,27 +5,12 @@ terraform {
       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
-  app_logs_max = 30
-}

terraform/production/main.tf

@@ -1,8 +1,8 @@
 locals {
-  cf_org_name   = "gsa-tts-benefits-studio"
-  cf_space_name = "notify-production"
-  env           = "production"
-  app_name      = "notify-admin"
+  cf_org_name = "gsa-tts-benefits-studio"
+  cf_space_id = "notify-production"
+  env         = "production"
+  app_name    = "notify-admin"
 }
 
 resource "null_resource" "prevent_destroy" {
@@ -13,9 +13,10 @@ resource "null_resource" "prevent_destroy" {
 }
 
 module "redis-v70" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
 
-  cf_space_id     = local.cf_space_name
+  # cf_org_name     = local.cf_org_name
+  cf_space_id     = local.cf_space_id
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-3node-large"
   json_params = jsonencode(
@@ -26,9 +27,10 @@ module "redis-v70" {
 }
 
 module "logo_upload_bucket" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
 
-  cf_space_id = local.cf_space_name
+  # cf_org_name = local.cf_org_name
+  cf_space_id = local.cf_space_id
   name        = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
@@ -36,7 +38,7 @@ module "api_network_route" {
   source = "../shared/container_networking"
 
   cf_org_name          = local.cf_org_name
-  cf_space_name        = local.cf_space_name
+  cf_space_id          = local.cf_space_id
   source_app_name      = "${local.app_name}-${local.env}"
   destination_app_name = "notify-api-${local.env}"
 }
@@ -55,10 +57,10 @@ 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=v2.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//domain?ref=v2.4.0"
 
   cf_org_name    = local.cf_org_name
-  cf_space_name  = local.cf_space_name
+  cf_space_id    = local.cf_space_id
   app_name_or_id = "${local.app_name}-${local.env}"
   name           = "${local.app_name}-domain-${local.env}"
   cdn_plan_name  = "domain"

terraform/sandbox/main.tf

@@ -1,8 +1,8 @@
 locals {
-  cf_org_name   = "gsa-tts-benefits-studio"
-  cf_space_name = "notify-sandbox"
-  env           = "sandbox"
-  app_name      = "notify-admin"
+  cf_org_name = "gsa-tts-benefits-studio"
+  cf_space_id = "notify-sandbox"
+  env         = "sandbox"
+  app_name    = "notify-admin"
 }
 
 resource "null_resource" "prevent_destroy" {
@@ -13,9 +13,10 @@ resource "null_resource" "prevent_destroy" {
 }
 
 module "redis-v70" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
 
-  cf_space_id     = local.cf_space_name
+  # cf_org_name     = local.cf_org_name
+  cf_space_id     = local.cf_space_id
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-dev"
   json_params = jsonencode(
@@ -26,9 +27,10 @@ module "redis-v70" {
 }
 
 module "logo_upload_bucket" {
-  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.0.0"
+  source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
 
-  cf_space_id = local.cf_space_name
+  # cf_org_name = local.cf_org_name
+  cf_space_id = local.cf_space_id
   name        = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
@@ -36,7 +38,7 @@ module "api_network_route" { # API and Admin apps must both exist in Cloud
   source = "../shared/container_networking"
 
   cf_org_name          = local.cf_org_name
-  cf_space_name        = local.cf_space_name
+  cf_space_id          = local.cf_space_id
   source_app_name      = "${local.app_name}-${local.env}"
   destination_app_name = "notify-api-${local.env}"
 }

terraform/shared/container_networking/main.tf

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

terraform/shared/container_networking/variables.tf

@@ -1,5 +1,5 @@
 variable "cf_org_name" {}
-variable "cf_space_name" {}
+variable "cf_space_id" {}
 variable "source_app_name" {}
 variable "destination_app_name" {}
 variable "destination_port" {

terraform/staging/main.tf

@@ -1,8 +1,8 @@
 locals {
-  cf_org_name   = "gsa-tts-benefits-studio"
-  cf_space_name = "notify-staging"
-  env           = "staging"
-  app_name      = "notify-admin"
+  cf_org_name = "gsa-tts-benefits-studio"
+  cf_space_id = "notify-staging"
+  env         = "staging"
+  app_name    = "notify-admin"
 }
 
 resource "null_resource" "prevent_destroy" {
@@ -15,7 +15,8 @@ resource "null_resource" "prevent_destroy" {
 module "redis-v70" {
   source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
 
-  cf_space_id     = local.cf_space_name
+  # cf_org_name     = local.cf_org_name
+  cf_space_id     = local.cf_space_id
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-dev"
   json_params = jsonencode(
@@ -28,7 +29,8 @@ module "redis-v70" {
 module "logo_upload_bucket" {
   source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
 
-  cf_space_id = local.cf_space_name
+  # cf_org_name = local.cf_org_name
+  cf_space_id = local.cf_space_id
   name        = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
@@ -36,7 +38,7 @@ module "api_network_route" {
   source = "../shared/container_networking"
 
   cf_org_name          = local.cf_org_name
-  cf_space_name        = local.cf_space_name
+  cf_space_id          = local.cf_space_id
   source_app_name      = "${local.app_name}-${local.env}"
   destination_app_name = "notify-api-${local.env}"
 }

terraform/staging/providers.tf

@@ -5,10 +5,6 @@ terraform {
       source  = "cloudfoundry/cloudfoundry"
       version = "1.9.0"
     }
-    cloudfoundry-community = {
-      source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.53.1"
-    }
   }
 
   backend "s3" {
@@ -26,11 +22,3 @@ provider "cloudfoundry" {
   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
-  app_logs_max = 30
-}