* Allow creation of dynamic tags * Extend project factory and related modules to support dynamic values * Extend folder and organization modules * project and organization readme * Simplify dynamic tag support and remove unnecessary restrictions • Schemas & Validations: Removed the restriction that forbade combining IAM fields with allowed_values_regex on tags. Updated validations in project and organization modules, and simplified all relevant JSON schemas. • Module Tag Bindings: Simplified the tag_value assignment in folder , project , gcs , bigquery-dataset , and kms modules by removing the defensive can(regex(...)) check and calling templatestring directly. • Outputs: Removed the tags_dynamic output from project and organization modules, as the same information is now available in tag_keys . • Project Factory: Updated tag_vars_projects in projects.tf to use the native namespaced_name attribute and filtered manually for dynamic tags. * fix(organization, project): fix linting and tests for dynamic tag support - Align allowed_values_regex and description extraction in _tags_merged locals to use lookup() for consistency with other fields. - Fix spacing in project context variable (alphabetical ordering). - Update organization tags test to include the new cost_center tag key with allowed_values_regex. - Update project tags test to include the new cost_center tag key and reflect the resolved allowed_values_regex on environment. * refactor(gcs): refine tag bindings and fix context test - Add _tag_bindings local to pre-resolve context references, enabling templatestring to receive a direct map reference (required by Terraform). - Use var.context.tag_vars instead of the non-existent local.ctx.tag_vars. - Fix HCL syntax in context.tfvars (escaped inner quotes). - Update context test inventory to reflect 3 tag bindings including a dynamic value resolved via templatestring. * refactor: align modules with tag binding context pattern - Add _tag_bindings local + templatestring dance to cloud-run-v2, compute-vm, folder, kms modules (bigquery-dataset already had it) - Exclude tag_vars from local.ctx in cloud-run-v2, compute-vm, folder, kms, project modules (bigquery-dataset already had it) - Add tag_vars to context variable in cloud-run-v2, compute-vm modules (others already had it) - Update all context tests with dynamic tag binding values using var.context.tag_vars * docs: add module-level tftest.yaml test instructions to GEMINI.md * docs: regenerate READMEs after tag-regex alignment - Regenerate variable tables in 7 module READMEs to reflect line number shifts from prior tag-regex changes - Add tag_vars exclusion to gcs ctx local - Fix whitespace alignment in iam-service-account and project-factory tag_vars blocks - Update tftest resource counts for organization and project - Remove tags_dynamic from organization/project output tables * fix(project-factory): update test inventory for tag_bindings module split - Move tag binding address from folder-2 to folder-2-iam in test inventory (tag_bindings moved from creation to IAM modules) - Update module instance count from 34 to 35 - Regenerate README tables after terraform fmt line shifts - Apply terraform fmt to variables.tf * refactor(project-factory): remove unnecessary depends_on from folder-iam modules Folder IAM modules depend on their own folder creation modules, not on module.projects. The explicit depends_on was leftover from an earlier design. * FAST stages * Address review comments. - FAST Stages: - Added tag_keys to output-files.tf in 0-org-setup to pass org tags via tfvars. - Sorted tag_keys and tag_values in output-files.tf. - Updated project-factory, networking, and security stages to use tag_keys. - Filtered tag_keys for dynamic tags only. - Modules: - Excluded tag_vars from local.ctx in iam-service-account and organization. - Simplified tag_value in iam-service-account. - Tests: - Updated test inventories for 0-org-setup and project-factory. * Fix tf format * Fix tfdoc * docs: add ADR for templatestring vars convention and update status of base path ADR * More tfdoc * Update schemas * Use endswith in context loop * Address review * Update FAST readmes * Update last modules * Terraform fmt * Revert alloydb * Fix whitespace --------- Co-authored-by: Ludovico Magnocavallo <ludo@qix.it>
136 lines
4.0 KiB
HCL
136 lines
4.0 KiB
HCL
/**
|
|
* Copyright 2024 Google LLC
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
variable "context" {
|
|
description = "Context-specific interpolations."
|
|
type = object({
|
|
custom_roles = optional(map(string), {})
|
|
folder_ids = optional(map(string), {})
|
|
iam_principals = optional(map(string), {})
|
|
kms_keys = optional(map(string), {})
|
|
locations = optional(map(string), {})
|
|
project_ids = optional(map(string), {})
|
|
tag_values = optional(map(string), {})
|
|
tag_vars = optional(object({
|
|
projects = optional(map(map(string)), {})
|
|
organization = optional(map(string), {})
|
|
}), {})
|
|
})
|
|
default = {}
|
|
nullable = false
|
|
}
|
|
|
|
variable "description" {
|
|
description = "Human-readable description for the logging bucket."
|
|
type = string
|
|
default = null
|
|
}
|
|
|
|
variable "kms_key_name" {
|
|
description = "To enable CMEK for a project logging bucket, set this field to a valid name. The associated service account requires cloudkms.cryptoKeyEncrypterDecrypter roles assigned for the key."
|
|
type = string
|
|
default = null
|
|
}
|
|
|
|
variable "location" {
|
|
description = "Location of the bucket."
|
|
type = string
|
|
default = "global"
|
|
}
|
|
|
|
variable "locked" {
|
|
description = "Whether the bucket is locked. Locked buckets may only be deleted if they are empty. This can only be set for project-level buckets."
|
|
type = bool
|
|
default = null
|
|
validation {
|
|
condition = var.parent_type == "project" || var.locked == null
|
|
error_message = "The 'locked' attribute can only be set for project-level buckets."
|
|
}
|
|
}
|
|
|
|
variable "log_analytics" {
|
|
description = "Enable and configure Analytics Log."
|
|
type = object({
|
|
enable = optional(bool, false)
|
|
dataset_link_id = optional(string)
|
|
description = optional(string, "Log Analytics Dataset")
|
|
})
|
|
nullable = false
|
|
default = {}
|
|
}
|
|
|
|
variable "name" {
|
|
description = "Name of the logging bucket."
|
|
type = string
|
|
}
|
|
|
|
variable "parent" {
|
|
description = "ID of the parent resource containing the bucket in the format 'project_id' 'folders/folder_id', 'organizations/organization_id' or 'billing_account_id'."
|
|
type = string
|
|
nullable = false
|
|
}
|
|
|
|
# parent type cannot be derived from parent id as that might be dynamic
|
|
|
|
variable "parent_type" {
|
|
description = "Parent object type for the bucket (project, folder, organization, billing_account)."
|
|
type = string
|
|
nullable = false
|
|
default = "project"
|
|
}
|
|
|
|
variable "retention" {
|
|
description = "Retention time in days for the logging bucket."
|
|
type = number
|
|
default = 30
|
|
}
|
|
|
|
variable "tag_bindings" {
|
|
description = "Tag bindings for this bucket, in key => tag value id format."
|
|
type = map(string)
|
|
default = {}
|
|
nullable = false
|
|
}
|
|
|
|
variable "views" {
|
|
description = "Log views for this bucket."
|
|
type = map(object({
|
|
filter = string
|
|
location = optional(string)
|
|
description = optional(string)
|
|
iam = optional(map(list(string)), {})
|
|
iam_bindings = optional(map(object({
|
|
members = list(string)
|
|
condition = optional(object({
|
|
expression = string
|
|
title = string
|
|
description = optional(string)
|
|
}))
|
|
})), {})
|
|
iam_bindings_additive = optional(map(object({
|
|
member = string
|
|
role = string
|
|
condition = optional(object({
|
|
expression = string
|
|
title = string
|
|
description = optional(string)
|
|
}))
|
|
})), {})
|
|
}))
|
|
default = {}
|
|
nullable = false
|
|
}
|