Merge pull request #1012 from vivsriaus/LockIssue

Fix Lock issue

Author: ogail

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/NewAzureResourceLockCmdlet.cs

@@ -94,7 +94,7 @@ protected override void OnProcessRecord()
                     var result = this.GetLongRunningOperationTracker(activityName: activity, isResourceCreateOrUpdate: true)
                         .WaitOnOperation(operationResult: operationResult);
 
-                    this.WriteObject(this.GetOutputObjects(result.ToJToken()), enumerateCollection: true);
+                    this.WriteObject(this.GetOutputObjects(JObject.Parse(result)), enumerateCollection: true);
                 });
         }
 

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/RemoveAzureResourceLockCmdlet.cs

@@ -65,6 +65,11 @@ protected override void OnProcessRecord()
                             cancellationToken: this.CancellationToken.Value)
                         .Result;
 
+                    if(operationResult.HttpStatusCode == System.Net.HttpStatusCode.NoContent)
+                    {
+                        throw new PSInvalidOperationException(string.Format("The resource lock '{0}' could not be found.", resourceId));
+                    }
+
                     var managementUri = this.GetResourcesClient()
                         .GetResourceManagementRequestUri(
                             resourceId: resourceId,
@@ -75,7 +80,7 @@ protected override void OnProcessRecord()
                     var result = this.GetLongRunningOperationTracker(activityName: activity, isResourceCreateOrUpdate: false)
                         .WaitOnOperation(operationResult: operationResult);
 
-                    this.WriteObject(this.GetOutputObjects(result.ToJToken()), enumerateCollection: true);
+                    this.WriteObject(true);
                 });
         }
     }

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

@@ -203,6 +203,7 @@
     <Compile Include="ScenarioTests\ResourcesController.cs" />
     <Compile Include="ScenarioTests\DeploymentTests.cs" />
     <Compile Include="ScenarioTests\ResourceGroupTests.cs" />
+    <Compile Include="ScenarioTests\ResourceLockTests.cs" />
     <Compile Include="ScenarioTests\ResourceTests.cs" />
     <Compile Include="ScenarioTests\RoleAssignmentTests.cs" />
     <Compile Include="ScenarioTests\RoleDefinitionTests.cs" />
@@ -293,6 +294,9 @@
     <None Include="ScenarioTests\ResourceGroupTests.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="ScenarioTests\ResourceLockTests.ps1">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="ScenarioTests\ResourceTests.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -350,6 +354,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceGroupTests\TestUpdatesExistingResourceGroup.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceLockTests\TestResourceLockCRUDTest.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceTests\TestCreatesNewComplexResource.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/Resources/Commands.Resources.Test/Models.ResourceGroups/ResourceClientTests.cs

@@ -1408,7 +1408,7 @@ public void ShowsFailureErrorWhenResourceGroupWithDeploymentFails()
                             Properties = new DeploymentOperationProperties()
                             {
                                 ProvisioningState = ProvisioningState.Failed,
-                                StatusMessage = "A really bad error occured",
+                                StatusMessage = "{\"Code\":\"Conflict\"}",
                                 TargetResource = new TargetResource()
                                 {
                                     ResourceType = "Microsoft.Website",
@@ -1433,7 +1433,7 @@ public void ShowsFailureErrorWhenResourceGroupWithDeploymentFails()
                 f => f(string.Format("Resource {0} '{1}' failed with message '{2}'",
                         "Microsoft.Website",
                         resourceName,
-                        "A really bad error occured")),
+                        "{\"Code\":\"Conflict\"}")),
                 Times.Once());
         }
 

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

@@ -0,0 +1,30 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
+using Xunit;
+
+namespace Microsoft.Azure.Commands.Resources.Test.ScenarioTests
+{
+    public class ResourceLockTests : RMTestBase
+    {
+        [Fact]
+        public void TestResourceLockCRUDTest()
+        {
+            ResourcesController.NewInstance.RunPsTest("Test-ResourceLockCRUD");
+        }
+    }
+}

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

@@ -0,0 +1,44 @@
+# ----------------------------------------------------------------------------------
+#
+# Copyright Microsoft Corporation
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ----------------------------------------------------------------------------------
+
+<#
+.SYNOPSIS
+Tests resource lock CRUD operations.
+#>
+function Test-ResourceLockCRUD
+{
+	# Setup
+	$rgname = Get-ResourceGroupName
+	$rname = Get-ResourceName
+	$rglocation = Get-ProviderLocation ResourceManagement
+	$apiversion = "2014-04-01"
+
+	$rg = New-AzureRMResourceGroup -Name $rgname -Location $rglocation
+	$actual = New-AzureRMResourceLock -LockName $rname -LockLevel CanNotDelete -Force -Scope $rg.ResourceId
+	$expected = Get-AzureRMResourceLock -LockName $rname -Scope $rg.ResourceId
+
+	# Assert
+	Assert-AreEqual $expected.Name $actual.Name
+	Assert-AreEqual $expected.ResourceId $actual.ResourceId
+	Assert-AreEqual $expected.ResourceName $actual.ResourceName
+	Assert-AreEqual $expected.ResourceType $actual.ResourceType
+	Assert-AreEqual $expected.LockId $actual.LockId
+
+	$expectedSet = Set-AzureRMResourceLock -LockId $expected.LockId -LockLevel CanNotDelete -LockNotes test -Force
+	Assert-AreEqual $expectedSet.Properties.Notes "test"
+
+	$removed = Remove-AzureRMResourceLock -LockId $expectedSet.LockId -Force
+	Assert-AreEqual True $removed
+
+}

src/ResourceManager/Resources/Commands.Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceLockTests/TestResourceLockCRUDTest.json

@@ -259,6 +259,13 @@ private void WriteDeploymentProgress(string resourceGroup, string deploymentName
                         errorMessage);
 
                     WriteError(statusMessage);
+
+                    List<string> detailedMessage = ParseDetailErrorMessage(operation.Properties.StatusMessage);
+
+                    if (detailedMessage != null)
+                    {
+                        detailedMessage.ForEach(s => WriteError(s));
+                    }
                 }
             }
         }
@@ -276,6 +283,24 @@ public static string ParseErrorMessage(string statusMessage)
             }
         }
 
+        public static List<string> ParseDetailErrorMessage(string statusMessage)
+        {
+            if(!string.IsNullOrEmpty(statusMessage))
+            {
+                List<string> detailedMessage = new List<string>();
+                dynamic errorMessage = JsonConvert.DeserializeObject(statusMessage);
+                if(errorMessage.error != null && errorMessage.error.details !=null)
+                {
+                    foreach(var detail in errorMessage.error.details)
+                    {
+                        detailedMessage.Add(detail.message.ToString());
+                    }
+                }
+                return detailedMessage;
+            }
+            return null;
+        }
+
         private DeploymentExtended WaitDeploymentStatus(
             string resourceGroup,
             string deploymentName,