Skip to content

fix!: migrate to random_project_id_length for larger collusion domain #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
apeabody wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix!: migrate to random_project_id_length for larger collusion domain #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1502766
fix!: migrate to random_project_id_length for larger collusion domain
apeabody Jan 26, 2026
8b6475e
Merge branch 'main' into ap/collusion_domain
apeabody Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions modules/secure-serverless-harness/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,13 @@ module "network_project" {
version = "~> 18.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
Expand All @@ -71,12 +72,13 @@ module "security_project" {
source = "terraform-google-modules/project-factory/google"
version = "~> 18.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
Expand Down
1 change: 1 addition & 0 deletions modules/service-project-factory/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module "serverless_project" {
version = "~> 18.0"

random_project_id = "true"
random_project_id_length = 4
activate_apis = var.activate_apis
name = var.project_name
org_id = var.org_id
Expand Down
26 changes: 14 additions & 12 deletions test/fixtures/secure_cloud_run/harness.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,13 @@ module "serverless_project" {
source = "terraform-google-modules/project-factory/google"
version = "~> 18.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
Expand All @@ -77,12 +78,13 @@ module "kms_project" {
source = "terraform-google-modules/project-factory/google"
version = "~> 18.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
Expand Down
15 changes: 8 additions & 7 deletions test/setup/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,14 @@ module "project" {
source = "terraform-google-modules/project-factory/google"
version = "~> 18.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))
}
Loading