Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/SignalR/SignalR.Test/ScenarioTests/AzureRmSignalRTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ public void TestAzureRmSignalR() =>
public void TestAzureRmSignalRWithDefaultArgs() =>
TestController.NewInstance.RunPowerShellTest(_logger, "Test-AzureRmSignalRWithDefaultArgs");

[Fact(Skip = "After latest network sdk import, test playback is failing. Need to enable test back after owner rerecords the test.")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestAzureRmSignalRUpdateNetworkAcl() =>
TestController.NewInstance.RunPowerShellTest(_logger, "Test-AzureRmSignalRUpdateNetworkAcl");
TestController.NewInstance.RunPowerShellTest(_logger, "Test-AzureRmSignalRUpdateNetworkAcl");

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestAzureRmSignalRSetUpstream() =>
TestController.NewInstance.RunPowerShellTest(_logger, "Test-AzureRmSignalRSetUpstream");
TestController.NewInstance.RunPowerShellTest(_logger, "Test-AzureRmSignalRSetUpstream");

}
}

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions src/SignalR/SignalR.Test/SignalR.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
<PackageReference Include="Microsoft.Azure.Management.PrivateDns" Version="1.0.0" />
<PackageReference Include="Microsoft.Azure.Management.SignalR" Version="1.1.0" />
<PackageReference Include="Microsoft.Azure.Management.SignalR" Version="1.1.2-preview" />
</ItemGroup>

<ItemGroup>
Expand All @@ -31,6 +31,4 @@
</EmbeddedResource>
</ItemGroup>



</Project>
5 changes: 4 additions & 1 deletion src/SignalR/SignalR.sln
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30320.27
Expand Down Expand Up @@ -46,6 +45,10 @@ Global
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU
{6BD6B80A-06AF-4B5B-9230-69CCFC6C8D64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6BD6B80A-06AF-4B5B-9230-69CCFC6C8D64}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6BD6B80A-06AF-4B5B-9230-69CCFC6C8D64}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6BD6B80A-06AF-4B5B-9230-69CCFC6C8D64}.Release|Any CPU.Build.0 = Release|Any CPU
{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
8 changes: 8 additions & 0 deletions src/SignalR/SignalR/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
- Additional information about change #1
-->
## Upcoming Release
* Changes to `Allow` and `Deny` parameters of `Update-AzSignalRNetworkAcl` cmdlet:
- Accepted `Trace` as a valid value.
- Accepted `@()` as empty collection to clear the list.
* Supported `ResourceGroupCompleter` and `ResourceNameCompleter` in the applicable cmdlets.
* Deprecated the `HostNamePrefix` property of output type `PSSignalRResource` of following cmdlets:
- `Get-AzSignalR`
- `New-AzSignalR`
- `Update-AzSignalR`

## Version 1.2.0
* Fixed `Restart-AzSignalR` and `Update-AzSignalR` help files errors
Expand Down
11 changes: 7 additions & 4 deletions src/SignalR/SignalR/Cmdlets/GetAzureRmSignalR.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,19 @@
// limitations under the License.
// ----------------------------------------------------------------------------------

using System;
using System.Management.Automation;
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
using Microsoft.Azure.Commands.SignalR.Models;
using Microsoft.Azure.Commands.SignalR.Properties;
using Microsoft.Azure.Management.SignalR;
using System;
using System.Management.Automation;
using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;

namespace Microsoft.Azure.Commands.SignalR.Cmdlets
{
[Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SignalR", DefaultParameterSetName = ListSignalRServiceParameterSet)]
[OutputType(typeof(PSSignalRResource))]
[CmdletOutputBreakingChange(typeof(PSSignalRResource), DeprecatedOutputProperties = new String[] { nameof(PSSignalRResource.HostNamePrefix) })]
public class GetAzureRmSignalR : SignalRCmdletBase, IWithResourceId
{
[Parameter(
Expand All @@ -33,15 +35,16 @@ public class GetAzureRmSignalR : SignalRCmdletBase, IWithResourceId
Mandatory = false,
ParameterSetName = ResourceGroupParameterSet,
HelpMessage = "The resource group name. The default one will be used if not specified.")]
[ResourceGroupCompleter()]
[ValidateNotNullOrEmpty]
[ResourceGroupCompleter]
public override string ResourceGroupName { get; set; }

[Parameter(Position = 0,
Mandatory = true,
ParameterSetName = ResourceGroupParameterSet,
HelpMessage = "The SignalR service name.")]
[ValidateNotNullOrEmpty]
[ResourceNameCompleter(Constants.SignalRResourceType, nameof(ResourceGroupName))]
public string Name { get; set; }

[Parameter(Mandatory = true,
Expand Down Expand Up @@ -85,4 +88,4 @@ public override void ExecuteCmdlet()
});
}
}
}
}
7 changes: 4 additions & 3 deletions src/SignalR/SignalR/Cmdlets/GetAzureRmSignalRKey.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
// limitations under the License.
// ----------------------------------------------------------------------------------

using System;
using System.Management.Automation;
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
using Microsoft.Azure.Commands.SignalR.Models;
using Microsoft.Azure.Commands.SignalR.Properties;
using Microsoft.Azure.Management.SignalR;
using System;
using System.Management.Automation;

namespace Microsoft.Azure.Commands.SignalR.Cmdlets
{
Expand All @@ -38,6 +38,7 @@ public class GetAzureRmSignalRKey : SignalRCmdletBase, IWithInputObject, IWithRe
ParameterSetName = ResourceGroupParameterSet,
HelpMessage = "The SignalR service name.")]
[ValidateNotNullOrEmpty]
[ResourceNameCompleter(Constants.SignalRResourceType, nameof(ResourceGroupName))]
public string Name { get; set; }

[Parameter(Mandatory = true,
Expand Down Expand Up @@ -80,4 +81,4 @@ public override void ExecuteCmdlet()
});
}
}
}
}
8 changes: 6 additions & 2 deletions src/SignalR/SignalR/Cmdlets/NewAzureRmSignalR.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------

using System;
using System.Collections.Generic;
using System.Management.Automation;
using Microsoft.Azure.Commands.Common.Strategies;
Expand All @@ -20,12 +21,14 @@
using Microsoft.Azure.Management.Internal.Resources;
using Microsoft.Azure.Management.SignalR;
using Microsoft.Azure.Management.SignalR.Models;
using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
using Newtonsoft.Json;

namespace Microsoft.Azure.Commands.SignalR.Cmdlets
{
[Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SignalR", SupportsShouldProcess = true)]
[OutputType(typeof(PSSignalRResource))]
[CmdletOutputBreakingChange(typeof(PSSignalRResource), DeprecatedOutputProperties = new String[] { nameof(PSSignalRResource.HostNamePrefix) })]
public sealed class NewAzureRmSignalR : SignalRCmdletBase
{
private const string DefaultSku = "Standard_S1";
Expand All @@ -35,6 +38,7 @@ public sealed class NewAzureRmSignalR : SignalRCmdletBase
Mandatory = false,
HelpMessage = "The resource group name. The default one will be used if not specified.")]
[ValidateNotNullOrEmpty()]
[ResourceGroupCompleter]
public override string ResourceGroupName { get; set; }

[Parameter(
Expand Down Expand Up @@ -128,12 +132,12 @@ public override void ExecuteCmdlet()
features: features,
cors: cors);

Client.SignalR.CreateOrUpdate(ResourceGroupName, Name, parameters);
Client.SignalR.CreateOrUpdate(parameters, ResourceGroupName, Name);

var signalr = Client.SignalR.Get(ResourceGroupName, Name);
WriteObject(new PSSignalRResource(signalr));
}
});
}
}
}
}
11 changes: 6 additions & 5 deletions src/SignalR/SignalR/Cmdlets/NewAzureRmSignalRKey.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
// limitations under the License.
// ----------------------------------------------------------------------------------

using System;
using System.Management.Automation;
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
using Microsoft.Azure.Commands.SignalR.Models;
using Microsoft.Azure.Commands.SignalR.Properties;
using Microsoft.Azure.Management.SignalR;
using Microsoft.Azure.Management.SignalR.Models;
using System;
using System.Management.Automation;

namespace Microsoft.Azure.Commands.SignalR.Cmdlets
{
Expand All @@ -30,15 +30,16 @@ public class NewAzureRmSignalRKey : SignalRCmdletBase, IWithInputObject, IWithRe
Mandatory = false,
ParameterSetName = ResourceGroupParameterSet,
HelpMessage = "The resource group name. The default one will be used if not specified.")]
[ResourceGroupCompleter()]
[ValidateNotNullOrEmpty]
[ResourceGroupCompleter]
public override string ResourceGroupName { get; set; }

[Parameter(Position = 0,
Mandatory = true,
ParameterSetName = ResourceGroupParameterSet,
HelpMessage = "The SignalR service name.")]
[ValidateNotNullOrEmpty]
[ResourceNameCompleter(Constants.SignalRResourceType, nameof(ResourceGroupName))]
public string Name { get; set; }

[Parameter(Mandatory = true,
Expand Down Expand Up @@ -86,7 +87,7 @@ public override void ExecuteCmdlet()

if (ShouldProcess($"{KeyType} key for {ResourceGroupName}/{Name}", "regenerate"))
{
Client.SignalR.RegenerateKey(ResourceGroupName, Name, new RegenerateKeyParameters(KeyType));
Client.SignalR.RegenerateKey(new RegenerateKeyParameters(KeyType), ResourceGroupName, Name);

if (PassThru)
{
Expand All @@ -96,4 +97,4 @@ public override void ExecuteCmdlet()
});
}
}
}
}
9 changes: 5 additions & 4 deletions src/SignalR/SignalR/Cmdlets/RemoveAzureRmSignalR.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
// limitations under the License.
// ----------------------------------------------------------------------------------

using System;
using System.Management.Automation;
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
using Microsoft.Azure.Commands.SignalR.Models;
using Microsoft.Azure.Commands.SignalR.Properties;
using Microsoft.Azure.Management.SignalR;
using System;
using System.Management.Automation;

namespace Microsoft.Azure.Commands.SignalR.Cmdlets
{
Expand All @@ -29,15 +29,16 @@ public class RemoveAzureRmSignalR : SignalRCmdletBase, IWithInputObject, IWithRe
Mandatory = false,
ParameterSetName = ResourceGroupParameterSet,
HelpMessage = "The resource group name. The default one will be used if not specified.")]
[ResourceGroupCompleter()]
[ValidateNotNullOrEmpty]
[ResourceGroupCompleter]
public override string ResourceGroupName { get; set; }

[Parameter(Position = 0,
Mandatory = true,
ParameterSetName = ResourceGroupParameterSet,
HelpMessage = "The SignalR service name.")]
[ValidateNotNullOrEmpty]
[ResourceNameCompleter(Constants.SignalRResourceType, nameof(ResourceGroupName))]
public string Name { get; set; }

[Parameter(Mandatory = true,
Expand Down Expand Up @@ -93,4 +94,4 @@ public override void ExecuteCmdlet()
});
}
}
}
}
5 changes: 3 additions & 2 deletions src/SignalR/SignalR/Cmdlets/RestartAzureRmSignalR.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ public class RestartAzureRmSignalR : SignalRCmdletBase, IWithInputObject, IWithR
Mandatory = false,
ParameterSetName = ResourceGroupParameterSet,
HelpMessage = "The resource group name. The default one will be used if not specified.")]
[ResourceGroupCompleter()]
[ValidateNotNullOrEmpty()]
[ResourceGroupCompleter]
public override string ResourceGroupName { get; set; }

[Parameter(
Expand All @@ -39,6 +39,7 @@ public class RestartAzureRmSignalR : SignalRCmdletBase, IWithInputObject, IWithR
ParameterSetName = ResourceGroupParameterSet,
HelpMessage = "The SignalR service name.")]
[ValidateNotNullOrEmpty()]
[ResourceNameCompleter(Constants.SignalRResourceType, nameof(ResourceGroupName))]
public string Name { get; set; }

[Parameter(
Expand Down Expand Up @@ -101,4 +102,4 @@ public override void ExecuteCmdlet()
});
}
}
}
}
12 changes: 6 additions & 6 deletions src/SignalR/SignalR/Cmdlets/SetAzureRmSignalRUpstream.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,26 @@
// ----------------------------------------------------------------------------------

using System;
using System.Linq;
using System.Management.Automation;
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
using Microsoft.Azure.Commands.SignalR.Models;
using Microsoft.Azure.Commands.SignalR.Properties;
using Microsoft.Azure.Management.SignalR;
using System.Linq;
using Microsoft.WindowsAzure.Commands.Utilities.Common;
using Newtonsoft.Json;

namespace Microsoft.Azure.Commands.SignalR.Cmdlets
{
[Cmdlet("Set", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SignalR" + "Upstream", SupportsShouldProcess = true, DefaultParameterSetName = ResourceGroupParameterSet)]
[OutputType(typeof(PSServerlessUpstreamSettings))]
public class SetAzureRmSignalRUpstream : SignalRCmdletBase , IWithResourceId, IWithInputObject
public class SetAzureRmSignalRUpstream : SignalRCmdletBase, IWithResourceId, IWithInputObject
{
[Parameter(
Mandatory = false,
ParameterSetName = ResourceGroupParameterSet,
HelpMessage = "The resource group name. The default one will be used if not specified.")]
[ResourceGroupCompleter()]
[ValidateNotNullOrEmpty()]
[ResourceGroupCompleter]
public override string ResourceGroupName { get; set; }

[Parameter(
Expand All @@ -42,6 +41,7 @@ public class SetAzureRmSignalRUpstream : SignalRCmdletBase , IWithResourceId, I
ParameterSetName = ResourceGroupParameterSet,
HelpMessage = "The SignalR service name.")]
[ValidateNotNullOrEmpty()]
[ResourceNameCompleter(Constants.SignalRResourceType, nameof(ResourceGroupName))]
public string Name { get; set; }

[Parameter(
Expand Down Expand Up @@ -111,10 +111,10 @@ public override void ExecuteCmdlet()

var signalr = Client.SignalR.Get(ResourceGroupName, Name);
signalr.Upstream.Templates = Template.Select(t => t.toSDKTemplate()).ToList();
signalr = Client.SignalR.Update(ResourceGroupName, Name, signalr);
signalr = Client.SignalR.Update(signalr, ResourceGroupName, Name);
WriteObject(new PSSignalRResource(signalr).Upstream);
}
});
}
}
}
}
7 changes: 2 additions & 5 deletions src/SignalR/SignalR/Cmdlets/TestAzureRmSignalRName.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

using System.Management.Automation;
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
using Microsoft.Azure.Commands.SignalR.Models;
using Microsoft.Azure.Management.SignalR;
using Microsoft.Azure.Management.SignalR.Models;

Expand All @@ -25,8 +24,6 @@ namespace Microsoft.Azure.Commands.SignalR.Cmdlets
[OutputType(typeof(bool))]
public class TestAzureRmSignalRName : SignalRCmdletBottom
{
private const string NameAvailabilityType = "Microsoft.SignalRService/SignalR";

[Parameter(
Mandatory = true,
Position = 0,
Expand All @@ -49,7 +46,7 @@ public override void ExecuteCmdlet()
RunCmdlet(() =>
{
var parameters = new NameAvailabilityParameters(
type: NameAvailabilityType,
type: Constants.SignalRResourceType,
name: Name);

var availability = Client.SignalR.CheckNameAvailability(Location, parameters);
Expand All @@ -58,4 +55,4 @@ public override void ExecuteCmdlet()
});
}
}
}
}
Loading