* 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>
187 lines
7.0 KiB
HCL
187 lines
7.0 KiB
HCL
/**
|
|
* Copyright 2023 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 = "$"
|
|
workstation_configs = merge(
|
|
var.workstation_configs, local.f_workstation_configs
|
|
)
|
|
workstations = merge(flatten([
|
|
for k1, v1 in local.workstation_configs : {
|
|
for k2, v2 in v1.workstations : "${k1}-${k2}" => merge({
|
|
workstation_config_id = k1
|
|
workstation_id = k2
|
|
}, v2)
|
|
}
|
|
])...)
|
|
}
|
|
|
|
resource "google_workstations_workstation_cluster" "cluster" {
|
|
provider = google-beta
|
|
workstation_cluster_id = var.id
|
|
project = lookup(
|
|
local.ctx.project_ids, var.project_id, var.project_id
|
|
)
|
|
display_name = var.display_name
|
|
location = lookup(
|
|
local.ctx.locations, var.location, var.location
|
|
)
|
|
network = lookup(
|
|
local.ctx.networks, var.network_config.network, var.network_config.network
|
|
)
|
|
subnetwork = lookup(
|
|
local.ctx.subnetworks, var.network_config.subnetwork, var.network_config.subnetwork
|
|
)
|
|
annotations = var.annotations
|
|
labels = var.labels
|
|
dynamic "private_cluster_config" {
|
|
for_each = var.private_cluster_config == null ? [] : [""]
|
|
content {
|
|
enable_private_endpoint = var.private_cluster_config.enable_private_endpoint
|
|
allowed_projects = var.private_cluster_config.allowed_projects
|
|
}
|
|
}
|
|
dynamic "domain_config" {
|
|
for_each = var.domain == null ? [] : [""]
|
|
content {
|
|
domain = var.domain
|
|
}
|
|
}
|
|
}
|
|
|
|
resource "google_workstations_workstation_config" "configs" {
|
|
for_each = local.workstation_configs
|
|
provider = google-beta
|
|
project = google_workstations_workstation_cluster.cluster.project
|
|
location = google_workstations_workstation_cluster.cluster.location
|
|
workstation_cluster_id = google_workstations_workstation_cluster.cluster.workstation_cluster_id
|
|
workstation_config_id = each.key
|
|
annotations = each.value.annotations
|
|
display_name = each.value.display_name
|
|
labels = each.value.labels
|
|
max_usable_workstations = each.value.max_workstations
|
|
replica_zones = each.value.replica_zones
|
|
idle_timeout = (
|
|
try(each.value.timeouts.idle, null) == null
|
|
? null
|
|
: "${each.value.timeouts.idle}s"
|
|
)
|
|
running_timeout = (
|
|
try(each.value.timeouts.running, null) == null
|
|
? null :
|
|
"${each.value.timeouts.running}s"
|
|
)
|
|
dynamic "host" {
|
|
for_each = each.value.gce_instance == null ? [] : [""]
|
|
content {
|
|
gce_instance {
|
|
machine_type = each.value.gce_instance.machine_type
|
|
service_account = each.value.gce_instance.service_account == null ? null : lookup(
|
|
local.ctx.iam_principals,
|
|
each.value.gce_instance.service_account,
|
|
each.value.gce_instance.service_account
|
|
)
|
|
service_account_scopes = each.value.gce_instance.service_account_scopes
|
|
pool_size = each.value.gce_instance.pool_size
|
|
boot_disk_size_gb = each.value.gce_instance.boot_disk_size_gb
|
|
tags = each.value.gce_instance.tags
|
|
disable_public_ip_addresses = each.value.gce_instance.disable_public_ip_addresses
|
|
enable_nested_virtualization = each.value.gce_instance.enable_nested_virtualization
|
|
dynamic "shielded_instance_config" {
|
|
for_each = each.value.gce_instance.shielded_instance_config == null ? [] : [""]
|
|
content {
|
|
enable_secure_boot = each.value.gce_instance.shielded_instance_config.enable_secure_boot
|
|
enable_vtpm = each.value.gce_instance.shielded_instance_config.enable_vtpm
|
|
enable_integrity_monitoring = each.value.gce_instance.shielded_instance_config.enable_integrity_monitoring
|
|
}
|
|
}
|
|
dynamic "confidential_instance_config" {
|
|
for_each = each.value.gce_instance.enable_confidential_compute ? [""] : []
|
|
content {
|
|
enable_confidential_compute = true
|
|
}
|
|
}
|
|
dynamic "accelerators" {
|
|
for_each = each.value.gce_instance.accelerators
|
|
content {
|
|
type = accelerators.value.type
|
|
count = accelerators.value.count
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
dynamic "container" {
|
|
for_each = each.value.container == null ? [] : [""]
|
|
content {
|
|
image = each.value.container.image
|
|
command = each.value.container.command
|
|
args = each.value.container.args
|
|
working_dir = each.value.container.working_dir
|
|
env = each.value.container.env
|
|
run_as_user = each.value.container.run_as_user
|
|
}
|
|
}
|
|
dynamic "encryption_key" {
|
|
for_each = each.value.encryption_key == null ? [] : [""]
|
|
content {
|
|
kms_key = each.value.encryption_key.kms_key
|
|
kms_key_service_account = (
|
|
each.value.encryption_key.kms_key_service_account == null
|
|
? null
|
|
: lookup(
|
|
local.ctx.iam_principals,
|
|
each.value.encryption_key.kms_key_service_account,
|
|
each.value.encryption_key.kms_key_service_account
|
|
)
|
|
)
|
|
}
|
|
}
|
|
dynamic "persistent_directories" {
|
|
for_each = each.value.persistent_directories
|
|
content {
|
|
mount_path = persistent_directories.value.mount_path
|
|
dynamic "gce_pd" {
|
|
for_each = persistent_directories.value.gce_pd == null ? [] : [""]
|
|
content {
|
|
size_gb = persistent_directories.value.gce_pd.size_gb
|
|
fs_type = persistent_directories.value.gce_pd.fs_type
|
|
disk_type = persistent_directories.value.gce_pd.disk_type
|
|
reclaim_policy = persistent_directories.value.gce_pd.reclaim_policy
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
resource "google_workstations_workstation" "workstations" {
|
|
provider = google-beta
|
|
for_each = local.workstations
|
|
project = google_workstations_workstation_cluster.cluster.project
|
|
workstation_id = each.value.workstation_id
|
|
workstation_config_id = google_workstations_workstation_config.configs[each.value.workstation_config_id].workstation_config_id
|
|
workstation_cluster_id = google_workstations_workstation_cluster.cluster.workstation_cluster_id
|
|
location = google_workstations_workstation_cluster.cluster.location
|
|
labels = each.value.labels
|
|
env = each.value.env
|
|
annotations = each.value.annotations
|
|
}
|