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

TeamsGroupPolicyAssignment FIXES #5527 #5544

Open
wants to merge 4 commits into
base: Dev
Choose a base branch
from
+7 −5
Open

TeamsGroupPolicyAssignment FIXES #5527 #5544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9bef989
wip
sandrola Dec 12, 2024
7a952e2
add
sandrola Dec 12, 2024
09e77e6
Merge branch 'Dev' into 5527-TeamsGroupPolicyAssignment-fix-bug
sandrola Dec 12, 2024
65be891
wip
sandrola Dec 12, 2024
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: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* Fixing issue with the way the QrCodeImage property was exported and handled.
* IntuneFirewallPolicyWindows10
* Fix export of properties that appear multiple times in subsections.
* TeamsGroupPolicyAssignment
* FIXES [[#5527](https://github.com/microsoft/Microsoft365DSC/issues/5527)]
* M365DSCDRGUtil
* Improve settings catalog handling for nested objects.
* M365DSCResourceGenerator
Expand Down
3 changes: 2 additions & 1 deletion ...t365DSC/DSCResources/MSFT_TeamsGroupPolicyAssignment/MSFT_TeamsGroupPolicyAssignment.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ function Get-TargetResource
}

Write-Verbose -Message "Getting GroupPolicyAssignment with PolicyType {$PolicyType} for Group {$($Group.DisplayName)}"
$GroupPolicyAssignment = Get-CsGroupPolicyAssignment -GroupId $Group.Id -PolicyType $PolicyType -ErrorAction SilentlyContinue
$AllGroupPolicyAssignment = Get-CsGroupPolicyAssignment -ErrorAction SilentlyContinue
$GroupPolicyAssignment = $AllGroupPolicyAssignment | Where-Object{$_.GroupId -eq $Group.Id -and $_.PolicyType -eq $PolicyType}
if ($null -eq $GroupPolicyAssignment)
{
Write-Verbose -Message "GroupPolicyAssignment not found for Group {$GroupDisplayName}"
Expand Down
7 changes: 3 additions & 4 deletions Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsGroupPolicyAssignment.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,10 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
}

Mock -CommandName Find-CsGroup -MockWith {
return @(
@{
[PSCustomObject]@{
Displayname = 'TestGroup'
}
)
Id = '00000000-0000-0000-0000-000000000000'
}
}

Mock -CommandName get-csTeamsCallingPolicy -MockWith {
Expand Down