fix: subscription display name & alias validation rule (#374)

* fix: subscription display name & alias validation rule * chore: docs * chore: telemetry change --------- Co-authored-by: Matt White <[email protected]>
Azure · Jun 7, 2024 · b51493f · b51493f
1 parent 097ae5a
commit b51493f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/locals.version.tf.json b/locals.version.tf.json
@@ -1,5 +1,5 @@
 {
   "locals": {
-    "module_version": "4.1.2"
+    "module_version": "4.1.3"
   }
 }
diff --git a/modules/subscription/README.md b/modules/subscription/README.md
@@ -116,7 +116,7 @@ Default: `""`
 Description: The display name of the subscription alias.
 
 The string must be comprised of a-z, A-Z, 0-9, -, \_ and space.  
-The maximum length is 63 characters.
+The maximum length is 64 characters.
 
 You may also supply an empty string if you do not want to create a new subscription alias.  
 In this scenario, `subscription_enabled` should be set to `false` and `subscription_id` must be supplied.

diff --git a/modules/subscription/variables.tf b/modules/subscription/variables.tf
@@ -38,8 +38,8 @@ You may also supply an empty string if you do not want to create a new subscript
 In this scenario, `subscription_enabled` should be set to `false` and `subscription_id` must be supplied.
 DESCRIPTION
   validation {
-    condition     = can(regex("^$|^[a-zA-Z0-9-_]{1,63}$", var.subscription_alias_name))
-    error_message = "Valid characters are a-z, A-Z, 0-9, -, _."
+    condition     = length(var.subscription_alias_name) <= 64 && !can(regex("[<>;|]", var.subscription_alias_name))
+    error_message = "Subscription Alias must either \"\", or be less or equal to 64 characters in length and cannot contain the characters `<`, `>`, `;`, or `|`"
   }
 }
 
@@ -50,14 +50,14 @@ variable "subscription_display_name" {
 The display name of the subscription alias.
 
 The string must be comprised of a-z, A-Z, 0-9, -, _ and space.
-The maximum length is 63 characters.
+The maximum length is 64 characters.
 
 You may also supply an empty string if you do not want to create a new subscription alias.
 In this scenario, `subscription_enabled` should be set to `false` and `subscription_id` must be supplied.
 DESCRIPTION
   validation {
-    condition     = can(regex("^$|^[a-zA-Z0-9-_ ]{1,63}$", var.subscription_display_name))
-    error_message = "Valid characters are a-z, A-Z, 0-9, -, _, and space."
+    condition     = length(var.subscription_display_name) > 0 && length(var.subscription_display_name) <= 64 && !can(regex("[<>;|]", var.subscription_display_name))
+    error_message = "Subscription Name must be between 1 and 64 characters in length and cannot contain the characters `<`, `>`, `;`, or `|`"
   }
 }