diff --git a/fast/stages/0-bootstrap/README.md b/fast/stages/0-bootstrap/README.md index 51e59a8a..1e80e285 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 diff --git a/fast/stages/0-bootstrap/variables.tf b/fast/stages/0-bootstrap/variables.tf index d2d47a1f..d8536fc2 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 } diff --git a/modules/net-lb-app-ext-regional/README.md b/modules/net-lb-app-ext-regional/README.md index 21d6a048..e1f7cdda 100644 --- a/modules/net-lb-app-ext-regional/README.md +++ b/modules/net-lb-app-ext-regional/README.md @@ -731,7 +731,7 @@ module "ralb-0" { | [ports](variables.tf#L144) | Optional ports for HTTP load balancer, valid ports are 80 and 8080. | list(string) | | null | | [protocol](variables.tf#L155) | Protocol supported by this load balancer. | string | | "HTTP" | | [ssl_certificates](variables.tf#L173) | SSL target proxy certificates (only if protocol is HTTPS) for existing, custom, and managed certificates. | object({…}) | | {} | -| [urlmap_config](variables-urlmap.tf#L19) | The URL map configuration. | object({…}) | | {…} | +| [urlmap_config](variables-urlmap.tf#L19) | The URL map configuration. | object({…}) | | {…} | ## Outputs diff --git a/modules/net-lb-app-ext-regional/variables-urlmap.tf b/modules/net-lb-app-ext-regional/variables-urlmap.tf index c3149c51..8694eb90 100644 --- a/modules/net-lb-app-ext-regional/variables-urlmap.tf +++ b/modules/net-lb-app-ext-regional/variables-urlmap.tf @@ -23,12 +23,12 @@ variable "urlmap_config" { request_mirror_backend = optional(string) cors_policy = optional(object({ allow_credentials = optional(bool) - allow_headers = optional(string) - allow_methods = optional(string) - allow_origin_regexes = list(string) - allow_origins = list(string) + allow_headers = optional(list(string)) + allow_methods = optional(list(string)) + allow_origin_regexes = optional(list(string)) + allow_origins = optional(list(string)) disabled = optional(bool) - expose_headers = optional(string) + expose_headers = optional(list(string)) max_age = optional(string) })) fault_injection_policy = optional(object({ @@ -120,12 +120,12 @@ variable "urlmap_config" { request_mirror_backend = optional(string) cors_policy = optional(object({ allow_credentials = optional(bool) - allow_headers = optional(string) - allow_methods = optional(string) - allow_origin_regexes = list(string) - allow_origins = list(string) + allow_headers = optional(list(string)) + allow_methods = optional(list(string)) + allow_origin_regexes = optional(list(string)) + allow_origins = optional(list(string)) disabled = optional(bool) - expose_headers = optional(string) + expose_headers = optional(list(string)) max_age = optional(string) })) fault_injection_policy = optional(object({ diff --git a/modules/net-lb-app-ext/README.md b/modules/net-lb-app-ext/README.md index 0b41892a..7fe7eb85 100644 --- a/modules/net-lb-app-ext/README.md +++ b/modules/net-lb-app-ext/README.md @@ -890,7 +890,7 @@ module "glb-0" { | [ports](variables.tf#L188) | Optional ports for HTTP load balancer, valid ports are 80 and 8080. | list(string) | | null | | [protocol](variables.tf#L199) | Protocol supported by this load balancer. | string | | "HTTP" | | [ssl_certificates](variables.tf#L212) | SSL target proxy certificates (only if protocol is HTTPS) for existing, custom, and managed certificates. | object({…}) | | {} | -| [urlmap_config](variables-urlmap.tf#L19) | The URL map configuration. | object({…}) | | {…} | +| [urlmap_config](variables-urlmap.tf#L19) | The URL map configuration. | object({…}) | | {…} | | [use_classic_version](variables.tf#L229) | Use classic Global Load Balancer. | bool | | true | ## Outputs diff --git a/modules/net-lb-app-ext/variables-urlmap.tf b/modules/net-lb-app-ext/variables-urlmap.tf index 8cf7d7ec..88aedc87 100644 --- a/modules/net-lb-app-ext/variables-urlmap.tf +++ b/modules/net-lb-app-ext/variables-urlmap.tf @@ -23,12 +23,12 @@ variable "urlmap_config" { request_mirror_backend = optional(string) cors_policy = optional(object({ allow_credentials = optional(bool) - allow_headers = optional(string) - allow_methods = optional(string) - allow_origin_regexes = list(string) - allow_origins = list(string) + allow_headers = optional(list(string)) + allow_methods = optional(list(string)) + allow_origin_regexes = optional(list(string)) + allow_origins = optional(list(string)) disabled = optional(bool) - expose_headers = optional(string) + expose_headers = optional(list(string)) max_age = optional(string) })) fault_injection_policy = optional(object({ @@ -108,12 +108,12 @@ variable "urlmap_config" { request_mirror_backend = optional(string) cors_policy = optional(object({ allow_credentials = optional(bool) - allow_headers = optional(string) - allow_methods = optional(string) - allow_origin_regexes = list(string) - allow_origins = list(string) + allow_headers = optional(list(string)) + allow_methods = optional(list(string)) + allow_origin_regexes = optional(list(string)) + allow_origins = optional(list(string)) disabled = optional(bool) - expose_headers = optional(string) + expose_headers = optional(list(string)) max_age = optional(string) })) fault_injection_policy = optional(object({ diff --git a/modules/net-lb-app-int-cross-region/README.md b/modules/net-lb-app-int-cross-region/README.md index a58d4007..003861e6 100644 --- a/modules/net-lb-app-int-cross-region/README.md +++ b/modules/net-lb-app-int-cross-region/README.md @@ -756,7 +756,7 @@ module "ilb-l7" { | [ports](variables.tf#L136) | Optional ports for HTTP load balancer, valid ports are 80 and 8080. | list(string) | | null | | [protocol](variables.tf#L147) | Protocol supported by this load balancer. | string | | "HTTP" | | [service_directory_registration](variables.tf#L160) | Service directory namespace and service used to register this load balancer. | object({…}) | | null | -| [urlmap_config](variables-urlmap.tf#L19) | The URL map configuration. | object({…}) | | {…} | +| [urlmap_config](variables-urlmap.tf#L19) | The URL map configuration. | object({…}) | | {…} | ## Outputs diff --git a/modules/net-lb-app-int-cross-region/variables-urlmap.tf b/modules/net-lb-app-int-cross-region/variables-urlmap.tf index cd1869f5..9e52e578 100644 --- a/modules/net-lb-app-int-cross-region/variables-urlmap.tf +++ b/modules/net-lb-app-int-cross-region/variables-urlmap.tf @@ -51,12 +51,12 @@ variable "urlmap_config" { request_mirror_backend = optional(string) cors_policy = optional(object({ allow_credentials = optional(bool) - allow_headers = optional(string) - allow_methods = optional(string) - allow_origin_regexes = list(string) - allow_origins = list(string) + allow_headers = optional(list(string)) + allow_methods = optional(list(string)) + allow_origin_regexes = optional(list(string)) + allow_origins = optional(list(string)) disabled = optional(bool) - expose_headers = optional(string) + expose_headers = optional(list(string)) max_age = optional(string) })) fault_injection_policy = optional(object({ @@ -158,12 +158,12 @@ variable "urlmap_config" { request_mirror_backend = optional(string) cors_policy = optional(object({ allow_credentials = optional(bool) - allow_headers = optional(string) - allow_methods = optional(string) - allow_origin_regexes = list(string) - allow_origins = list(string) + allow_headers = optional(list(string)) + allow_methods = optional(list(string)) + allow_origin_regexes = optional(list(string)) + allow_origins = optional(list(string)) disabled = optional(bool) - expose_headers = optional(string) + expose_headers = optional(list(string)) max_age = optional(string) })) fault_injection_policy = optional(object({ diff --git a/modules/net-lb-app-int/README.md b/modules/net-lb-app-int/README.md index bf4b65e1..d90cbde2 100644 --- a/modules/net-lb-app-int/README.md +++ b/modules/net-lb-app-int/README.md @@ -674,7 +674,7 @@ module "ilb-l7" { | [protocol](variables.tf#L143) | Protocol supported by this load balancer. | string | | "HTTP" | | [service_directory_registration](variables.tf#L161) | Service directory namespace and service used to register this load balancer. | object({…}) | | null | | [ssl_certificates](variables.tf#L170) | SSL target proxy certificates (only if protocol is HTTPS). | object({…}) | | {} | -| [urlmap_config](variables-urlmap.tf#L19) | The URL map configuration. | object({…}) | | {…} | +| [urlmap_config](variables-urlmap.tf#L19) | The URL map configuration. | object({…}) | | {…} | ## Outputs diff --git a/modules/net-lb-app-int/variables-urlmap.tf b/modules/net-lb-app-int/variables-urlmap.tf index cd1869f5..9e52e578 100644 --- a/modules/net-lb-app-int/variables-urlmap.tf +++ b/modules/net-lb-app-int/variables-urlmap.tf @@ -51,12 +51,12 @@ variable "urlmap_config" { request_mirror_backend = optional(string) cors_policy = optional(object({ allow_credentials = optional(bool) - allow_headers = optional(string) - allow_methods = optional(string) - allow_origin_regexes = list(string) - allow_origins = list(string) + allow_headers = optional(list(string)) + allow_methods = optional(list(string)) + allow_origin_regexes = optional(list(string)) + allow_origins = optional(list(string)) disabled = optional(bool) - expose_headers = optional(string) + expose_headers = optional(list(string)) max_age = optional(string) })) fault_injection_policy = optional(object({ @@ -158,12 +158,12 @@ variable "urlmap_config" { request_mirror_backend = optional(string) cors_policy = optional(object({ allow_credentials = optional(bool) - allow_headers = optional(string) - allow_methods = optional(string) - allow_origin_regexes = list(string) - allow_origins = list(string) + allow_headers = optional(list(string)) + allow_methods = optional(list(string)) + allow_origin_regexes = optional(list(string)) + allow_origins = optional(list(string)) disabled = optional(bool) - expose_headers = optional(string) + expose_headers = optional(list(string)) max_age = optional(string) })) fault_injection_policy = optional(object({