Merge pull request #5544 from swisscom/5527-TeamsGroupPolicyAssignmen…

…t-fix-bug TeamsGroupPolicyAssignment FIXES #5527
microsoft · Jan 15, 2025 · 597160f · 597160f
2 parents 256abe6 + ef51479
commit 597160f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,8 @@
   * initial release
 * IntuneVPNConfigurationPolicyAndroidWork
   * Initial release
+* TeamsGroupPolicyAssignment
+  * FIXES [[#5527](https://github.com/microsoft/Microsoft365DSC/issues/5527)]
 
 # 1.25.108.1
 

diff --git a/...t365DSC/DSCResources/MSFT_TeamsGroupPolicyAssignment/MSFT_TeamsGroupPolicyAssignment.psm1 b/...t365DSC/DSCResources/MSFT_TeamsGroupPolicyAssignment/MSFT_TeamsGroupPolicyAssignment.psm1
@@ -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}"

diff --git a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsGroupPolicyAssignment.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsGroupPolicyAssignment.Tests.ps1
@@ -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 {