Merge pull request Azure#1395 from vivsriaus/FixSetResource

Fix set resource

Author: Hovsep

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Resource/SetAzureResourceCmdlet.cs

@@ -135,26 +135,20 @@ protected override void OnProcessRecord()
         /// </summary>
         private JToken GetResourceBody()
         {
-            var getResult = this.GetResource().Result;
+            if(this.ShouldUsePatchSemantics())
+            {
+                var resourceBody = this.GetPatchResourceBody();
 
-            JToken resourceBody;
-            if (getResult.CanConvertTo<Resource<JToken>>())
+                return resourceBody == null ? null : resourceBody.ToJToken();
+            }
+            else
             {
-                if (this.ShouldUsePatchSemantics())
-                {
-                    resourceBody = new Resource<JToken>()
-                    {
-                        Kind = this.Kind,
-                        Plan = this.Plan.ToDictionary(addValueLayer: false).ToJson().FromJson<ResourcePlan>(),
-                        Sku = this.Sku.ToDictionary(addValueLayer: false).ToJson().FromJson<ResourceSku>(),
-                        Tags = TagsHelper.GetTagsDictionary(this.Tag),
-                        Properties = this.Properties.ToResourcePropertiesBody(),
-                    }.ToJToken();
-                }
-                else
+                var getResult = this.GetResource().Result;
+
+                if (getResult.CanConvertTo<Resource<JToken>>())
                 {
                     var resource = getResult.ToResource();
-                    resourceBody = new Resource<JToken>()
+                    return new Resource<JToken>()
                     {
                         Kind = this.Kind ?? resource.Kind,
                         Plan = this.Plan.ToDictionary(addValueLayer: false).ToJson().FromJson<ResourcePlan>() ?? resource.Plan,
@@ -164,11 +158,89 @@ private JToken GetResourceBody()
                         Properties = this.Properties == null ? resource.Properties : this.Properties.ToResourcePropertiesBody(),
                     }.ToJToken();
                 }
+                else
+                {
+                    return this.Properties.ToJToken();
+                }
             }
-            else
+
+        }
+
+        /// <summary>
+        /// Gets the resource body for PATCH calls
+        /// </summary>
+        private Resource<JToken> GetPatchResourceBody()
+        {
+            Resource<JToken> resourceBody = null;
+
+            if (this.Properties != null)
+            {
+                resourceBody = new Resource<JToken>()
+                {
+                    Properties = this.Properties.ToResourcePropertiesBody()
+                };
+            }
+
+            if (this.Plan != null)
+            {
+                if(resourceBody != null)
+                {
+                    resourceBody.Plan = this.Plan.ToDictionary(addValueLayer: false).ToJson().FromJson<ResourcePlan>();
+                }
+                else
+                {
+                    resourceBody = new Resource<JToken>()
+                    {
+                        Plan = this.Plan.ToDictionary(addValueLayer: false).ToJson().FromJson<ResourcePlan>()
+                    };
+                }
+            }
+
+            if (this.Kind != null)
+            {
+                if(resourceBody != null)
+                {
+                    resourceBody.Kind = this.Kind;
+                }
+                else
+                {
+                    resourceBody = new Resource<JToken>()
+                    {
+                        Kind = this.Kind
+                    };
+                }
+            }
+
+            if (this.Sku != null)
+            {
+                if(resourceBody != null)
+                {
+                    resourceBody.Sku = this.Sku.ToDictionary(addValueLayer: false).ToJson().FromJson<ResourceSku>();
+                }
+                else
+                {
+                    resourceBody = new Resource<JToken>()
+                    {
+                        Sku = this.Sku.ToDictionary(addValueLayer: false).ToJson().FromJson<ResourceSku>()
+                    };
+                }
+            }
+
+            if (this.Tag != null)
             {
-                resourceBody = this.Properties.ToJToken();
+                if(resourceBody != null)
+                {
+                    resourceBody.Tags = TagsHelper.GetTagsDictionary(this.Tag);
+                }
+                else
+                {
+                    resourceBody = new Resource<JToken>()
+                    {
+                        Tags = TagsHelper.GetTagsDictionary(this.Tag)
+                    };
+                }
             }
+
             return resourceBody;
         }
 

src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj

@@ -510,6 +510,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceTests\TestSetAResourceTest.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceTests\TestSetAResourceWithPatchTest.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.RoleAssignmentTests\RaAuthorizationChangeLog.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceTests.cs

@@ -91,6 +91,13 @@ public void TestSetAResourceTest()
             ResourcesController.NewInstance.RunPsTest("Test-SetAResource");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestSetAResourceWithPatchTest()
+        {
+            ResourcesController.NewInstance.RunPsTest("Test-SetAResourceWithPatch");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestFindAResourceTest()

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceTests.ps1

@@ -271,6 +271,32 @@ function Test-SetAResource
 	Assert-AreEqual $modifiedResource.Sku.Name "A1" 
 }
 
+<#
+.SYNOPSIS
+Tests setting a resource using patch.
+#>
+function Test-SetAResourceWithPatch
+{
+	# Setup
+	$rgname = Get-ResourceGroupName
+	$rname = Get-ResourceName
+	$rglocation = Get-ProviderLocation ResourceManagement
+	$apiversion = "2014-04-01"
+	$resourceType = "Providers.Test/statefulResources"
+
+	# Test
+	New-AzureRmResourceGroup -Name $rgname -Location $rglocation
+	$resource = New-AzureRmResource -Name $rname -Location $rglocation -Tags @{Name = "testtag"; Value = "testval"} -ResourceGroupName $rgname -ResourceType $resourceType -PropertyObject @{"key" = "value"} -SkuObject @{ Name = "A0" } -ApiVersion $apiversion -Force
+	Set-AzureRmResource -ResourceGroupName $rgname -ResourceName $rname -ResourceType $resourceType -Properties @{"key2" = "value2"} -Force
+	Set-AzureRmResource -ResourceGroupName $rgname -ResourceName $rname -ResourceType $resourceType -SkuObject @{ Name = "A1" } -UsePatchSemantics -Force 
+
+	$modifiedResource = Get-AzureRmResource -ResourceGroupName $rgname -ResourceName $rname -ResourceType $resourceType
+
+	# Assert patch didn't overwrite existing properties
+	Assert-AreEqual $modifiedResource.Properties.key2 "value2"
+	Assert-AreEqual $modifiedResource.Sku.Name "A1" 
+}
+
 <#
 .SYNOPSIS
 Tests finding a resource.