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>
70 lines
2.3 KiB
YAML
70 lines
2.3 KiB
YAML
# 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.
|
|
|
|
values:
|
|
google_bigquery_dataset.default:
|
|
dataset_id: dataset_0
|
|
default_encryption_configuration:
|
|
- kms_key_name: projects/366118655033/locations/europe-west8/keyRings/mykeyring/cryptoKeys/mykey
|
|
default_partition_expiration_ms: null
|
|
default_table_expiration_ms: null
|
|
delete_contents_on_destroy: false
|
|
description: Terraform managed.
|
|
effective_labels:
|
|
goog-terraform-provisioned: 'true'
|
|
external_catalog_dataset_options: []
|
|
external_dataset_reference: []
|
|
friendly_name: null
|
|
labels: null
|
|
location: europe-west8
|
|
max_time_travel_hours: '168'
|
|
project: foo-test-0
|
|
resource_tags: null
|
|
terraform_labels:
|
|
goog-terraform-provisioned: 'true'
|
|
timeouts: null
|
|
google_bigquery_dataset_iam_binding.authoritative["$custom_roles:myrole_one"]:
|
|
condition: []
|
|
dataset_id: dataset_0
|
|
members:
|
|
- user:test-user@example.com
|
|
project: foo-test-0
|
|
role: organizations/366118655033/roles/myRoleOne
|
|
google_bigquery_dataset_iam_binding.authoritative["roles/viewer"]:
|
|
condition: []
|
|
dataset_id: dataset_0
|
|
members:
|
|
- serviceAccount:test@test-project.iam.gserviceaccount.com
|
|
project: foo-test-0
|
|
role: roles/viewer
|
|
google_tags_location_tag_binding.binding["bar"]:
|
|
location: europe-west8
|
|
tag_value: tagValues/1234567891
|
|
timeouts: null
|
|
google_tags_location_tag_binding.binding["baz"]:
|
|
location: europe-west8
|
|
tag_value: tagValues/1234567890
|
|
timeouts: null
|
|
google_tags_location_tag_binding.binding["foo"]:
|
|
location: europe-west8
|
|
tag_value: foo-test-0/dynamic_test/cc-123
|
|
timeouts: null
|
|
|
|
counts:
|
|
google_bigquery_dataset: 1
|
|
google_bigquery_dataset_iam_binding: 2
|
|
google_tags_location_tag_binding: 3
|
|
modules: 0
|
|
resources: 6
|