From 526eaa52dd1c17239d951e400e3834ddaf662b9a Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Tue, 20 Feb 2024 16:05:19 +0100 Subject: [PATCH 1/2] Make all project_parent_ids fields optional --- fast/stages/0-bootstrap/variables.tf | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/fast/stages/0-bootstrap/variables.tf b/fast/stages/0-bootstrap/variables.tf index d2d47a1fee..d8536fc265 100644 --- a/fast/stages/0-bootstrap/variables.tf +++ b/fast/stages/0-bootstrap/variables.tf @@ -253,15 +253,11 @@ variable "prefix" { variable "project_parent_ids" { description = "Optional parents for projects created here in folders/nnnnnnn format. Null values will use the organization as parent." type = object({ - automation = string - billing = string - logging = string + automation = optional(string) + billing = optional(string) + logging = optional(string) }) - default = { - automation = null - billing = null - logging = null - } + default = {} nullable = false } From 1d892b3e9b166cf351c181bc03e7c9f066136666 Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Tue, 20 Feb 2024 16:11:44 +0100 Subject: [PATCH 2/2] Fix README --- fast/stages/0-bootstrap/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fast/stages/0-bootstrap/README.md b/fast/stages/0-bootstrap/README.md index 51e59a8ace..1e80e28527 100644 --- a/fast/stages/0-bootstrap/README.md +++ b/fast/stages/0-bootstrap/README.md @@ -643,9 +643,9 @@ The `fast_features` variable consists of 4 toggles: | [log_sinks](variables.tf#L183) | Org-level log sinks, in name => {type, filter} format. | map(object({…})) | | {…} | | | [org_policies_config](variables.tf#L212) | Organization policies customization. | object({…}) | | {} | | | [outputs_location](variables.tf#L238) | Enable writing provider, tfvars and CI/CD workflow files to local filesystem. Leave null to disable. | string | | null | | -| [project_parent_ids](variables.tf#L253) | Optional parents for projects created here in folders/nnnnnnn format. Null values will use the organization as parent. | object({…}) | | {…} | | -| [workforce_identity_providers](variables.tf#L268) | Workforce Identity Federation pools. | map(object({…})) | | {} | | -| [workload_identity_providers](variables.tf#L284) | Workload Identity Federation pools. The `cicd_repositories` variable references keys here. | map(object({…})) | | {} | | +| [project_parent_ids](variables.tf#L253) | Optional parents for projects created here in folders/nnnnnnn format. Null values will use the organization as parent. | object({…}) | | {} | | +| [workforce_identity_providers](variables.tf#L264) | Workforce Identity Federation pools. | map(object({…})) | | {} | | +| [workload_identity_providers](variables.tf#L280) | Workload Identity Federation pools. The `cicd_repositories` variable references keys here. | map(object({…})) | | {} | | ## Outputs