Fix update SignalR bugs and add tests (#16687)

* Fix `Update-AzSignalR` bug that resets resource states

* Revert version update

Author: Y-Sindo

src/SignalR/SignalR.Test/ScenarioTests/AzureRmSignalRTests.cs

@@ -50,5 +50,10 @@ public void TestAzureRmSignalRUpdateNetworkAcl() =>
         public void TestAzureRmSignalRSetUpstream() =>
             TestController.NewInstance.RunPowerShellTest(_logger, "Test-AzureRmSignalRSetUpstream");
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestAzureRmSignalRUpdate() =>
+    TestController.NewInstance.RunPowerShellTest(_logger, "Test-AzureRmSignalRUpdate");
+
     }
 }

src/SignalR/SignalR.Test/ScenarioTests/AzureRmSignalRTests.ps1

@@ -308,7 +308,58 @@ function Test-AzureRmSignalRSetUpstream {
     }
 
 }
-function New-Environment {
+
+<#
+.SYNOPSIS
+Test the Update SignalR cmdlet
+#>
+function Test-AzureRmSignalRUpdate
+{
+    $location = Get-ProviderLocation "Microsoft.SignalRService/SignalR"
+    $nameSuffix = "update-signalr"
+    $resourceGroupName = Get-RandomResourceGroupName $nameSuffix
+    $signalrName =  Get-RandomSignalRName  $nameSuffix
+
+    try
+    {
+        New-AzResourceGroup -Name $resourceGroupName -Location $location
+        New-AzSignalR -ResourceGroupName $resourceGroupName -Name $signalrName
+        $signalr = New-AzSignalR -ResourceGroupName $resourceGroupName -Name $signalrName
+
+        # a. Resource name parameter set
+        $result = Update-AzSignalR -ResourceGroupName $resourceGroupName -Name $signalrName
+        # verify nothing changed.
+        Assert-AreEqualObjectProperties $signalr.Sku $result.Sku
+        Assert-Null $result.Tag
+        Assert-Null $result.Features
+        Assert-AreEqualArray $signalr.Cors $result.Cors
+
+        $tag  = New-Object System.Collections.Generic.Dictionary"[String,String]"
+        $tag.Add("key1", "value1")
+        $result = Update-AzSignalR -ResourceGroupName $resourceGroupName -Name $signalrName -UnitCount 2 -Tag $tag -ServiceMode "Serverless" -AllowedOrigin "https://bing.com","https://google.com"
+        Assert-AreEqual 2 $result.Sku.Capacity
+        Assert-AreEqual 1 $result.Tags.Count
+        Assert-AreEqual "value1" $result.Tags["key1"]
+        Assert-AreEqual "Serverless" $result.Features[0].value
+        Assert-AreEqualArray "https://bing.com","https://google.com" $result.Cors.AllowedOrigins
+
+        # b. Resource ID parameter Set
+        $result = Update-AzSignalR -ResourceId $signalr.Id -UnitCount 1 -Sku Free_F1
+        Assert-AreEqual 1 $result.Sku.Capacity
+        Assert-AreEqual "Free_F1" $result.Sku.Name
+
+        # c. InputObject parameter set
+        $result = $( $signalr | Update-AzSignalR -UnitCount 2 -Sku "Standard_S1" )
+        Assert-AreEqual 2 $result.Sku.Capacity
+        Assert-AreEqual "Standard_S1" $result.Sku.Name
+    } finally
+    {
+        Remove-AzResourceGroup  -Name $resourceGroupName
+    }
+}
+
+function New-Environment
+{
     param (
         [string] $signalRName,
         [string] $resourceGroupName

src/SignalR/SignalR.Test/ScenarioTests/Common.ps1

@@ -18,7 +18,7 @@ Gets a SignalR service name
 #>
 function Get-RandomSignalRName
 {
-	param([string]$prefix = "signalr-test-")
+	param([string]$prefix = "signalrps-test-")
 	return $prefix + (getAssetName)
 }
 
@@ -28,7 +28,7 @@ Gets a resource group name
 #>
 function Get-RandomResourceGroupName
 {
-	param([string]$prefix = "signalr-test-rg-")
+	param([string]$prefix = "signalrps-test-rg-")
 	return $prefix + (getAssetName)
 }
 

src/SignalR/SignalR.Test/SessionRecords/Microsoft.Azure.Commands.SignalR.Test.ScenarioTests.AzureRmSignalRTests/TestAzureRmSignalR.json

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Fixed the bug of "Update-AzSignalR" cmdlet that resets the resource states by mistake.
 
 ## Version 1.4.0
 * Added Web PubSub cmdlets

src/SignalR/SignalR.Test/SessionRecords/Microsoft.Azure.Commands.SignalR.Test.ScenarioTests.AzureRmSignalRTests/TestAzureRmSignalRSetUpstream.json

@@ -14,14 +14,14 @@
 
 using System;
 using System.Collections.Generic;
+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 Microsoft.Azure.Management.SignalR.Models;
 using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
-using Newtonsoft.Json;
 
 namespace Microsoft.Azure.Commands.SignalR.Cmdlets
 {
@@ -30,7 +30,6 @@ namespace Microsoft.Azure.Commands.SignalR.Cmdlets
     [CmdletOutputBreakingChange(typeof(PSSignalRResource), DeprecatedOutputProperties = new String[] { nameof(PSSignalRResource.HostNamePrefix) })]
     public class UpdateAzureRmSignalR : SignalRCmdletBase, IWithInputObject, IWithResourceId
     {
-        private const string DefaultSku = "Standard_S1";
         private const int DefaultUnitCount = 1;
 
         [Parameter(
@@ -120,36 +119,45 @@ public override void ExecuteCmdlet()
                         throw new ArgumentException(Resources.ParameterSetError);
                 }
 
+                var signalR = Client.SignalR.Get(ResourceGroupName, Name);
+                if (Sku != null)
+                {
+                    signalR.Sku = new ResourceSku(Sku, capacity: UnitCount ?? DefaultUnitCount);
+                }
+                if (UnitCount.HasValue)
+                {
+                    signalR.Sku.Capacity = UnitCount.Value;
+                }
+                if (Tag != null)
+                {
+                    signalR.Tags = Tag;
+                }
+                if (ServiceMode != null)
+                {
+                    AddOrUpdateServiceMode(signalR, ServiceMode);
+                }
+                if (AllowedOrigin != null)
+                {
+                    signalR.Cors = new SignalRCorsSettings(ParseAndCheckAllowedOrigins(AllowedOrigin));
+                }
                 if (ShouldProcess($"SignalR service {ResourceGroupName}/{Name}", "update"))
                 {
-                    PromptParameter(nameof(ResourceGroupName), ResourceGroupName);
-                    PromptParameter(nameof(Name), Name);
-                    PromptParameter(nameof(Sku), Sku, true, DefaultSku);
-                    PromptParameter(nameof(UnitCount), UnitCount, true, DefaultUnitCount);
-                    PromptParameter(nameof(Tag), Tag == null ? null : JsonConvert.SerializeObject(Tag));
-                    PromptParameter(nameof(ServiceMode), ServiceMode);
-
-                    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(flag: FeatureFlags.ServiceMode, value: ServiceMode) };
-                    SignalRCorsSettings cors = AllowedOrigin == null ? null : new SignalRCorsSettings(allowedOrigins: origins);
-
-                    var parameters = new SignalRResource(
-                        tags: Tag,
-                        sku: new ResourceSku(name: Sku, capacity: UnitCount),
-                        features: features,
-                        cors: cors);
-
-                    Client.SignalR.Update(parameters, ResourceGroupName, Name);
-
-                    var signalr = (Client.SignalR.Get(ResourceGroupName, Name));
-                    WriteObject(new PSSignalRResource(signalr));
+                    var result = Client.SignalR.Update(signalR, ResourceGroupName, Name);
+                    WriteObject(new PSSignalRResource(result));
+                }
+                else
+                {
+                    WriteWarning("Update-AzSignalR cmdlet was not run actually.");
+                    WriteObject(new PSSignalRResource(signalR));
                 }
             });
         }
+
+        private void AddOrUpdateServiceMode(SignalRResource signalR, string ServiceMode)
+        {
+            signalR.Features = signalR.Features?.SkipWhile(f => f.Flag.Equals(ServiceMode)).ToList() ??
+                new List<SignalRFeature>();
+            signalR.Features.Add(new SignalRFeature(FeatureFlags.ServiceMode, ServiceMode));
+        }
     }
 }