Merge pull request Azure#5094 from darshanhs90/preview1

Update Get role assignment calls to be scoped

Author: cormacpayne

src/ResourceManager/Resources/ChangeLog.md

@@ -26,6 +26,7 @@
     - Users can now use Set-AzureRMRoleRoleDefinition with assignable scopes including new scopes irrespective of the position of the scope
 * Allow scopes to end with "/"
     - Users can now use RoleDefinition and RoleAssignment commandlets with scopes ending with "/" ,consistent with API and CLI
+* Fix RoleAssignment get to respect the scope parameter
 
 ## Version 5.0.0
 * Add support for online help

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

@@ -712,6 +712,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.RoleAssignmentTests\RaPropertiesValidation.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.RoleAssignmentTests\RaGetByScope.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.RoleDefinitionTests\RdNegativeScenarios.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

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

@@ -123,6 +123,13 @@ public void RaByUpn()
             ResourcesController.NewInstance.RunPsTest("Test-RaByUpn");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void RaGetByScope()
+        {
+            ResourcesController.NewInstance.RunPsTest("Test-RaGetByScope");
+        }
+
         [Fact(Skip = "Fix the flaky test and token error and then re-record the test. Token from admin user is being used even when trying to use newly created user.")]
         public void RaUserPermissions()
         {

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

@@ -430,6 +430,56 @@ function Test-RaPropertiesValidation
     VerifyRoleAssignmentDeleted $newAssignment
 }
 
+<#
+.SYNOPSIS
+Tests verifies get of RoleAssignment by Scope
+#>
+function Test-RaGetByScope
+{
+    # Setup
+    $definitionName = 'Reader'
+    $users = Get-AzureRmADUser | Select-Object -First 1 -Wait
+    $subscription = Get-AzureRmSubscription
+    $resourceGroups = Get-AzureRmResourceGroup | Select-Object -Last 2 -Wait
+    $scope1 = '/subscriptions/'+ $subscription[0].Id +'/resourceGroups/' + $resourceGroups[0].ResourceGroupName
+    $scope2 = '/subscriptions/'+ $subscription[0].Id +'/resourceGroups/' + $resourceGroups[1].ResourceGroupName
+    Assert-AreEqual 1 $users.Count "There should be at least one user to run the test."
+    
+    # Test
+    [Microsoft.Azure.Commands.Resources.Models.Authorization.AuthorizationClient]::RoleAssignmentNames.Enqueue("f747531e-da33-43b9-b726-04675abf1939")
+    $newAssignment1 = New-AzureRmRoleAssignment `
+                        -ObjectId $users[0].Id.Guid `
+                        -RoleDefinitionName $definitionName `
+                        -Scope $scope1 
+
+    [Microsoft.Azure.Commands.Resources.Models.Authorization.AuthorizationClient]::RoleAssignmentNames.Enqueue("fa1a4d3b-2cca-406b-8956-6b6b32377641")
+    $newAssignment2 = New-AzureRmRoleAssignment `
+                        -ObjectId $users[0].Id.Guid `
+                        -RoleDefinitionName $definitionName `
+                        -Scope $scope2  
+
+    $ras = Get-AzureRmRoleAssignment -ObjectId $users[0].Id.Guid `
+            -RoleDefinitionName $definitionName `
+            -Scope $scope1
+
+    foreach ($assignment in $ras){
+        Assert-NotNull $assignment
+        Assert-NotNull $assignment.Scope
+        Assert-AreNotEqual $assignment.Scope $scope2
+    }
+    # cleanup 
+    DeleteRoleAssignment $newAssignment1
+    DeleteRoleAssignment $newAssignment2
+
+    # Assert
+    Assert-NotNull $newAssignment1
+    Assert-AreEqual $definitionName $newAssignment1.RoleDefinitionName 
+    Assert-AreEqual $scope1 $newAssignment1.Scope 
+    Assert-AreEqual $users[0].DisplayName $newAssignment1.DisplayName
+    
+    VerifyRoleAssignmentDeleted $newAssignment1
+}
+
 <#
 .SYNOPSIS
 Creates role assignment