From 0619f00ebe2a3026c4e0d70df9ae99cd40c998ae Mon Sep 17 00:00:00 2001 From: Lance Wray Date: Sun, 6 Sep 2026 16:28:17 +0000 Subject: [PATCH 1/3] Update 1-resman tfvars sample to align with TDD example --- .../1-resman/terraform.tfvars.sample | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/fast/stages-aw/1-resman/terraform.tfvars.sample b/fast/stages-aw/1-resman/terraform.tfvars.sample index 994affe73..7384741a5 100644 --- a/fast/stages-aw/1-resman/terraform.tfvars.sample +++ b/fast/stages-aw/1-resman/terraform.tfvars.sample @@ -1,21 +1,22 @@ tenants = { - tenant_name = { ## change this - admin_principal = "group:gcp-devops@domain" - descriptive_name = "tenant_name" + ten-1 = { ## Change ten-1 here - 6 or less characters + admin_principal = "group:gcp-devops@" + descriptive_name = "tenant-1" ## Change descriptive_name here locations = { - gcs = "us-east4" - kms = "us-east4" + gcs = "" + kms = "" } }, - tenant_name-2 = { ## change this - admin_principal = "group:gcp-devops@domain" - descriptive_name = "tenant_name-2" + ten-2 = { ## Change ten-2 here - 6 or less characters + admin_principal = "group:gcp-devops@" + descriptive_name = "tenant-2" ## Change descriptive_name here locations = { - gcs = "us-east4" - kms = "us-east4" + gcs = "" + kms = "" } } } +## You can have “n” number of tenants fast_features = { envs = true @@ -23,12 +24,12 @@ fast_features = { envs_folders = { Prod = { - admin = "gcp-organization-admins@domain.com" + admin = "gcp-organization-admins@" }, Int = { - admin = "gcp-organization-admins@domain.com" + admin = "gcp-organization-admins@" }, Test = { - admin = "gcp-organization-admins@domain.com" + admin = "gcp-organization-admins@" } } From 45c82297c3b061ddb18b2b4873f51792db92f5e1 Mon Sep 17 00:00:00 2001 From: Calvin Cheng Date: Tue, 8 Sep 2026 19:50:45 +0000 Subject: [PATCH 2/3] chore: replace example values with placeholders in terraform.tfvars.sample --- .../0-bootstrap/terraform.tfvars.sample | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/fast/stages-aw/0-bootstrap/terraform.tfvars.sample b/fast/stages-aw/0-bootstrap/terraform.tfvars.sample index 963094281..45a361d8a 100644 --- a/fast/stages-aw/0-bootstrap/terraform.tfvars.sample +++ b/fast/stages-aw/0-bootstrap/terraform.tfvars.sample @@ -1,7 +1,6 @@ -# use `gcloud beta billing accounts list` -# if you have too many accounts, check the Cloud Console :) +# use `gcloud billing accounts list` billing_account = { - id = "012345-67890A-BCDEF0" + id = "" # taken from Google Cloud Console Billing Accounts -> Manage Billing Account } # Optional Billing budget for the Assured Workload folder. If not set, no budget will be created. @@ -10,16 +9,16 @@ billing_account = { # } # region configuration - this will automatically populate locations for GCS, BigQuery, KMS, and logging buckets -# Default to us-east4 for IL5/FedRAMP compliance - adjust as needed +# Default to us-east4 for IL5/FedRAMP High/Moderate compliance - adjust as needed regions = { - primary = "us-east4" # Change to your preferred region - this will be used for all bootstrap resources + primary = "" } # use `gcloud organizations list` organization = { - domain = "example.org" - id = 1234567890 - customer_id = "C000001" + domain = "" # DISPLAY_NAME + id = "" + customer_id = "" } outputs_location = "~/fast-config" @@ -27,8 +26,10 @@ outputs_location = "~/fast-config" # Retention period (in days) for organization logging buckets (defaults to 365 days for compliance) # logging_bucket_retention = 365 -# use something unique and no longer than 7 characters -prefix = "abcd" +# This variable is prepended to the names of all resources that are created. +# Use something unique and no longer than 7 characters +prefix = "" + # Default log routing is set to "logging" (Cloud Logging buckets, retained for # logging_bucket_retention days; the default is 365) # To use long-term storage, change type to "storage" (GCS) or "bigquery" @@ -57,7 +58,7 @@ log_sinks = { org_policies_config = { import_defaults = false # No policies to import as of 27 SEP 2024 constraints = { - allowed_policy_member_domains = [] # Additional externally allowed customer_ids + allowed_policy_member_domains = [] #Update with additional customer IDs if needed } } @@ -65,11 +66,12 @@ fast_features = { envs = true } +# Regime must be in all caps assured_workloads = { - regime = "compliance-regime" #"IL4, IL5, FEDRAMP_HIGH, etc... if you wish to not use assured_workloads, set this value to COMPLIANCE_REGIME_UNSPECIFIED" - location = "us-east4" # Uses the same region as other resources for consistency - change to match your regions.primary if different + regime = "" #"IL4, IL5, FEDRAMP_HIGH, etc... if you wish to not use assured_workloads, set this value to COMPLIANCE_REGIME_UNSPECIFIED" + location = "" # Uses the same region as other resources for consistency - change to match your regions.primary if different } -bootstrap_project = "bootstrap-project-name" +bootstrap_project = "" -alert_email = "user@domain.com" +alert_email = "" From 4afeb31c80c1c5e5689cb2de566d2761e336c994 Mon Sep 17 00:00:00 2001 From: Calvin Cheng Date: Tue, 8 Sep 2026 19:55:00 +0000 Subject: [PATCH 3/3] docs: update prefix length limit to 7 characters in ddg.md --- docs/ddg.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/ddg.md b/docs/ddg.md index e940bb65e..9bc394e2d 100644 --- a/docs/ddg.md +++ b/docs/ddg.md @@ -72,7 +72,7 @@ To make using this deployment guide easier, the variables described below need t | Domain Name | `organization.domain` | The primary Fully Qualified Domain Name (FQDN). Run gcloud organizations list to view (make sure you have authorized as per prerequisites below) | | Alert Email | `alert_email` | The email address used for logging alerts notifications. | | Organization ID | `organization.id` | The Organization ID for the GCP Organization. Run gcloud organizations list to view. | -| Prefix | `prefix` | This is the prefix appended to the beginning of projects and resources deployed selected by your or your organization. Full project names must be globally unique and the prefix must use a maximum of 6 characters. A 409 error will occur if a globally unique project name is not created. | +| Prefix | `prefix` | This is the prefix appended to the beginning of projects and resources deployed selected by your or your organization. Full project names must be globally unique and the prefix must use a maximum of 7 characters. A 409 error will occur if a globally unique project name is not created. | | Region | `assured_workloads.location` | This is the (US) based region that we are deploying resources into (Dual regions like “NAM9” or continents are currently not supported) | | Tenant Name | `tenants` (Stage 1) | The name for the first tenant that will be deployed via this document. Full project names must be globally unique and the tenant-name must use a maximum of 6 characters. | | Secondary Region | `regions.secondary` | The secondary region for resource deployment. | @@ -218,7 +218,7 @@ organization = { customer_id = "``" } outputs_location = "~/fast-config" -# use something unique and no longer than 6 characters +# use something unique and no longer than 7 characters prefix = "``" # full project names must be globally unique log_sinks = { audit-logs = {