Merge branch 'UpdateRESEnvNameAllowedPattermInDemoAndBIStack' into 'develop'

Update EnvironmentName Allowed Pattern in demo stack and BI stack to match the RES template

See merge request mwvaughn/aws-hpc-recipes!104

Author: HimajaChandaluri

recipes/res/res_demo_env/assets/bi.yaml

@@ -34,11 +34,9 @@ Parameters:
     Type: String
     Default: ""
   EnvironmentName:
-    Description: (Optional) Provide name of the RES Environment. It must start with "res-", may not contain "aws", and entire name must be less than or equal to 10 characters (lowercase, numbers, hypens are permitted). Required to generate certificates.
+    Description: (Optional) EnvironmentName must start with "res-"and should be less than or equal to 11 characters. Required to generate certificates.
     Type: String
-    MinLength: 0
-    MaxLength: 10
-    AllowedPattern: $^|(^(?!.*aws)res-[a-z0-9-]{1,6}$)
+    AllowedPattern: ^res-[A-Za-z\-\_0-9]{0,7}$
     Default: res-demo
   AdminPassword:
     Description: Provide the Active Directory Administrator Account Password Directly or Resource ARN to Secret Containing Password.

recipes/res/res_demo_env/assets/res-demo-stack.yaml

@@ -26,10 +26,8 @@ Parameters:
     Description: Provide name of the RES Environment. Must be unique for your account and AWS Region.
     Type: String
     Default: res-demo
-    MinLength: 5
-    MaxLength: 10
-    AllowedPattern: ^(?!.*aws)res-[a-z0-9-]{1,6}$
-    ConstraintDescription: EnvironmentName must start with "res-", cannot contain "aws", and entire name must be less than or equal to 10 characters (lowercase, numbers, hypens are permitted).
+    AllowedPattern: ^res-[A-Za-z\-\_0-9]{0,7}$
+    ConstraintDescription: EnvironmentName must start with "res-" and should be less than or equal to 11 characters.
 
   AdministratorEmail:
     Type: String

recipes/res/res_demo_env/assets/res-sso-keycloak.yaml

@@ -22,7 +22,7 @@ Parameters:
     Type: String
     Default: res-demo
     AllowedPattern: ^res-[A-Za-z\-\_0-9]{0,7}$
-    ConstraintDescription: EnvironmentName must start with "res-"and should be less than or equal to 11 characters.
+    ConstraintDescription: EnvironmentName must start with "res-" and should be less than or equal to 11 characters.
 
   Keypair:
     Description: EC2 Keypair to access management instance.