Merge pull request Azure#4906 from darshanhs90/preview

Fix roleassignment properties issue

Author: markcowl

src/ResourceManager/Resources/ChangeLog.md

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fixed issue where Get-AzureRMRoleAssignment would result in a assignments without roledefiniton name for custom roles
+    - Users can now use Get-AzureRMRoleAssignment with assignments having roledefinition names irrespective of the type of role
 
 ## Version 5.0.0
 * Add support for online help

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

@@ -709,6 +709,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.RoleAssignmentTests\RaDeletionByScope.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <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.RoleDefinitionTests\RdNegativeScenarios.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

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

@@ -44,6 +44,12 @@ public void RaClassicAdmins()
             ResourcesController.NewInstance.RunPsTest("Test-RaClassicAdmins");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void RaPropertiesValidation() {
+            ResourcesController.NewInstance.RunPsTest("Test-RaPropertiesValidation");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void RaNegativeScenarios()

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

@@ -379,6 +379,55 @@ function Test-RaDeletionByScopeAtRootScope
     VerifyRoleAssignmentDeleted $newAssignment
 }
 
+<#
+.SYNOPSIS
+Tests verifies creation and validation of RoleAssignment properties for not null
+#>
+function Test-RaPropertiesValidation
+{
+    # Setup
+    $users = Get-AzureRmADUser | Select-Object -First 1 -Wait
+    $subscription = Get-AzureRmSubscription
+    $scope = '/subscriptions/'+$subscription[0].Id
+    $roleDef = Get-AzureRmRoleDefinition -Name "Reader"
+    $roleDef.Id = $null
+    $roleDef.Name = "Custom Reader Test"
+    $roleDef.Actions.Add("Microsoft.ClassicCompute/virtualMachines/restart/action")
+    $roleDef.Description = "Read, monitor and restart virtual machines"
+    $roleDef.AssignableScopes[0] = "/subscriptions/4004a9fd-d58e-48dc-aeb2-4a4aec58606f"
+
+    [Microsoft.Azure.Commands.Resources.Models.Authorization.AuthorizationClient]::RoleDefinitionNames.Enqueue("032F61D2-ED09-40C9-8657-26A273DA7BAE")
+    New-AzureRmRoleDefinition -Role $roleDef
+    $rd = Get-AzureRmRoleDefinition -Name "Custom Reader Test"
+
+    # Test
+    [Microsoft.Azure.Commands.Resources.Models.Authorization.AuthorizationClient]::RoleAssignmentNames.Enqueue("fa1a4d3b-2cca-406b-8956-6b6b32377641")
+    $newAssignment = New-AzureRmRoleAssignment `
+                        -ObjectId $users[0].Id.Guid `
+                        -RoleDefinitionName $roleDef.Name `
+                        -Scope $scope 
+    $newAssignment.Scope = $scope.toUpper()
+    
+    $assignments = Get-AzureRmRoleAssignment
+    Assert-NotNull $assignments
+    foreach ($assignment in $assignments){
+        Assert-NotNull $assignment
+        Assert-NotNull $assignment.RoleDefinitionName
+        Assert-AreNotEqual $assignment.RoleDefinitionName ""
+    }
+
+    # cleanup 
+    DeleteRoleAssignment $newAssignment
+    Remove-AzureRmRoleDefinition -Id $rd.Id -Force
+    
+    # Assert
+    Assert-NotNull $newAssignment
+    Assert-AreEqual $roleDef.Name $newAssignment.RoleDefinitionName 
+    Assert-AreEqual $scope $newAssignment.Scope 
+    Assert-AreEqual $users[0].DisplayName $newAssignment.DisplayName
+    
+    VerifyRoleAssignmentDeleted $newAssignment
+}
 
 <#
 .SYNOPSIS