Bug fixes: 1908985, 1907418, 1898689,1901426. Fixing TemplateImage RegEx

Author: robertla

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Collection/UpdateAzureRemoteAppCollection.cs

@@ -35,7 +35,6 @@ public class UpdateAzureRemoteAppCollection : RdsCmdlet
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "The name of the RemoteApp template image."
         )]
-        [ValidatePattern(TemplateNameValidatorString)]
         public string ImageName { get; set; }
 
         public override void ExecuteCmdlet()

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.Designer.cs

@@ -240,4 +240,13 @@
   <data name="UseageNotFound" xml:space="preserve">
     <value>No usage found for the requested period.</value>
   </data>
+  <data name="RequestFailed" xml:space="preserve">
+    <value>The request failed.</value>
+  </data>
+  <data name="RequestSuccessful" xml:space="preserve">
+    <value>The request completed successfully.</value>
+  </data>
+  <data name="VNetTimeout" xml:space="preserve">
+    <value>The request took a long time to complete.</value>
+  </data>
 </root>

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.resx

@@ -30,7 +30,9 @@ public abstract partial class RdsCmdlet
 
         protected const string UserPrincipalValdatorString = UserNameValidatorString + "@" + DomainNameValidatorString;
 
-        protected const string TemplateNameValidatorString = @"^[A-Za-z][._\-A-Za-z0-9]{1,61}[A-Z-a-z0-9]$";
+        protected const string ListTemplateImageNameValidatorString = @"^[()A-Za-z][() ._\-A-Za-z0-9]{1,61}[A-Z-a-z0-9()]$";
+
+        protected const string TemplateImageNameValidatorString = @"^[A-Za-z][ ._\-A-Za-z0-9]{1,61}[A-Z-a-z0-9]$";
 
         protected const string IPv4ValidatorString = @"^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])$";
 

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Common/RemoteAppRegEx.cs

@@ -27,7 +27,7 @@ public class GetAzureRemoteAppTemplateImage : GoldImage
             Position = 0,
             ValueFromPipeline = true,
             HelpMessage = "Template image name. Wildcards are permitted.")]
-        [ValidateNotNullOrEmpty()]
+        [ValidatePattern(ListTemplateImageNameValidatorString)]
         public string ImageName { get; set; }
 
         private bool showAllImages = false;

src/ServiceManagement/RemoteApp/Commands.RemoteApp/TemplateImage/GetAzureRemoteAppTemplateImage.cs

@@ -43,6 +43,7 @@ public class NewAzureRemoteAppTemplateImage : GoldImage
             Position = 0,
             ValueFromPipeline = true,
             HelpMessage = "Template image name")]
+        [ValidatePattern(TemplateImageNameValidatorString)]
         public string ImageName { get; set; }
 
         [Parameter(Mandatory = true,

src/ServiceManagement/RemoteApp/Commands.RemoteApp/TemplateImage/NewAzureRemoteAppTemplateImage.cs

@@ -27,7 +27,7 @@ public class RemoveAzureRemoteAppTemplateImage : GoldImage
             Position = 0,
             ValueFromPipeline = true,
             HelpMessage = "Template image name")]
-
+        [ValidatePattern(TemplateImageNameValidatorString)]
         public string ImageName { get; set; }
 
         public override void ExecuteCmdlet()

src/ServiceManagement/RemoteApp/Commands.RemoteApp/TemplateImage/RemoveAzureRemoteAppTemplateImage.cs

@@ -27,6 +27,7 @@ public class RenameAzureRemoteAppTemplateImage : GoldImage
             Position = 0,
             ValueFromPipeline = true,
             HelpMessage = "Template image name")]
+        [ValidatePattern(TemplateImageNameValidatorString)]
         public string ImageName { get; set; }
 
         [Parameter(Mandatory = true,

src/ServiceManagement/RemoteApp/Commands.RemoteApp/TemplateImage/RenameAzureRemoteAppTemplateImage.cs

@@ -62,19 +62,17 @@ public override void ExecuteCmdlet()
                 {
                     VNetResult vnet = CallClient(() => Client.VNet.Get(VNetName, true), Client.VNet);
                     WriteObject(vnet.VNet);
-
-                    WriteVerboseWithTimestamp("The request completed successfully." +
-                        " Call Get-AzureRemoteAppVpnDeviceConfigScript to download the script and pass in the SharedKey returned by this cmdlet");
+                    WriteVerboseWithTimestamp(Commands_RemoteApp.RequestSuccessful);
                 }
                 else
                 {
                     if (maxRetries > 0)
                     {
-                        WriteErrorWithTimestamp("The request failed.");
+                        WriteErrorWithTimestamp(Commands_RemoteApp.RequestFailed);
                     }
                     else
                     {
-                        WriteErrorWithTimestamp("The request took a long time to complete.");
+                        WriteErrorWithTimestamp(Commands_RemoteApp.VNetTimeout);
                     }
                 }
             }