From 15027665d204979b65498e05d4941e8a7540b2b3 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Mon, 26 Jan 2026 17:48:23 +0000 Subject: [PATCH] fix!: migrate to random_project_id_length for larger collusion domain --- modules/secure-serverless-harness/main.tf | 26 ++++++++++++----------- modules/service-project-factory/main.tf | 1 + test/fixtures/secure_cloud_run/harness.tf | 26 ++++++++++++----------- test/setup/main.tf | 15 +++++++------ 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/modules/secure-serverless-harness/main.tf b/modules/secure-serverless-harness/main.tf index 840aab8a9..31ad60e36 100644 --- a/modules/secure-serverless-harness/main.tf +++ b/modules/secure-serverless-harness/main.tf @@ -54,12 +54,13 @@ module "network_project" { version = "~> 17.0" count = var.use_shared_vpc ? 1 : 0 - random_project_id = "true" - activate_apis = local.network_apis - name = var.network_project_name - org_id = var.org_id - billing_account = var.billing_account - folder_id = google_folder.fld_serverless.name + random_project_id = "true" + random_project_id_length = 4 + activate_apis = local.network_apis + name = var.network_project_name + org_id = var.org_id + billing_account = var.billing_account + folder_id = google_folder.fld_serverless.name disable_services_on_destroy = var.disable_services_on_destroy deletion_policy = var.project_deletion_policy @@ -71,12 +72,13 @@ module "security_project" { source = "terraform-google-modules/project-factory/google" version = "~> 17.0" - random_project_id = "true" - activate_apis = local.kms_apis - name = var.security_project_name - org_id = var.org_id - billing_account = var.billing_account - folder_id = google_folder.fld_serverless.name + random_project_id = "true" + random_project_id_length = 4 + activate_apis = local.kms_apis + name = var.security_project_name + org_id = var.org_id + billing_account = var.billing_account + folder_id = google_folder.fld_serverless.name disable_services_on_destroy = var.disable_services_on_destroy deletion_policy = var.project_deletion_policy diff --git a/modules/service-project-factory/main.tf b/modules/service-project-factory/main.tf index 6886cdbe4..13f10c9df 100644 --- a/modules/service-project-factory/main.tf +++ b/modules/service-project-factory/main.tf @@ -19,6 +19,7 @@ module "serverless_project" { version = "~> 17.0" random_project_id = "true" + random_project_id_length = 4 activate_apis = var.activate_apis name = var.project_name org_id = var.org_id diff --git a/test/fixtures/secure_cloud_run/harness.tf b/test/fixtures/secure_cloud_run/harness.tf index a3f9fc2f5..82478bb8f 100644 --- a/test/fixtures/secure_cloud_run/harness.tf +++ b/test/fixtures/secure_cloud_run/harness.tf @@ -49,12 +49,13 @@ module "serverless_project" { source = "terraform-google-modules/project-factory/google" version = "~> 17.0" - name = "ci-cloud-run" - random_project_id = "true" - org_id = var.org_id - folder_id = local.folder_id - billing_account = var.billing_account - deletion_policy = "DELETE" + name = "ci-cloud-run" + random_project_id = "true" + random_project_id_length = 4 + org_id = var.org_id + folder_id = local.folder_id + billing_account = var.billing_account + deletion_policy = "DELETE" svpc_host_project_id = data.terraform_remote_state.sfb-network-prod.outputs.restricted_host_project_id vpc_service_control_attach_enabled = true @@ -77,12 +78,13 @@ module "kms_project" { source = "terraform-google-modules/project-factory/google" version = "~> 17.0" - name = "ci-cloud-run-kms" - random_project_id = "true" - org_id = var.org_id - folder_id = local.folder_id - billing_account = var.billing_account - deletion_policy = "DELETE" + name = "ci-cloud-run-kms" + random_project_id = "true" + random_project_id_length = 4 + org_id = var.org_id + folder_id = local.folder_id + billing_account = var.billing_account + deletion_policy = "DELETE" svpc_host_project_id = data.terraform_remote_state.sfb-network-prod.outputs.restricted_host_project_id vpc_service_control_attach_enabled = true diff --git a/test/setup/main.tf b/test/setup/main.tf index 3a5812581..c023f7752 100644 --- a/test/setup/main.tf +++ b/test/setup/main.tf @@ -137,13 +137,14 @@ module "project" { source = "terraform-google-modules/project-factory/google" version = "~> 17.0" - name = "ci-cloud-run" - random_project_id = "true" - org_id = var.org_id - folder_id = var.folder_id - billing_account = var.billing_account - default_service_account = "keep" - deletion_policy = "DELETE" + name = "ci-cloud-run" + random_project_id = "true" + random_project_id_length = 4 + org_id = var.org_id + folder_id = var.folder_id + billing_account = var.billing_account + default_service_account = "keep" + deletion_policy = "DELETE" activate_apis = flatten(values(local.per_module_services)) }