Support - character in WLS user name (#167)

Author: Mahuwa-Barman

terraform/modules/compute/wls_compute/wls_variables.tf

@@ -15,8 +15,8 @@ variable "wls_admin_user" {
   type        = string
   description = "The name of the admin user that will be added to the WebLogic domain"
   validation {
-    condition     = replace(var.wls_admin_user, "/^[a-zA-Z][a-zA-Z0-9_]{7,127}/", "0") == "0"
-    error_message = "WLSC-ERROR: The value for wls_admin_user should be between 8 and 128 characters long and alphanumeric, and can contain underscore (_) special character."
+    condition     = replace(var.wls_admin_user, "/^[a-zA-Z][a-zA-Z0-9_-]{7,127}/", "0") == "0"
+    error_message = "WLSC-ERROR: The value for wls_admin_user should be between 8 and 128 characters long and alphanumeric, and can contain underscore (_) and hyphen(-) special characters."
   }
 }
 

terraform/schema.yaml

@@ -462,7 +462,7 @@ variables:
     type: string
     title: "WebLogic Server Admin User Name"
     description: "The name of the administrator in the WebLogic Server domain"
-    pattern: "^[a-zA-Z][a-zA-Z0-9_]{7,127}$"
+    pattern: "^[a-zA-Z][a-zA-Z0-9_-]{7,127}$"
     minLength: 8
     maxLength: 128
     required: true

terraform/schema_14110.yaml

@@ -460,7 +460,7 @@ variables:
     type: string
     title: "WebLogic Server Admin User Name"
     description: "The name of the administrator in the WebLogic Server domain"
-    pattern: "^[a-zA-Z][a-zA-Z0-9_]{7,127}$"
+    pattern: "^[a-zA-Z][a-zA-Z0-9_-]{7,127}$"
     minLength: 8
     maxLength: 128
     required: true
@@ -1465,7 +1465,7 @@ variables:
   # Tagging variables
   create_service_tag:
     visible: ${orm_create_mode}
-    type: boolean"
+    type: boolean
     title: "Add Tags"
     default: false
     description: "Add tags to the resources created by the WebLogic for OCI stack"

terraform/weblogic_variables.tf

@@ -29,8 +29,8 @@ variable "wls_admin_user" {
   description = "Name of WebLogic administration user"
   default     = "weblogic"
   validation {
-    condition     = replace(var.wls_admin_user, "/^[a-zA-Z][a-zA-Z0-9_]{7,127}/", "0") == "0"
-    error_message = "WLSC-ERROR: The value for wls_admin_user should be between 8 and 128 characters long and alphanumeric, and can contain underscore (_) special character."
+    condition     = replace(var.wls_admin_user, "/^[a-zA-Z][a-zA-Z0-9_-]{7,127}/", "0") == "0"
+    error_message = "WLSC-ERROR: The value for wls_admin_user should be between 8 and 128 characters long and alphanumeric, and can contain underscore (_) and hyphen(-) special characters."
   }
 }