Skip to content

Commit

Permalink
Fix name regexes
Browse files Browse the repository at this point in the history
  • Loading branch information
@danischm
danischm committed Feb 21, 2024
1 parent 88ec49c commit c9a1283
Show file tree
Hide file tree
Showing 122 changed files with 952 additions and 952 deletions.
12 changes: 6 additions & 6 deletions modules/terraform-aci-aaa/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ variable "default_login_domain" {
default = ""

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.default_login_domain))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.default_login_domain))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -54,8 +54,8 @@ variable "console_login_domain" {
default = ""

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.console_login_domain))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.console_login_domain))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -77,9 +77,9 @@ variable "security_domains" {

validation {
condition = alltrue([
for sd in var.security_domains : can(regex("^[a-zA-Z0-9_.-]{0,64}$", sd.name))
for sd in var.security_domains : can(regex("^[a-zA-Z0-9_.:-]{0,64}$", sd.name))
])
error_message = "`name`: Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
error_message = "`name`: Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand Down
28 changes: 14 additions & 14 deletions modules/terraform-aci-aaep/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ variable "name" {
type = string

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.name))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.name))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -26,9 +26,9 @@ variable "physical_domains" {

validation {
condition = alltrue([
for pd in var.physical_domains : can(regex("^[a-zA-Z0-9_.-]{0,64}$", pd))
for pd in var.physical_domains : can(regex("^[a-zA-Z0-9_.:-]{0,64}$", pd))
])
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -39,9 +39,9 @@ variable "routed_domains" {

validation {
condition = alltrue([
for rd in var.routed_domains : can(regex("^[a-zA-Z0-9_.-]{0,64}$", rd))
for rd in var.routed_domains : can(regex("^[a-zA-Z0-9_.:-]{0,64}$", rd))
])
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -52,9 +52,9 @@ variable "vmware_vmm_domains" {

validation {
condition = alltrue([
for vmwd in var.vmware_vmm_domains : can(regex("^[a-zA-Z0-9_.-]{0,64}$", vmwd))
for vmwd in var.vmware_vmm_domains : can(regex("^[a-zA-Z0-9_.:-]{0,64}$", vmwd))
])
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -74,23 +74,23 @@ variable "endpoint_groups" {

validation {
condition = alltrue([
for epg in var.endpoint_groups : can(regex("^[a-zA-Z0-9_.-]{0,64}$", epg.tenant))
for epg in var.endpoint_groups : can(regex("^[a-zA-Z0-9_.:-]{0,64}$", epg.tenant))
])
error_message = "`tenant`: Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
error_message = "`tenant`: Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}

validation {
condition = alltrue([
for epg in var.endpoint_groups : can(regex("^[a-zA-Z0-9_.-]{0,64}$", epg.application_profile))
for epg in var.endpoint_groups : can(regex("^[a-zA-Z0-9_.:-]{0,64}$", epg.application_profile))
])
error_message = "`application_profile`: Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
error_message = "`application_profile`: Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}

validation {
condition = alltrue([
for epg in var.endpoint_groups : can(regex("^[a-zA-Z0-9_.-]{0,64}$", epg.endpoint_group))
for epg in var.endpoint_groups : can(regex("^[a-zA-Z0-9_.:-]{0,64}$", epg.endpoint_group))
])
error_message = "`endpoint_group`: Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
error_message = "`endpoint_group`: Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}

validation {
Expand Down
4 changes: 2 additions & 2 deletions modules/terraform-aci-access-fex-interface-profile/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ variable "name" {
type = string

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.name))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.name))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}
16 changes: 8 additions & 8 deletions modules/terraform-aci-access-fex-interface-selector/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ variable "interface_profile" {
type = string

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.interface_profile))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.interface_profile))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -13,8 +13,8 @@ variable "name" {
type = string

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.name))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.name))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -35,8 +35,8 @@ variable "policy_group" {
default = ""

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.policy_group))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.policy_group))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -54,9 +54,9 @@ variable "port_blocks" {

validation {
condition = alltrue([
for pb in var.port_blocks : can(regex("^[a-zA-Z0-9_.-]{0,64}$", pb.name))
for pb in var.port_blocks : can(regex("^[a-zA-Z0-9_.:-]{0,64}$", pb.name))
])
error_message = "`name`: Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
error_message = "`name`: Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}

validation {
Expand Down
40 changes: 20 additions & 20 deletions modules/terraform-aci-access-leaf-interface-policy-group/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ variable "link_level_policy" {
default = ""

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.link_level_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.link_level_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -58,8 +58,8 @@ variable "cdp_policy" {
default = ""

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.cdp_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.cdp_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -69,8 +69,8 @@ variable "lldp_policy" {
default = ""

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.lldp_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.lldp_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -80,8 +80,8 @@ variable "spanning_tree_policy" {
default = ""

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.spanning_tree_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.spanning_tree_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -91,8 +91,8 @@ variable "mcp_policy" {
default = ""

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.mcp_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.mcp_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -102,8 +102,8 @@ variable "l2_policy" {
default = ""

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.l2_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.l2_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -113,8 +113,8 @@ variable "storm_control_policy" {
default = ""

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.storm_control_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.storm_control_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -124,8 +124,8 @@ variable "port_channel_policy" {
default = ""

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.port_channel_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.port_channel_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -135,8 +135,8 @@ variable "port_channel_member_policy" {
default = ""

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.port_channel_member_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.port_channel_member_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -146,8 +146,8 @@ variable "aaep" {
default = ""

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.aaep))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.aaep))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

4 changes: 2 additions & 2 deletions modules/terraform-aci-access-leaf-interface-profile/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ variable "name" {
type = string

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.name))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.name))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}
8 changes: 4 additions & 4 deletions modules/terraform-aci-access-leaf-switch-policy-group/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ variable "name" {
type = string

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.name))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.name))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -14,7 +14,7 @@ variable "forwarding_scale_policy" {
default = ""

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.forwarding_scale_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.forwarding_scale_policy))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}
20 changes: 10 additions & 10 deletions modules/terraform-aci-access-leaf-switch-profile/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ variable "name" {
type = string

validation {
condition = can(regex("^[a-zA-Z0-9_.-]{0,64}$", var.name))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
condition = can(regex("^[a-zA-Z0-9_.:-]{0,64}$", var.name))
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -15,9 +15,9 @@ variable "interface_profiles" {

validation {
condition = alltrue([
for ip in var.interface_profiles : can(regex("^[a-zA-Z0-9_.-]{0,64}$", ip))
for ip in var.interface_profiles : can(regex("^[a-zA-Z0-9_.:-]{0,64}$", ip))
])
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
error_message = "Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}
}

Expand All @@ -36,23 +36,23 @@ variable "selectors" {

validation {
condition = alltrue([
for s in var.selectors : can(regex("^[a-zA-Z0-9_.-]{0,64}$", s.name))
for s in var.selectors : can(regex("^[a-zA-Z0-9_.:-]{0,64}$", s.name))
])
error_message = "`name`: Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
error_message = "`name`: Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}

validation {
condition = alltrue([
for s in var.selectors : s.policy_group == null || can(regex("^[a-zA-Z0-9_.-]{0,64}$", s.policy_group))
for s in var.selectors : s.policy_group == null || can(regex("^[a-zA-Z0-9_.:-]{0,64}$", s.policy_group))
])
error_message = "`policy_group`: Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
error_message = "`policy_group`: Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}

validation {
condition = alltrue(flatten([
for s in var.selectors : [for nb in coalesce(s.node_blocks, []) : can(regex("^[a-zA-Z0-9_.-]{0,64}$", nb.name))]
for s in var.selectors : [for nb in coalesce(s.node_blocks, []) : can(regex("^[a-zA-Z0-9_.:-]{0,64}$", nb.name))]
]))
error_message = "`node_blocks.name`: Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `-`. Maximum characters: 64."
error_message = "`node_blocks.name`: Allowed characters: `a`-`z`, `A`-`Z`, `0`-`9`, `_`, `.`, `:`, `-`. Maximum characters: 64."
}

validation {
Expand Down
Loading

0 comments on commit c9a1283

Please sign in to comment.