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

[AADRoleSettings] Fixed issue where missing settings object for a role caused errors. #5644

Merged
merged 9 commits into from
Jan 17, 2025
Merged

[AADRoleSettings] Fixed issue where missing settings object for a role caused errors. #5644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
67e0830
AADServicePrincipal - fix AppId assignment
niwamo Jan 15, 2025
c9bcef9
AADServicePrincipal - Fixed Unit Test
niwamo Jan 9, 2025
c52a8bb
Merge branch 'Dev' into Fix_AADServicePrincipal
niwamo Jan 16, 2025
1a541ee
Merge branch 'Dev' into Fix_AADServicePrincipal
niwamo Jan 16, 2025
f469796
Fixing #5602
ykuijs Jan 17, 2025
a59a6d2
Merge pull request #5605 from niwamo/Fix_AADServicePrincipal
ykuijs Jan 17, 2025
724d535
Fixing #5602
ykuijs Jan 17, 2025
0598d89
Corrected changelog
ykuijs Jan 17, 2025
b6d4bcf
Merge branch 'Dev' of https://github.com/ykuijs/Microsoft365DSC into Dev
ykuijs Jan 17, 2025
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@

* AADDeviceRegistrationPolicy
* Fixes an error when trying to disable AAD join.
* AADRoleSetting
* Fixed issue where missing settings object for a role caused errors.
FIXES [#5602](https://github.com/microsoft/Microsoft365DSC/issues/5602)
* AADServicePrincipal
* FIXES [#5549](https://github.com/microsoft/Microsoft365DSC/issues/5549)
* FabricAdminTenantSettings
* Added support for the AllowGetOneLakeUDK, AllowMountDfCreation, AllowOneLakeUDK,
ArtifactOrgAppPreview properties.
Expand Down
2 changes: 1 addition & 1 deletion Modules/Microsoft365DSC/DSCResources/MSFT_AADRoleSetting/MSFT_AADRoleSetting.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ function Get-TargetResource
}

#get Policyrule
$role = Get-MgBetaPolicyRoleManagementPolicyRule -UnifiedRoleManagementPolicyId $Policy.Policyid
$role = Get-MgBetaPolicyRoleManagementPolicyRule -UnifiedRoleManagementPolicyId $Policy.Policyid -ErrorAction SilentlyContinue

$DisplayName = $RoleDefinition.DisplayName
$ActivationMaxDuration = ($role | Where-Object { $_.Id -eq 'Expiration_EndUser_Assignment' }).AdditionalProperties.maximumDuration
Expand Down
2 changes: 1 addition & 1 deletion Modules/Microsoft365DSC/DSCResources/MSFT_AADServicePrincipal/MSFT_AADServicePrincipal.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ function Get-TargetResource
}

$result = @{
AppId = $appInstance.DisplayName
AppId = $AADServicePrincipal.AppId
AppRoleAssignedTo = $AppRoleAssignedToValues
ObjectID = $AADServicePrincipal.Id
DisplayName = $AADServicePrincipal.DisplayName
Expand Down
2 changes: 1 addition & 1 deletion Tests/Unit/Microsoft365DSC/Microsoft365DSC.AADServicePrincipal.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
Context -Name 'The app exists and values are already in the desired state' -Fixture {
BeforeAll {
$testParams = @{
AppId = 'App1'
AppId = 'b4f08c68-7276-4cb8-b9ae-e75fca5ff834'
DisplayName = 'App1'
AlternativeNames = 'AlternativeName1', 'AlternativeName2'
AccountEnabled = $true
Expand Down