change allowed origin param to string[]

Hongzhou You · Hongzhou You · commit 66a68e0ba133 · 2019-08-28T14:30:24.000+08:00
diff --git a/src/SignalR/SignalR/Cmdlets/NewAzureRmSignalR.cs b/src/SignalR/SignalR/Cmdlets/NewAzureRmSignalR.cs
@@ -63,7 +63,7 @@ public sealed class NewAzureRmSignalR : SignalRCmdletBase
             Mandatory = false,
             HelpMessage = "The SignalR service unit count, value only from {1, 2, 5, 10, 20, 50, 100}. Default to 1.")]
         [PSArgumentCompleter("1", "2", "5", "10", "20", "50", "100")]
-        public int? UnitCount { get; set; }
+        public int UnitCount { get; set; } = DefaultUnitCount;
 
         [Parameter(
             Mandatory = false,
@@ -78,8 +78,8 @@ public sealed class NewAzureRmSignalR : SignalRCmdletBase
 
         [Parameter(
             Mandatory = false,
-            HelpMessage = "The allowed origins for the SignalR service, splitted by ',', ';' or ' ' (space). To allow all, use \"*\" and remove all other origins from the list. Slashes are not allowed as part of domain or after TLD")]
-        public string AllowedOrigin { get; set; }
+            HelpMessage = "The allowed origins for the SignalR service. To allow all, use \"*\" and remove all other origins from the list. Slashes are not allowed as part of domain or after TLD")]
+        public string[] AllowedOrigin { get; set; }
 
         [Parameter(
             Mandatory = false,
@@ -111,15 +111,14 @@ public override void ExecuteCmdlet()
                     }
 
                     PromptParameter(nameof(Sku), Sku, true, DefaultSku);
-                    PromptParameter(nameof(UnitCount), UnitCount, true, DefaultUnitCount);
+                    PromptParameter(nameof(UnitCount), UnitCount);
                     PromptParameter(nameof(Tag), Tag == null ? null : JsonConvert.SerializeObject(Tag));
                     PromptParameter(nameof(ServiceMode), ServiceMode);
 
-                    IList<string> origins = ParseAllowedOrigins(AllowedOrigin);
+                    IList<string> origins = ParseAndCheckAllowedOrigins(AllowedOrigin);
                     PromptParameter(nameof(AllowedOrigin), origins == null ? null : JsonConvert.SerializeObject(origins));
 
                     Sku = Sku ?? DefaultSku;
-                    UnitCount = UnitCount ?? DefaultUnitCount;
 
                     IList<SignalRFeature> features = ServiceMode == null ? null : new List<SignalRFeature> { new SignalRFeature(value: ServiceMode) };
                     SignalRCorsSettings cors = AllowedOrigin == null ? null : new SignalRCorsSettings(allowedOrigins: origins);
diff --git a/src/SignalR/SignalR/Cmdlets/SignalRCmdletBottom.cs b/src/SignalR/SignalR/Cmdlets/SignalRCmdletBottom.cs
@@ -90,25 +90,20 @@ protected void PromptParameter(string name, object value, bool check = false, ob
             }
         }
 
-        protected IList<string> ParseAllowedOrigins(string parameter)
+        protected IList<string> ParseAndCheckAllowedOrigins(string[] parameter)
         {
             if (parameter == null)
             {
                 return null;
             }
-            IList<string> origins = parameter.Split(new char[] { ',', ';', ' ' }, StringSplitOptions.RemoveEmptyEntries);
+            IList<string> origins = parameter.ToList();
             Regex regex = new Regex(@"^(http|https)://[^ *\\/""]+$");
             foreach (var url in origins)
             {
                 if (url != "*" && !regex.IsMatch(url))
                 {
                     string message = $"Invalid origin: \"{url}\"";
-                    ThrowTerminatingError(
-                        new ErrorRecord(
-                            new PSInvalidOperationException(message),
-                            string.Empty,
-                            ErrorCategory.InvalidData,
-                            null));
+                    throw new PSInvalidOperationException(message);
                 }
             }
             return origins;
diff --git a/src/SignalR/SignalR/Cmdlets/UpdateAzureRmSignalR.cs b/src/SignalR/SignalR/Cmdlets/UpdateAzureRmSignalR.cs
@@ -88,8 +88,8 @@ public class UpdateAzureRmSignalR : SignalRCmdletBase, IWithInputObject, IWithRe
 
         [Parameter(
             Mandatory = false,
-            HelpMessage = "The allowed origins for the SignalR service, splitted by ',', ';' or ' ' (space). To allow all, use \"*\" and remove all other origins from the list. Slashes are not allowed as part of domain or after TLD")]
-        public string AllowedOrigin { get; set; }
+            HelpMessage = "The allowed origins for the SignalR service. To allow all, use \"*\" and remove all other origins from the list. Slashes are not allowed as part of domain or after TLD")]
+        public string[] AllowedOrigin { get; set; }
 
         [Parameter(
             Mandatory = false,
@@ -126,7 +126,7 @@ public override void ExecuteCmdlet()
                     PromptParameter(nameof(Tag), Tag == null ? null : JsonConvert.SerializeObject(Tag));
                     PromptParameter(nameof(ServiceMode), ServiceMode);
 
-                    IList<string> origins = ParseAllowedOrigins(AllowedOrigin);
+                    IList<string> origins = ParseAndCheckAllowedOrigins(AllowedOrigin);
                     PromptParameter(nameof(AllowedOrigin), origins == null ? null : JsonConvert.SerializeObject(origins));
 
                     Sku = Sku ?? DefaultSku;
diff --git a/src/SignalR/SignalR/help/New-AzSignalR.md b/src/SignalR/SignalR/help/New-AzSignalR.md
@@ -15,7 +15,7 @@ Create a SignalR service.
 ```
 New-AzSignalR [-ResourceGroupName <String>] [-Name] <String> [-Location <String>] [-Sku <String>]
  [-UnitCount <Int32>] [-Tag <System.Collections.Generic.IDictionary`2[System.String,System.String]>]
- [-ServiceMode <String>] [-AllowedOrigin <String>] [-AsJob] [-DefaultProfile <IAzureContextContainer>]
+ [-ServiceMode <String>] [-AllowedOrigin <String[]>] [-AsJob] [-DefaultProfile <IAzureContextContainer>]
  [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -39,7 +39,7 @@ mysignalr1.service.signalr.net           eastus         52.179.3.5      Standard
 
 ### Specify ServiceMode and AllowedOrigin
 ```powershell
-PS C:\> New-AzSignalR -ResourceGroupName myResourceGroup1 -Name mysignalr2 -Location eastus -ServiceMode Serverless -AllowedOrigin "http://example1.com:12345, http://example2.com"
+PS C:\> New-AzSignalR -ResourceGroupName myResourceGroup1 -Name mysignalr2 -Location eastus -ServiceMode Serverless -AllowedOrigin http://example1.com:12345, https://example2.cn
 
 HostName                                 Location       ExternalIp      Sku         UnitCount ProvisioningState Version
 --------                                 --------       ----------      ---         --------- ----------------- -------
@@ -49,10 +49,10 @@ mysignalr1.service.signalr.net           eastus         52.179.3.5      Standard
 ## PARAMETERS
 
 ### -AllowedOrigin
-The allowed origins for the SignalR service, splitted by ',', ';' or ' ' (space). To allow all, use "*" and remove all other origins from the list. Slashes are not allowed as part of domain or after TLD
+The allowed origins for the SignalR service. To allow all, use "*" and remove all other origins from the list. Slashes are not allowed as part of domain or after TLD
 
 ```yaml
-Type: System.String
+Type: System.String[]
 Parameter Sets: (All)
 Aliases:
 
@@ -187,7 +187,7 @@ Accept wildcard characters: False
 The SignalR service unit count, from 1 to 10. Default to 1.
 
 ```yaml
-Type: System.Nullable`1[System.Int32]
+Type: System.Int32
 Parameter Sets: (All)
 Aliases:
 
@@ -234,10 +234,12 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## INPUTS
 
-### None
+### System.String
+
 ## OUTPUTS
 
 ### Microsoft.Azure.Commands.SignalR.Models.PSSignalRResource
+
 ## NOTES
 
 ## RELATED LINKS
diff --git a/src/SignalR/SignalR/help/Update-AzSignalR.md b/src/SignalR/SignalR/help/Update-AzSignalR.md
@@ -16,23 +16,23 @@ Update a SignalR service.
 ```
 Update-AzSignalR [-ResourceGroupName <String>] [-Name] <String> [-Sku <String>] [-UnitCount <Int32>]
  [-Tag <System.Collections.Generic.IDictionary`2[System.String,System.String]>] [-ServiceMode <String>]
- [-AllowedOrigin <String>] [-AsJob] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
+ [-AllowedOrigin <String[]>] [-AsJob] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
  [<CommonParameters>]
 ```
 
 ### ResourceIdParameterSet
 ```
 Update-AzSignalR -ResourceId <String> [-Sku <String>] [-UnitCount <Int32>]
  [-Tag <System.Collections.Generic.IDictionary`2[System.String,System.String]>] [-ServiceMode <String>]
- [-AllowedOrigin <String>] [-AsJob] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
+ [-AllowedOrigin <String[]>] [-AsJob] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
  [<CommonParameters>]
 ```
 
 ### InputObjectParameterSet
 ```
 Update-AzSignalR -InputObject <PSSignalRResource> [-Sku <String>] [-UnitCount <Int32>]
  [-Tag <System.Collections.Generic.IDictionary`2[System.String,System.String]>] [-ServiceMode <String>]
- [-AllowedOrigin <String>] [-AsJob] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
+ [-AllowedOrigin <String[]>] [-AsJob] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
  [<CommonParameters>]
 ```
 
@@ -55,7 +55,7 @@ mysignalr1.service.signalr.net           eastus         52.179.3.5      Standard
 
 ### Specify ServiceMode and AllowedOrigin
 ```powershell
-PS C:\> Update-AzSignalR -ResourceGroupName myResourceGroup1 -Name mysignalr2 -ServiceMode Serverless -AllowedOrigin "http://example1.com:12345, http://example2.com"
+PS C:\> Update-AzSignalR -ResourceGroupName myResourceGroup1 -Name mysignalr2 -ServiceMode Serverless -AllowedOrigin http://example1.com:12345, https://example2.cn
 
 HostName                                 Location       ExternalIp      Sku         UnitCount ProvisioningState Version
 --------                                 --------       ----------      ---         --------- ----------------- -------
@@ -65,10 +65,10 @@ mysignalr1.service.signalr.net           eastus         52.179.3.5      Standard
 ## PARAMETERS
 
 ### -AllowedOrigin
-The allowed origins for the SignalR service, splitted by ',', ';' or ' ' (space). To allow all, use "*" and remove all other origins from the list. Slashes are not allowed as part of domain or after TLD
+The allowed origins for the SignalR service. To allow all, use "*" and remove all other origins from the list. Slashes are not allowed as part of domain or after TLD
 
 ```yaml
-Type: System.String
+Type: System.String[]
 Parameter Sets: (All)
 Aliases:
 

Original file line number	Diff line number	Diff line change
`@@ -90,25 +90,20 @@ protected void PromptParameter(string name, object value, bool check = false, ob`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`93`		`- protected IList<string> ParseAllowedOrigins(string parameter)`
	`93`	`+ protected IList<string> ParseAndCheckAllowedOrigins(string[] parameter)`
`94`	`94`	`{`
`95`	`95`	`if (parameter == null)`
`96`	`96`	`{`
`97`	`97`	`return null;`
`98`	`98`	`}`
`99`		`- IList<string> origins = parameter.Split(new char[] { ',', ';', ' ' }, StringSplitOptions.RemoveEmptyEntries);`
	`99`	`+ IList<string> origins = parameter.ToList();`
`100`	`100`	`Regex regex = new Regex(@"^(http\|https)://[^ *\\/""]+$");`
`101`	`101`	`foreach (var url in origins)`
`102`	`102`	`{`
`103`	`103`	`if (url != "*" && !regex.IsMatch(url))`
`104`	`104`	`{`
`105`	`105`	`string message = $"Invalid origin: \"{url}\"";`
`106`		`- ThrowTerminatingError(`
`107`		`- new ErrorRecord(`
`108`		`- new PSInvalidOperationException(message),`
`109`		`- string.Empty,`
`110`		`- ErrorCategory.InvalidData,`
`111`		`- null));`
	`106`	`+ throw new PSInvalidOperationException(message);`
`112`	`107`	`}`
`113`	`108`	`}`
`114`	`109`	`return origins;`