wip

imperva · May 28, 2024 · a7428e8 · a7428e8
1 parent 3d46717
commit a7428e8
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {