* 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>
146 lines
5.2 KiB
HCL
146 lines
5.2 KiB
HCL
/**
|
|
* Copyright 2024 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 = "$"
|
|
location = lookup(local.ctx.locations, var.location, var.location)
|
|
pool_id = try(
|
|
var.ca_pool_config.use_pool.id,
|
|
google_privateca_ca_pool.default[0].id
|
|
)
|
|
pool_name = reverse(split("/", local.pool_id))[0]
|
|
project_id = lookup(local.ctx.project_ids, var.project_id, var.project_id)
|
|
}
|
|
|
|
resource "google_privateca_ca_pool" "default" {
|
|
# setting existing pool id overrides creation
|
|
count = try(var.ca_pool_config.use_pool.id, null) != null ? 0 : 1
|
|
name = var.ca_pool_config.create_pool.name
|
|
project = local.project_id
|
|
location = local.location
|
|
tier = (
|
|
var.ca_pool_config.create_pool.enterprise_tier == true
|
|
? "ENTERPRISE"
|
|
: "DEVOPS"
|
|
)
|
|
}
|
|
|
|
resource "google_privateca_certificate_authority" "default" {
|
|
for_each = var.ca_configs
|
|
pool = local.pool_name
|
|
certificate_authority_id = each.key
|
|
project = local.project_id
|
|
location = local.location
|
|
type = (
|
|
each.value.is_self_signed == true
|
|
? "SELF_SIGNED"
|
|
: "SUBORDINATE"
|
|
)
|
|
deletion_protection = each.value.deletion_protection
|
|
lifetime = each.value.lifetime
|
|
pem_ca_certificate = each.value.pem_ca_certificate
|
|
ignore_active_certificates_on_deletion = each.value.ignore_active_certificates_on_deletion
|
|
skip_grace_period = each.value.skip_grace_period
|
|
gcs_bucket = try(
|
|
local.ctx.storage_buckets[each.value.gcs_bucket], each.value.gcs_bucket
|
|
)
|
|
labels = each.value.labels
|
|
|
|
config {
|
|
subject_config {
|
|
subject {
|
|
common_name = each.value.subject.common_name
|
|
country_code = each.value.subject.country_code
|
|
organizational_unit = each.value.subject.organizational_unit
|
|
locality = each.value.subject.locality
|
|
organization = each.value.subject.organization
|
|
province = each.value.subject.province
|
|
street_address = each.value.subject.street_address
|
|
postal_code = each.value.subject.postal_code
|
|
}
|
|
dynamic "subject_alt_name" {
|
|
for_each = each.value.subject_alt_name != null ? [1] : []
|
|
content {
|
|
dns_names = each.value.subject_alt_name.dns_names
|
|
email_addresses = each.value.subject_alt_name.email_addresses
|
|
ip_addresses = each.value.subject_alt_name.ip_addresses
|
|
uris = each.value.subject_alt_name.uris
|
|
}
|
|
}
|
|
}
|
|
x509_config {
|
|
ca_options {
|
|
is_ca = each.value.is_ca
|
|
}
|
|
key_usage {
|
|
base_key_usage {
|
|
cert_sign = each.value.key_usage.cert_sign
|
|
content_commitment = each.value.key_usage.content_commitment
|
|
crl_sign = each.value.key_usage.crl_sign
|
|
data_encipherment = each.value.key_usage.data_encipherment
|
|
decipher_only = each.value.key_usage.decipher_only
|
|
digital_signature = each.value.key_usage.digital_signature
|
|
encipher_only = each.value.key_usage.encipher_only
|
|
key_agreement = each.value.key_usage.key_agreement
|
|
key_encipherment = each.value.key_usage.key_encipherment
|
|
}
|
|
extended_key_usage {
|
|
client_auth = each.value.key_usage.client_auth
|
|
code_signing = each.value.key_usage.code_signing
|
|
email_protection = each.value.key_usage.email_protection
|
|
ocsp_signing = each.value.key_usage.ocsp_signing
|
|
server_auth = each.value.key_usage.server_auth
|
|
time_stamping = each.value.key_usage.time_stamping
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
key_spec {
|
|
# only one of `key_spec.0.algorithm,key_spec.0.cloud_kms_key_version` can be specified
|
|
algorithm = (
|
|
try(each.value.key_spec.kms_key_id, null) != null
|
|
? null
|
|
: each.value.key_spec.algorithm
|
|
)
|
|
cloud_kms_key_version = try(
|
|
local.ctx.kms_keys[each.value.key_spec.kms_key_id],
|
|
each.value.key_spec.kms_key_id
|
|
)
|
|
}
|
|
|
|
dynamic "subordinate_config" {
|
|
for_each = each.value.subordinate_config != null ? [1] : []
|
|
content {
|
|
certificate_authority = each.value.subordinate_config.root_ca_id
|
|
dynamic "pem_issuer_chain" {
|
|
for_each = (
|
|
each.value.subordinate_config.pem_issuer_certificates != null
|
|
? [1] : []
|
|
)
|
|
content {
|
|
pem_certificates = each.value.subordinate_config.pem_issuer_certificates
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|