2eaa0d5e27
* 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>
91 lines
3.1 KiB
HCL
91 lines
3.1 KiB
HCL
/**
|
|
* Copyright 2025 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.
|
|
*/
|
|
|
|
locals {
|
|
_tag_template_regional = (
|
|
"//secretmanager.googleapis.com/projects/%s/locations/%s/secrets/%s"
|
|
)
|
|
}
|
|
|
|
resource "google_secret_manager_regional_secret" "default" {
|
|
for_each = { for k, v in var.secrets : k => v if v.location != null }
|
|
project = local.project_id
|
|
location = lookup(
|
|
local.ctx.locations, each.value.location, each.value.location
|
|
)
|
|
secret_id = each.key
|
|
labels = each.value.labels
|
|
annotations = each.value.annotations
|
|
version_aliases = try(each.value.version_config.aliases, null)
|
|
version_destroy_ttl = try(each.value.version_config.destroy_ttl, null)
|
|
expire_time = try(each.value.expiration_config.time, null)
|
|
ttl = try(each.value.expiration_config.ttl, null)
|
|
tags = each.value.tags
|
|
deletion_protection = each.value.deletion_protection
|
|
dynamic "customer_managed_encryption" {
|
|
for_each = each.value.kms_key == null ? [] : [""]
|
|
content {
|
|
kms_key_name = lookup(
|
|
local.ctx.kms_keys, each.value.kms_key, each.value.kms_key
|
|
)
|
|
}
|
|
}
|
|
# dynamic "rotation" {
|
|
# for_each = try(each.value.rotation_config, null) == null ? [] : [""]
|
|
# content {
|
|
# next_rotation_time = each.value.rotation_config.next_time
|
|
# rotation_period = each.value.rotation_config.period
|
|
# }
|
|
# }
|
|
# topics
|
|
lifecycle {
|
|
ignore_changes = [
|
|
rotation[0].next_rotation_time
|
|
]
|
|
}
|
|
}
|
|
|
|
resource "google_secret_manager_regional_secret_version" "default" {
|
|
for_each = {
|
|
for v in local.versions :
|
|
"${v.secret}/${v.version}" => v if v.location != null
|
|
}
|
|
secret = google_secret_manager_regional_secret.default[each.value.secret].id
|
|
deletion_policy = each.value.deletion_policy
|
|
enabled = each.value.enabled
|
|
is_secret_data_base64 = try(
|
|
each.value.data_config.is_base64, false
|
|
)
|
|
secret_data = (
|
|
try(each.value.data_config.is_file, null) == true
|
|
? file(each.value.data)
|
|
: each.value.data
|
|
)
|
|
}
|
|
|
|
|
|
resource "google_tags_location_tag_binding" "binding" {
|
|
for_each = { for k, v in local.tag_bindings : k => v if v.location != null }
|
|
parent = format(
|
|
local._tag_template_regional,
|
|
local.tag_project,
|
|
lookup(local.ctx.locations, each.value.location, each.value.location),
|
|
google_secret_manager_regional_secret.default[each.value.secret].secret_id
|
|
)
|
|
location = lookup(local.ctx.locations, each.value.location, each.value.location)
|
|
tag_value = templatestring(local._tag_bindings[each.key], var.context.tag_vars)
|
|
}
|