From a7428e8cff2a08368047b73233c5a1a1d8e8a07f Mon Sep 17 00:00:00 2001 From: Eytan Naim Date: Tue, 28 May 2024 15:18:12 +0300 Subject: [PATCH] wip --- .../installation/dsf_single_account_deployment/variables.tf | 2 +- examples/aws/poc/dsf_deployment/variables.tf | 2 +- examples/azure/poc/dsf_deployment/variables.tf | 2 +- modules/aws/agent-gw/variables.tf | 2 +- modules/aws/dam-base-instance/variables.tf | 3 +-- modules/aws/mx/variables.tf | 2 +- modules/azurerm/agent-gw/variables.tf | 2 +- modules/azurerm/dam-base-instance/variables.tf | 3 +-- modules/azurerm/mx/variables.tf | 2 +- 9 files changed, 9 insertions(+), 11 deletions(-) diff --git a/examples/aws/installation/dsf_single_account_deployment/variables.tf b/examples/aws/installation/dsf_single_account_deployment/variables.tf index eed22e63f..032c245f3 100644 --- a/examples/aws/installation/dsf_single_account_deployment/variables.tf +++ b/examples/aws/installation/dsf_single_account_deployment/variables.tf @@ -463,7 +463,7 @@ variable "dam_version" { description = "The DAM version to install" default = "14.15.1.10" validation { - condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,2}$", var.dam_version)) + condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,3}$", var.dam_version)) error_message = "Version must be in the format dd.dd.dd.dd where each dd is a number between 1-99 (e.g 14.10.1.10)" } } diff --git a/examples/aws/poc/dsf_deployment/variables.tf b/examples/aws/poc/dsf_deployment/variables.tf index c8d3f405d..8e755ae50 100644 --- a/examples/aws/poc/dsf_deployment/variables.tf +++ b/examples/aws/poc/dsf_deployment/variables.tf @@ -125,7 +125,7 @@ variable "dam_version" { description = "The DAM version to install" default = "14.15.1.10" validation { - condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,2}$", var.dam_version)) + condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,3}$", var.dam_version)) error_message = "Version must be in the format dd.dd.dd.dd where each dd is a number between 1-99 (e.g 14.10.1.10)" } } diff --git a/examples/azure/poc/dsf_deployment/variables.tf b/examples/azure/poc/dsf_deployment/variables.tf index f9f8e4c2d..a25f7e403 100644 --- a/examples/azure/poc/dsf_deployment/variables.tf +++ b/examples/azure/poc/dsf_deployment/variables.tf @@ -120,7 +120,7 @@ variable "dam_version" { description = "The DAM version to install" default = "14.15.1.10" validation { - condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,2}$", var.dam_version)) + condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,3}$", var.dam_version)) error_message = "Version must be in the format dd.dd.dd.dd where each dd is a number between 1-99 (e.g 14.10.1.10)" } } diff --git a/modules/aws/agent-gw/variables.tf b/modules/aws/agent-gw/variables.tf index 2f9e757fb..a7d935cc1 100644 --- a/modules/aws/agent-gw/variables.tf +++ b/modules/aws/agent-gw/variables.tf @@ -178,7 +178,7 @@ variable "dam_version" { type = string description = "The DAM version to install" validation { - condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,2}$", var.dam_version)) + condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,3}$", var.dam_version)) error_message = "Version must be in the format dd.dd.dd.dd where each dd is a number between 1-99 (e.g 14.10.1.10)" } validation { diff --git a/modules/aws/dam-base-instance/variables.tf b/modules/aws/dam-base-instance/variables.tf index 60d50ef23..560a01d8f 100644 --- a/modules/aws/dam-base-instance/variables.tf +++ b/modules/aws/dam-base-instance/variables.tf @@ -150,10 +150,9 @@ variable "user_data_commands" { variable "dam_version" { type = string description = "The DAM version to install" - default = "14.13.1.10" nullable = false validation { - condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,2}$", var.dam_version)) + condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,3}$", var.dam_version)) error_message = "Version must be in the format dd.dd.dd.dd where each dd is a number between 1-99 (e.g 14.10.1.10)" } } diff --git a/modules/aws/mx/variables.tf b/modules/aws/mx/variables.tf index ea59a33f4..45fa8ebe3 100644 --- a/modules/aws/mx/variables.tf +++ b/modules/aws/mx/variables.tf @@ -178,7 +178,7 @@ variable "dam_version" { type = string description = "The DAM version to install" validation { - condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,2}$", var.dam_version)) + condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,3}$", var.dam_version)) error_message = "Version must be in the format dd.dd.dd.dd where each dd is a number between 1-99 (e.g 14.10.1.10)." } validation { diff --git a/modules/azurerm/agent-gw/variables.tf b/modules/azurerm/agent-gw/variables.tf index 219f9477d..167639f52 100644 --- a/modules/azurerm/agent-gw/variables.tf +++ b/modules/azurerm/agent-gw/variables.tf @@ -160,7 +160,7 @@ variable "dam_version" { type = string description = "The DAM version to install" validation { - condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,2}$", var.dam_version)) + condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,3}$", var.dam_version)) error_message = "Version must be in the format dd.dd.dd.dd where each dd is a number between 1-99 (e.g 14.10.1.10)" } validation { diff --git a/modules/azurerm/dam-base-instance/variables.tf b/modules/azurerm/dam-base-instance/variables.tf index 315dfda16..7e654346b 100644 --- a/modules/azurerm/dam-base-instance/variables.tf +++ b/modules/azurerm/dam-base-instance/variables.tf @@ -97,10 +97,9 @@ variable "custom_scripts" { variable "dam_version" { type = string description = "The DAM version to install" - default = "14.13.1.10" nullable = false validation { - condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,2}$", var.dam_version)) + condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,3}$", var.dam_version)) error_message = "Version must be in the format dd.dd.dd.dd where each dd is a number between 1-99 (e.g 14.10.1.10)" } } diff --git a/modules/azurerm/mx/variables.tf b/modules/azurerm/mx/variables.tf index d6f9a7d35..4f9fcb74e 100644 --- a/modules/azurerm/mx/variables.tf +++ b/modules/azurerm/mx/variables.tf @@ -160,7 +160,7 @@ variable "dam_version" { type = string description = "The DAM version to install" validation { - condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,2}$", var.dam_version)) + condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,3}$", var.dam_version)) error_message = "Version must be in the format dd.dd.dd.dd where each dd is a number between 1-99 (e.g 14.10.1.10)." } validation {