From 7fbff7e4e3279bcf9610aea101bbd45442522e77 Mon Sep 17 00:00:00 2001 From: Doug Byrd Date: Wed, 20 Mar 2024 21:07:33 -0400 Subject: [PATCH] Add descriptions to terraform-aci-aaep (#56) --- aci_access_policies.tf | 1 + modules/terraform-aci-aaep/examples/complete/main.tf | 1 + modules/terraform-aci-aaep/main.tf | 1 + modules/terraform-aci-aaep/variables.tf | 11 +++++++++++ 4 files changed, 14 insertions(+) diff --git a/aci_access_policies.tf b/aci_access_policies.tf index a8ec0542..d4a47105 100644 --- a/aci_access_policies.tf +++ b/aci_access_policies.tf @@ -47,6 +47,7 @@ module "aci_aaep" { for_each = { for aaep in try(local.access_policies.aaeps, []) : aaep.name => aaep if local.modules.aci_aaep && var.manage_access_policies } name = "${each.value.name}${local.defaults.apic.access_policies.aaeps.name_suffix}" + description = try(each.value.description, "") infra_vlan = try(each.value.infra_vlan, local.defaults.apic.access_policies.aaeps.infra_vlan) == true ? try(local.access_policies.infra_vlan, 0) : 0 physical_domains = [for dom in try(each.value.physical_domains, []) : "${dom}${local.defaults.apic.access_policies.physical_domains.name_suffix}"] routed_domains = [for dom in try(each.value.routed_domains, []) : "${dom}${local.defaults.apic.access_policies.routed_domains.name_suffix}"] diff --git a/modules/terraform-aci-aaep/examples/complete/main.tf b/modules/terraform-aci-aaep/examples/complete/main.tf index 22b3ee53..66aa0d41 100644 --- a/modules/terraform-aci-aaep/examples/complete/main.tf +++ b/modules/terraform-aci-aaep/examples/complete/main.tf @@ -3,6 +3,7 @@ module "aci_aaep" { version = ">= 0.8.0" name = "AAEP1" + description = "AAEP1 Description" infra_vlan = 10 physical_domains = ["PD1"] routed_domains = ["RD1"] diff --git a/modules/terraform-aci-aaep/main.tf b/modules/terraform-aci-aaep/main.tf index f9fd1362..b8f07bae 100644 --- a/modules/terraform-aci-aaep/main.tf +++ b/modules/terraform-aci-aaep/main.tf @@ -10,6 +10,7 @@ resource "aci_rest_managed" "infraAttEntityP" { class_name = "infraAttEntityP" content = { name = var.name + descr = var.description } } diff --git a/modules/terraform-aci-aaep/variables.tf b/modules/terraform-aci-aaep/variables.tf index 880984a7..f731fc3a 100644 --- a/modules/terraform-aci-aaep/variables.tf +++ b/modules/terraform-aci-aaep/variables.tf @@ -8,6 +8,17 @@ variable "name" { } } +variable "description" { + description = "Attachable access entity profile description" + type = string + default = "" + + validation { + condition = can(regex("^[a-zA-Z0-9\\!#$%()*,-./:;@ _{|}~?&+]{0,128}$", var.description)) + error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `\\`, `!`, `#`, `$`, `%`, `(`, `)`, `*`, `,`, `-`, `.`, `/`, `:`, `;`, `@`, ` `, `_`, `{`, `|`, }`, `~`, `?`, `&`, `+`. Maximum characters: 128." + } +} + variable "infra_vlan" { description = "Infrastructure vlan ID. A vlan ID of `0` disables the infrastructure vlan. Minimum value: 0. Maximum value: 4096." type = number