Skip to content

Commit 1bffb38

Browse files
committed
Restore resource group parameter position and add unit count parameter on creation
1 parent 5c9078b commit 1bffb38

File tree

6 files changed

+32
-14
lines changed

6 files changed

+32
-14
lines changed

src/ResourceManager/SignalR/Commands.SignalR/Cmdlets/GetAzureRmSignalR.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace Microsoft.Azure.Commands.SignalR.Cmdlets
2525
[OutputType(typeof(PSSignalRResource))]
2626
public class GetAzureRmSignalR : SignalRCmdletBase, IWithResourceId
2727
{
28-
[Parameter(
28+
[Parameter(Position = 0,
2929
Mandatory = false,
3030
ParameterSetName = ListSignalRServiceParameterSet,
3131
HelpMessage = "The resource group name.")]

src/ResourceManager/SignalR/Commands.SignalR/Cmdlets/GetAzureRmSignalRKey.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace Microsoft.Azure.Commands.SignalR.Cmdlets
2525
[OutputType(typeof(PSSignalRKeys))]
2626
public class GetAzureRmSignalRKey : SignalRCmdletBase, IWithInputObject, IWithResourceId
2727
{
28-
[Parameter(
28+
[Parameter(Position = 0,
2929
Mandatory = false,
3030
ParameterSetName = ResourceGroupParameterSet,
3131
HelpMessage = "The resource group name. The default one will be used if not specified.")]

src/ResourceManager/SignalR/Commands.SignalR/Cmdlets/NewAzureRmSignalR.cs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public sealed class NewAzureRmSignalR : SignalRCmdletBase
3131
{
3232
private const string DefaultSku = "Basic_DS2";
3333

34-
[Parameter(
34+
[Parameter(Position = 0,
3535
Mandatory = false,
3636
HelpMessage = "The resource group name. The default one will be used if not specified.")]
3737
[ValidateNotNullOrEmpty()]
@@ -55,9 +55,16 @@ public sealed class NewAzureRmSignalR : SignalRCmdletBase
5555
[Parameter(
5656
Mandatory = false,
5757
HelpMessage = "The SignalR service SKU.")]
58-
[PSArgumentCompleter("Basic_DS2")]
58+
[PSArgumentCompleter("Free_DS2", "Basic_DS2")]
5959
public string Sku { get; set; } = DefaultSku;
6060

61+
[Parameter(
62+
Mandatory = false,
63+
HelpMessage = "The SignalR service unit count, from 1 to 10. Default to 1.")]
64+
[PSArgumentCompleter("1", "2", "3", "4", "5", "6", "7", "8", "9", "10")]
65+
[ValidateRange(1, 10)]
66+
public int UnitCount { get; set; } = 1;
67+
6168
[Parameter(
6269
Mandatory = false,
6370
HelpMessage = "The tags for the SignalR service.")]
@@ -97,22 +104,18 @@ public Parameters(NewAzureRmSignalR cmdlet)
97104

98105
public Task<ResourceConfig<SignalRResource>> CreateConfigAsync()
99106
{
107+
_cmdlet.ResolveResourceGroupName(required: false);
100108
_cmdlet.ResourceGroupName = _cmdlet.ResourceGroupName ?? _cmdlet.Name;
101-
_cmdlet.ResolveResourceGroupName();
102109

103110
var resourceGroup = ResourceGroupStrategy.CreateResourceGroupConfig(
104111
_cmdlet.ResourceGroupName);
105112

106113
var result = SignalRStrategy.Strategy.CreateResourceConfig(
107114
resourceGroup: resourceGroup,
108-
// The SignalR service accepts only lower case characters. It's a known bug.
109-
// TODO: remove ".ToLower()" as soon as the problem is fixed in SignalR server.
110-
// See also
111-
// https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/resource-api-reference.md#put-resource
112-
name: _cmdlet.Name.ToLower(),
115+
name: _cmdlet.Name,
113116
createModel: engine => new SignalRResource(
114117
tags: _cmdlet.Tag,
115-
sku: new ResourceSku(_cmdlet.Sku, capacity: 1), // we only allow capacity 1 in public preview, this may be a parameter in future.
118+
sku: new ResourceSku(_cmdlet.Sku, capacity: _cmdlet.UnitCount),
116119
hostNamePrefix: null /* _cmdlet.Name*/)); // hostNamePrefix is just a placeholder and ignored in the resource provider.
117120

118121
return Task.FromResult(result);

src/ResourceManager/SignalR/Commands.SignalR/Cmdlets/NewAzureRmSignalRKey.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace Microsoft.Azure.Commands.SignalR.Cmdlets
2626
[OutputType(typeof(bool))]
2727
public class NewAzureRmSignalRKey : SignalRCmdletBase, IWithInputObject, IWithResourceId
2828
{
29-
[Parameter(
29+
[Parameter(Position = 0,
3030
Mandatory = false,
3131
ParameterSetName = ResourceGroupParameterSet,
3232
HelpMessage = "The resource group name. The default one will be used if not specified.")]

src/ResourceManager/SignalR/Commands.SignalR/Cmdlets/RemoveAzureRmSignalR.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace Microsoft.Azure.Commands.SignalR.Cmdlets
2525
[OutputType(typeof(bool))]
2626
public class RemoveAzureRmSignalR : SignalRCmdletBase, IWithInputObject, IWithResourceId
2727
{
28-
[Parameter(
28+
[Parameter(Position = 0,
2929
Mandatory = false,
3030
ParameterSetName = ResourceGroupParameterSet,
3131
HelpMessage = "The resource group name. The default one will be used if not specified.")]

src/ResourceManager/SignalR/Commands.SignalR/help/New-AzureRmSignalR.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Create a SignalR service.
1414

1515
```
1616
New-AzureRmSignalR [[-ResourceGroupName] <String>] [-Name] <String> [[-Location] <String>] [-Sku <String>]
17-
[-Tag <System.Collections.Generic.IDictionary`2[System.String,System.String]>] [-AsJob]
17+
[-UnitCount <Int32>] [-Tag <System.Collections.Generic.IDictionary`2[System.String,System.String]>] [-AsJob]
1818
[-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
1919
```
2020

@@ -145,6 +145,21 @@ Accept pipeline input: False
145145
Accept wildcard characters: False
146146
```
147147
148+
### -UnitCount
149+
The SignalR service unit count, from 1 to 10. Default to 1.
150+
151+
```yaml
152+
Type: Int32
153+
Parameter Sets: (All)
154+
Aliases:
155+
156+
Required: False
157+
Position: Named
158+
Default value: 1
159+
Accept pipeline input: False
160+
Accept wildcard characters: False
161+
```
162+
148163
### -Confirm
149164
Prompts you for confirmation before running the cmdlet.
150165

0 commit comments

Comments
 (0)