Merge pull request #22 from gfortil/HPCC-29321

HPCC-29321 Stop users from using hpccdemo as a tag.
hpcc-systems · Apr 17, 2023 · 9e2bdcb · 9e2bdcb
2 parents df988b5 + 8fe51e0
commit 9e2bdcb
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/modules/storage_accounts/variables.tf b/modules/storage_accounts/variables.tf
@@ -4,6 +4,17 @@ variable "admin" {
     name  = string
     email = string
   })
+
+  validation {
+    condition = try(
+      regex("hpccdemo", var.admin.name) != "hpccdemo", true
+      ) && try(
+      regex("hpccdemo", var.admin.email) != "hpccdemo", true
+      ) && try(
+      regex("@example.com", var.admin.email) != "@example.com", true
+    )
+    error_message = "Your name and email are required in the admin block and must not contain hpccdemo or @example.com."
+  }
 }
 
 variable "disable_naming_conventions" {

diff --git a/modules/virtual_network/variables.tf b/modules/virtual_network/variables.tf
@@ -4,6 +4,17 @@ variable "admin" {
     name  = string
     email = string
   })
+
+  validation {
+    condition = try(
+      regex("hpccdemo", var.admin.name) != "hpccdemo", true
+      ) && try(
+      regex("hpccdemo", var.admin.email) != "hpccdemo", true
+      ) && try(
+      regex("@example.com", var.admin.email) != "@example.com", true
+    )
+    error_message = "Your name and email are required in the admin block and must not contain hpccdemo or @example.com."
+  }
 }
 
 variable "disable_naming_conventions" {

diff --git a/variables.tf b/variables.tf
@@ -4,6 +4,17 @@ variable "admin" {
     name  = string
     email = string
   })
+
+  validation {
+    condition = try(
+      regex("hpccdemo", var.admin.name) != "hpccdemo", true
+      ) && try(
+      regex("hpccdemo", var.admin.email) != "hpccdemo", true
+      ) && try(
+      regex("@example.com", var.admin.email) != "@example.com", true
+    )
+    error_message = "Your name and email are required in the admin block and must not contain hpccdemo or @example.com."
+  }
 }
 
 variable "expose_services" {