Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Az.Resources] Fixed query issue when objectId in assignment is empty for Get-DenyAssignment #20813

Merged
merged 2 commits into from
Feb 1, 2023
Merged

[Az.Resources] Fixed query issue when objectId in assignment is empty for Get-DenyAssignment #20813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb21216
Fixed query issue when objectId in assignment is empty for Get-DenyAs…
BethanyZhou Feb 1, 2023
358bd23
Merge branch 'release-2023-02-07' into quickFix
BethanyZhou Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Resources/Resources/ActiveDirectory/Models/ActiveDirectoryClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ public IEnumerable<PSADUser> FilterUsers(ADObjectFilterOptions options, int firs
/// </summary>
public PSADObject GetObjectByObjectId(string objectId)
{
return GraphClient.DirectoryObjects.GetDirectoryObject(objectId)?.ToPSADObject();
return string.IsNullOrEmpty(objectId) ? null : GraphClient.DirectoryObjects.GetDirectoryObject(objectId)?.ToPSADObject();
}

/// <summary>
Expand Down
1 change: 1 addition & 0 deletions src/Resources/Resources/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
-->

## Upcoming Release
* Fixed query issue when objectId in assignment is empty for `Get-DenyAssignment`
* Fixed an issue where running deployment cmdlets with `-WhatIf` throws exception when formatting results with nested array changes

## Version 6.5.1
Expand Down
21 changes: 18 additions & 3 deletions src/Resources/Resources/Models.Authorization/AuthorizationClientExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public static IEnumerable<PSRoleAssignment> ToPSRoleAssignments(this IEnumerable
List<PSADObject> adObjects = null;
try
{
adObjects = objectIds.Count > 1 ? activeDirectoryClient.GetObjectsByObjectIds(objectIds) : new List<PSADObject>() { activeDirectoryClient.GetObjectByObjectId(objectIds.FirstOrDefault()) };
adObjects = GetAdObjectsByObjectIds(objectIds, activeDirectoryClient);
}
catch (Common.MSGraph.Version1_0.DirectoryObjects.Models.OdataErrorException)
{
Expand Down Expand Up @@ -222,6 +222,21 @@ public static IEnumerable<PSRoleAssignment> ToPSRoleAssignments(this IEnumerable
return psAssignments;
}

private static List<PSADObject> GetAdObjectsByObjectIds(List<string> objectIds, ActiveDirectoryClient activeDirectoryClient)
{
if (null == objectIds || 0 == objectIds.Count())
{
return new List<PSADObject>();
}
else if (1 == objectIds.Count())
{
return new List<PSADObject>() { activeDirectoryClient.GetObjectByObjectId(objectIds.FirstOrDefault()) };
}else
{
return activeDirectoryClient.GetObjectsByObjectIds(objectIds);
}
}

private static IEnumerable<PSPrincipal> ToPSPrincipals(this IEnumerable<Principal> principals, IEnumerable<PSADObject> adObjects)
{
var psPrincipals = new List<PSPrincipal>();
Expand Down Expand Up @@ -265,7 +280,7 @@ public static PSDenyAssignment ToPSDenyAssignment(this DenyAssignment assignment

try
{
adObjects = objectIds.Count() <= 1 ? new List<PSADObject>() { activeDirectoryClient.GetObjectByObjectId(objectIds.FirstOrDefault()) } : activeDirectoryClient.GetObjectsByObjectIds(objectIds);
adObjects = GetAdObjectsByObjectIds(objectIds, activeDirectoryClient);
}
catch (Common.MSGraph.Version1_0.DirectoryObjects.Models.OdataErrorException)
{
Expand Down Expand Up @@ -306,7 +321,7 @@ public static IEnumerable<PSDenyAssignment> ToPSDenyAssignments(this IEnumerable
List<PSADObject> adObjects = null;
try
{
adObjects = objectIds.Count() <= 1 ? new List<PSADObject>() { activeDirectoryClient.GetObjectByObjectId(objectIds.FirstOrDefault()) } : activeDirectoryClient.GetObjectsByObjectIds(objectIds);
adObjects = GetAdObjectsByObjectIds(objectIds, activeDirectoryClient);
}
catch (Common.MSGraph.Version1_0.DirectoryObjects.Models.OdataErrorException)
{
Expand Down