From 01de73be53ef2818c15324e1a52fcf13a41188c2 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 15 Oct 2025 08:15:43 -0700 Subject: [PATCH] cf_space_name->cf_space_id --- terraform/bootstrap/main.tf | 2 +- terraform/demo/main.tf | 8 ++++---- terraform/development/main.tf | 6 +++--- terraform/production/main.tf | 10 +++++----- terraform/sandbox/main.tf | 8 ++++---- terraform/shared/container_networking/main.tf | 2 +- terraform/shared/container_networking/variables.tf | 2 +- terraform/staging/main.tf | 8 ++++---- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/terraform/bootstrap/main.tf b/terraform/bootstrap/main.tf index ecc445429..22ca38212 100644 --- a/terraform/bootstrap/main.tf +++ b/terraform/bootstrap/main.tf @@ -6,7 +6,7 @@ module "s3" { source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0" cf_org_name = "gsa-tts-benefits-studio" - cf_space_name = "notify-management" + cf_space_id = "notify-management" name = local.s3_service_name } diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf index ddfc6b9be..5279d3aa0 100644 --- a/terraform/demo/main.tf +++ b/terraform/demo/main.tf @@ -1,6 +1,6 @@ locals { cf_org_name = "gsa-tts-benefits-studio" - cf_space_name = "notify-demo" + cf_space_id = "notify-demo" env = "demo" app_name = "notify-admin" } @@ -16,7 +16,7 @@ module "redis-v70" { 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_id name = "${local.app_name}-redis-v70-${local.env}" redis_plan_name = "redis-dev" json_params = jsonencode( @@ -30,7 +30,7 @@ module "logo_upload_bucket" { 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 + cf_space_id = local.cf_space_id name = "${local.app_name}-logo-upload-bucket-${local.env}" } @@ -38,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}" } diff --git a/terraform/development/main.tf b/terraform/development/main.tf index e5fe1c743..9fc4c27f7 100644 --- a/terraform/development/main.tf +++ b/terraform/development/main.tf @@ -1,19 +1,19 @@ locals { cf_org_name = "gsa-tts-benefits-studio" - cf_space_name = "notify-local-dev" + cf_space_id = "notify-local-dev" key_name = "${var.username}-admin-dev-key" } data "cloudfoundry_space" "dev" { org_name = local.cf_org_name - name = local.cf_space_name + name = local.cf_space_id } module "logo_upload_bucket" { 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 + cf_space_id = local.cf_space_id name = "${var.username}-logo-upload-bucket" } resource "cloudfoundry_service_key" "logo_key" { diff --git a/terraform/production/main.tf b/terraform/production/main.tf index 3fd38c323..1023cc2cd 100644 --- a/terraform/production/main.tf +++ b/terraform/production/main.tf @@ -1,6 +1,6 @@ locals { cf_org_name = "gsa-tts-benefits-studio" - cf_space_name = "notify-production" + cf_space_id = "notify-production" env = "production" app_name = "notify-admin" } @@ -16,7 +16,7 @@ module "redis-v70" { 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_id name = "${local.app_name}-redis-v70-${local.env}" redis_plan_name = "redis-3node-large" json_params = jsonencode( @@ -30,7 +30,7 @@ module "logo_upload_bucket" { 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 + cf_space_id = local.cf_space_id name = "${local.app_name}-logo-upload-bucket-${local.env}" } @@ -38,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}" } @@ -60,7 +60,7 @@ module "domain" { 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" diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf index 2ba534a51..4e0149134 100644 --- a/terraform/sandbox/main.tf +++ b/terraform/sandbox/main.tf @@ -1,6 +1,6 @@ locals { cf_org_name = "gsa-tts-benefits-studio" - cf_space_name = "notify-sandbox" + cf_space_id = "notify-sandbox" env = "sandbox" app_name = "notify-admin" } @@ -16,7 +16,7 @@ module "redis-v70" { 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_id name = "${local.app_name}-redis-v70-${local.env}" redis_plan_name = "redis-dev" json_params = jsonencode( @@ -30,7 +30,7 @@ module "logo_upload_bucket" { 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 + cf_space_id = local.cf_space_id name = "${local.app_name}-logo-upload-bucket-${local.env}" } @@ -38,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}" } diff --git a/terraform/shared/container_networking/main.tf b/terraform/shared/container_networking/main.tf index da8e6f712..aaa96cd31 100644 --- a/terraform/shared/container_networking/main.tf +++ b/terraform/shared/container_networking/main.tf @@ -1,6 +1,6 @@ data "cloudfoundry_space" "space" { org_name = var.cf_org_name - name = var.cf_space_name + name = var.cf_space_id } data "cloudfoundry_app" "source_app" { diff --git a/terraform/shared/container_networking/variables.tf b/terraform/shared/container_networking/variables.tf index 960ee72f0..c7435d9f6 100644 --- a/terraform/shared/container_networking/variables.tf +++ b/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" { diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index 70f07c690..3050bde6e 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -1,6 +1,6 @@ locals { cf_org_name = "gsa-tts-benefits-studio" - cf_space_name = "notify-staging" + cf_space_id = "notify-staging" env = "staging" app_name = "notify-admin" } @@ -16,7 +16,7 @@ module "redis-v70" { 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_id name = "${local.app_name}-redis-v70-${local.env}" redis_plan_name = "redis-dev" json_params = jsonencode( @@ -30,7 +30,7 @@ module "logo_upload_bucket" { 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 + cf_space_id = local.cf_space_id name = "${local.app_name}-logo-upload-bucket-${local.env}" } @@ -38,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}" }