Addressed review comments for Get and Remove Azure Ro Assignments fixes

Author: shuagarw

src/ResourceManager/Resources/Commands.Resources/Models.Authorization/AuthorizationClient.cs

@@ -130,7 +130,7 @@ public PSRoleAssignment CreateRoleAssignment(FilterRoleAssignmentsOptions parame
         /// </summary>
         /// <param name="options">The filtering options</param>
         /// <returns>The filtered role assignments</returns>
-        public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions options, bool excludeAssignmentsForDeletedPrincipals = true)
+        public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions options)
         {
             List<PSRoleAssignment> result = new List<PSRoleAssignment>();
             ListAssignmentsFilterParameters parameters = new ListAssignmentsFilterParameters();
@@ -140,25 +140,25 @@ public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions
                 // Filter first by principal
                 parameters.PrincipalId = string.IsNullOrEmpty(options.ADObjectFilter.Id) ? ActiveDirectoryClient.GetObjectId(options.ADObjectFilter) : Guid.Parse(options.ADObjectFilter.Id);
                 result.AddRange(AuthorizationManagementClient.RoleAssignments.List(parameters)
-                    .RoleAssignments.Select(r => r.ToPSRoleAssignment(this, ActiveDirectoryClient, excludeAssignmentsForDeletedPrincipals)).Where(r => r != null));
+                    .RoleAssignments.Select(r => r.ToPSRoleAssignment(this, ActiveDirectoryClient, options.ExcludeAssignmentsForDeletedPrincipals)).Where(r => r != null));
 
                 // Filter out by scope
                 if (!string.IsNullOrEmpty(options.Scope))
                 {
-                    result.RemoveAll(r => !options.Scope.StartsWith(r.Scope, StringComparison.InvariantCultureIgnoreCase));                    
+                    result.RemoveAll(r => !options.Scope.StartsWith(r.Scope, StringComparison.InvariantCultureIgnoreCase));
                 }
             }
             else if (!string.IsNullOrEmpty(options.Scope))
             {
                 // Filter by scope and above directly
                 parameters.AtScope = true;
                 result.AddRange(AuthorizationManagementClient.RoleAssignments.ListForScope(options.Scope, parameters)
-                    .RoleAssignments.Select(r => r.ToPSRoleAssignment(this, ActiveDirectoryClient, excludeAssignmentsForDeletedPrincipals)).Where(r => r != null));
+                    .RoleAssignments.Select(r => r.ToPSRoleAssignment(this, ActiveDirectoryClient, options.ExcludeAssignmentsForDeletedPrincipals)).Where(r => r != null));
             }
             else
             {
                 result.AddRange(AuthorizationManagementClient.RoleAssignments.List(parameters)
-                    .RoleAssignments.Select(r => r.ToPSRoleAssignment(this, ActiveDirectoryClient, excludeAssignmentsForDeletedPrincipals)).Where(r => r != null));
+                    .RoleAssignments.Select(r => r.ToPSRoleAssignment(this, ActiveDirectoryClient, options.ExcludeAssignmentsForDeletedPrincipals)).Where(r => r != null));
             }
 
             if (!string.IsNullOrEmpty(options.RoleDefinition))
@@ -177,7 +177,7 @@ public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions
         public PSRoleAssignment RemoveRoleAssignment(FilterRoleAssignmentsOptions options)
         {
             // Match role assignments at exact scope. At most 1 roleAssignment should match the criteria
-            PSRoleAssignment roleAssignment = FilterRoleAssignments(options, excludeAssignmentsForDeletedPrincipals: false)
+            PSRoleAssignment roleAssignment = FilterRoleAssignments(options)
                                                 .Where(ra => ra.Scope == options.Scope.TrimEnd('/'))
                                                 .FirstOrDefault();
 

src/ResourceManager/Resources/Commands.Resources/Models.Authorization/FilterRoleAssignmentsOptions.cs

@@ -53,5 +53,7 @@ public string Scope
         public ResourceIdentifier ResourceIdentifier { get; set; }
 
         public ADObjectFilterOptions ADObjectFilter { get; set; }
+
+        public bool ExcludeAssignmentsForDeletedPrincipals { get; set; }
     }
 }

src/ResourceManager/Resources/Commands.Resources/RoleAssignments/GetAzureRoleAssignmentCommand.cs

@@ -212,10 +212,11 @@ protected override void ProcessRecord()
                     ResourceName = ResourceName,
                     ResourceType = ResourceType,
                     Subscription = string.IsNullOrEmpty(ResourceGroupName) ? null : DefaultProfile.DefaultContext.Subscription.Id.ToString()
-                }
+                },
+                ExcludeAssignmentsForDeletedPrincipals = true
             };
 
-            WriteObject(PoliciesClient.FilterRoleAssignments(options, excludeAssignmentsForDeletedPrincipals: true), enumerateCollection: true);
+            WriteObject(PoliciesClient.FilterRoleAssignments(options), enumerateCollection: true);
         }
     }
 }

src/ResourceManager/Resources/Commands.Resources/RoleAssignments/RemoveAzureRoleAssignmentCommand.cs

@@ -149,7 +149,8 @@ protected override void ProcessRecord()
                     ResourceName = ResourceName,
                     ResourceType = ResourceType,
                     Subscription = DefaultProfile.DefaultContext.Subscription.Id.ToString()
-                }
+                },
+                ExcludeAssignmentsForDeletedPrincipals = false
             };
 
             ConfirmAction(