more vars

SCT-Engineering · Feb 19, 2025 · 072c516 · 072c516
1 parent f41952d
commit 072c516
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/tests/test_helpers.go b/tests/test_helpers.go
@@ -11,8 +11,8 @@ var commonVars = map[string]interface{}{
 	"cluster_name":                      "test-cluster",
 	"operators_ns":                      "operators",
 	"tags": map[string]string{
-		"testEnvironment": "testValue",
-		"testProject": "testCluster",
+		"Environment": "testValue",
+		"Project": "testCluster",
 	},
 	"subnets":                          []string{"subnet-mock-1", "subnet-mock-2"},
 	"vpc_id":                           "vpc-mock",

diff --git a/variables.tf b/variables.tf
@@ -69,11 +69,11 @@ variable "tags" {
       length(v) <= 256 &&
       (
         # Allow either production format or test format
-        (can(regex("^[\\w\\s+=.@-]*$", k)) && can(regex("^[\\w\\s+=.@-]*$", v))) ||
-        (can(regex("^test[\\w\\s+=.@-]*$", k)) && can(regex("^test[\\w\\s+=.@-]*$", v)))
+        can(regex("^[\\w\\s+=.@-]*$", k)) && can(regex("^[\\w\\s+=.@-]*$", v)) ||
+        can(regex("^Environment$", k)) && can(regex("^test$", v)) # Special case for test environment
       )
     ])
-    error_message = "Tag keys must be <= 128 chars, values <= 256 chars, and both can only contain alphanumeric characters, spaces, and '.+-=@_'. For test tags, they must start with 'test'."
+    error_message = "Tag keys must be <= 128 chars, values <= 256 chars, and both can only contain alphanumeric characters, spaces, and '.+-=@_'. For test environment, use 'Environment': 'test'."
   }
 }