* 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>
116 lines
4.2 KiB
HCL
116 lines
4.2 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 {
|
|
ctx = {
|
|
for k, v in var.context : k => {
|
|
for kk, vv in v : "${local.ctx_p}${k}:${kk}" => vv
|
|
} if !endswith(k, "_vars")
|
|
}
|
|
ctx_p = "$"
|
|
_folder_id = (
|
|
var.id == null
|
|
? null
|
|
: lookup(local.ctx.folder_ids, var.id, var.id)
|
|
)
|
|
folder_id = (
|
|
var.assured_workload_config == null
|
|
? (
|
|
var.folder_create
|
|
? coalesce(local._folder_id, try(google_folder.folder[0].id, ""))
|
|
: local._folder_id
|
|
)
|
|
: format("folders/%s", try(google_assured_workloads_workload.folder[0].resources[0].resource_id, ""))
|
|
)
|
|
folder_number = split("/", local.folder_id)[1]
|
|
aw_parent = (
|
|
# Assured Workload only accepts folder as a parent and uses organization as a parent when no value provided.
|
|
var.parent == null
|
|
? null
|
|
: (
|
|
try(startswith(var.parent, "folders/"))
|
|
? var.parent
|
|
: lookup(local.ctx.folder_ids, var.parent, null)
|
|
)
|
|
)
|
|
}
|
|
|
|
resource "google_folder" "folder" {
|
|
count = var.folder_create && var.assured_workload_config == null ? 1 : 0
|
|
display_name = var.name
|
|
parent = lookup(local.ctx.folder_ids, var.parent, var.parent)
|
|
deletion_protection = var.deletion_protection
|
|
}
|
|
|
|
resource "google_kms_autokey_config" "default" {
|
|
provider = google-beta
|
|
count = var.autokey_config != null ? 1 : 0
|
|
folder = local.folder_id
|
|
key_project = try(
|
|
"projects/${local.ctx.project_ids[var.autokey_config.project]}",
|
|
"projects/${local.ctx.project_numbers[var.autokey_config.project]}",
|
|
var.autokey_config.project
|
|
)
|
|
}
|
|
|
|
resource "google_essential_contacts_contact" "contact" {
|
|
provider = google-beta
|
|
for_each = var.contacts
|
|
parent = local.folder_id
|
|
email = lookup(
|
|
local.ctx.email_addresses, each.key, each.key
|
|
)
|
|
language_tag = "en"
|
|
notification_category_subscriptions = each.value
|
|
depends_on = [
|
|
google_folder_iam_binding.authoritative,
|
|
google_folder_iam_binding.bindings,
|
|
google_folder_iam_member.bindings
|
|
]
|
|
}
|
|
|
|
resource "google_compute_firewall_policy_association" "default" {
|
|
count = var.firewall_policy == null ? 0 : 1
|
|
attachment_target = local.folder_id
|
|
name = var.firewall_policy.name
|
|
firewall_policy = var.firewall_policy.policy
|
|
}
|
|
|
|
resource "google_assured_workloads_workload" "folder" {
|
|
count = (var.assured_workload_config != null && var.folder_create) ? 1 : 0
|
|
compliance_regime = var.assured_workload_config.compliance_regime
|
|
display_name = var.assured_workload_config.display_name
|
|
location = var.assured_workload_config.location
|
|
organization = templatestring(var.assured_workload_config.organization, var.context.condition_vars)
|
|
enable_sovereign_controls = var.assured_workload_config.enable_sovereign_controls
|
|
labels = var.assured_workload_config.labels
|
|
partner = var.assured_workload_config.partner
|
|
provisioned_resources_parent = local.aw_parent
|
|
dynamic "partner_permissions" {
|
|
for_each = try(var.assured_workload_config.partner_permissions, null) == null ? [] : [""]
|
|
content {
|
|
assured_workloads_monitoring = var.assured_workload_config.partner_permissions.assured_workloads_monitoring
|
|
data_logs_viewer = var.assured_workload_config.partner_permissions.data_logs_viewer
|
|
service_access_approver = var.assured_workload_config.partner_permissions.service_access_approver
|
|
}
|
|
}
|
|
resource_settings {
|
|
display_name = var.name
|
|
resource_type = "CONSUMER_FOLDER"
|
|
}
|
|
violation_notifications_enabled = var.assured_workload_config.violation_notifications_enabled
|
|
}
|