* 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>
180 lines
5.6 KiB
YAML
180 lines
5.6 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_compute_disk.disks["data-0"]:
|
|
architecture: null
|
|
async_primary_disk: []
|
|
create_snapshot_before_destroy: false
|
|
create_snapshot_before_destroy_prefix: null
|
|
description: null
|
|
disk_encryption_key:
|
|
- kms_key_self_link: projects/foo-prod-sec-core/locations/global/keyRings/prod-global-default/cryptoKeys/compute
|
|
kms_key_service_account: null
|
|
raw_key: null
|
|
rsa_encrypted_key: null
|
|
effective_labels:
|
|
disk_name: data-0
|
|
disk_type: pd-balanced
|
|
goog-terraform-provisioned: 'true'
|
|
image: null
|
|
labels:
|
|
disk_name: data-0
|
|
disk_type: pd-balanced
|
|
name: test-data-0
|
|
params: []
|
|
project: foo-test-0
|
|
size: 10
|
|
snapshot: null
|
|
source_disk: null
|
|
source_image_encryption_key: []
|
|
source_instant_snapshot: null
|
|
source_snapshot_encryption_key: []
|
|
source_storage_object: null
|
|
storage_pool: null
|
|
terraform_labels:
|
|
disk_name: data-0
|
|
disk_type: pd-balanced
|
|
goog-terraform-provisioned: 'true'
|
|
timeouts: null
|
|
type: pd-balanced
|
|
zone: europe-west8-a
|
|
google_compute_instance.default[0]:
|
|
advanced_machine_features: []
|
|
allow_stopping_for_update: true
|
|
attached_disk:
|
|
- device_name: data-0
|
|
disk_encryption_key_raw: null
|
|
disk_encryption_key_rsa: null
|
|
disk_encryption_service_account: null
|
|
force_attach: null
|
|
mode: READ_WRITE
|
|
source: test-data-0
|
|
boot_disk:
|
|
- auto_delete: true
|
|
disk_encryption_key_raw: null
|
|
disk_encryption_key_rsa: null
|
|
disk_encryption_service_account: null
|
|
force_attach: null
|
|
initialize_params:
|
|
- enable_confidential_compute: null
|
|
image: debian-cloud/debian-13
|
|
resource_manager_tags: null
|
|
size: 10
|
|
source_image_encryption_key: []
|
|
source_snapshot_encryption_key: []
|
|
storage_pool: null
|
|
type: pd-balanced
|
|
interface: null
|
|
kms_key_self_link: projects/foo-prod-sec-core/locations/global/keyRings/prod-global-default/cryptoKeys/compute
|
|
mode: READ_WRITE
|
|
can_ip_forward: false
|
|
deletion_protection: false
|
|
description: Managed by the compute-vm Terraform module.
|
|
desired_status: null
|
|
effective_labels:
|
|
goog-terraform-provisioned: 'true'
|
|
enable_display: false
|
|
hostname: null
|
|
instance_encryption_key: []
|
|
labels: null
|
|
machine_type: e2-micro
|
|
metadata: null
|
|
metadata_startup_script: null
|
|
name: test
|
|
network_interface:
|
|
- access_config:
|
|
- nat_ip: 35.10.10.10
|
|
public_ptr_domain_name: null
|
|
alias_ip_range: []
|
|
ipv6_access_config: []
|
|
network: projects/foo-dev-net-spoke-0/global/networks/dev-spoke-0
|
|
network_ip: 10.0.0.10
|
|
nic_type: null
|
|
queue_count: null
|
|
security_policy: null
|
|
subnetwork: projects/foo-dev-net-spoke-0/regions/europe-west1/subnetworks/gce
|
|
network_performance_config: []
|
|
params: []
|
|
partner_metadata: null
|
|
project: foo-test-0
|
|
resource_policies: null
|
|
scheduling:
|
|
- automatic_restart: true
|
|
availability_domain: null
|
|
graceful_shutdown: []
|
|
host_error_timeout_seconds: null
|
|
instance_termination_action: null
|
|
local_ssd_recovery_timeout: []
|
|
maintenance_interval: null
|
|
max_run_duration: []
|
|
min_node_cpus: null
|
|
node_affinities: []
|
|
on_host_maintenance: MIGRATE
|
|
on_instance_stop_action: []
|
|
preemptible: false
|
|
provisioning_model: STANDARD
|
|
termination_time: null
|
|
scratch_disk: []
|
|
service_account:
|
|
- scopes:
|
|
- https://www.googleapis.com/auth/devstorage.read_only
|
|
- https://www.googleapis.com/auth/logging.write
|
|
- https://www.googleapis.com/auth/monitoring.write
|
|
shielded_instance_config: []
|
|
tags: null
|
|
terraform_labels:
|
|
goog-terraform-provisioned: 'true'
|
|
timeouts: null
|
|
zone: europe-west8-a
|
|
google_compute_instance_iam_binding.default["$custom_roles:myrole_one"]:
|
|
condition: []
|
|
instance_name: test
|
|
members:
|
|
- group:test-group@example.com
|
|
project: foo-test-0
|
|
role: organizations/366118655033/roles/myRoleOne
|
|
zone: europe-west8-a
|
|
google_tags_location_tag_binding.disks["data-0/bar"]:
|
|
location: europe-west8-a
|
|
tag_value: tagValues/1234567891
|
|
timeouts: null
|
|
google_tags_location_tag_binding.disks["data-0/baz"]:
|
|
location: europe-west8-a
|
|
tag_value: tagValues/1234567890
|
|
timeouts: null
|
|
google_tags_location_tag_binding.disks["data-0/foo"]:
|
|
location: europe-west8-a
|
|
tag_value: foo-test-0/dynamic_test/cc-123
|
|
timeouts: null
|
|
google_tags_location_tag_binding.instance["bar"]:
|
|
location: europe-west8-a
|
|
tag_value: tagValues/1234567891
|
|
timeouts: null
|
|
google_tags_location_tag_binding.instance["baz"]:
|
|
location: europe-west8-a
|
|
tag_value: tagValues/1234567890
|
|
timeouts: null
|
|
google_tags_location_tag_binding.instance["foo"]:
|
|
location: europe-west8-a
|
|
tag_value: foo-test-0/dynamic_test/cc-123
|
|
timeouts: null
|
|
counts:
|
|
google_compute_disk: 1
|
|
google_compute_instance: 1
|
|
google_compute_instance_iam_binding: 1
|
|
google_tags_location_tag_binding: 6
|
|
modules: 0
|
|
resources: 9
|