Merge pull request #5180 from swisscom/TeamsGroupPolicyAssignment

Teams group policy assignment
microsoft · Oct 21, 2024 · 6d694db · 6d694db
2 parents 0927c65 + 86027e6
commit 6d694db
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -89,6 +89,8 @@
 * TeamsUpgradePolicy
   * Added support for tenant wide changes using the * value for users.
     FIXES [#5174](https://github.com/microsoft/Microsoft365DSC/issues/5174)
+* TeamsGroupPolicyAssignments
+  * FIXES [#5179](https://github.com/microsoft/Microsoft365DSC/issues/5179)
 * M365DSCDRGUtil
   * Fixes an issue for the handling of skipped one-property elements in the
     Settings Catalog. FIXES [#5086](https://github.com/microsoft/Microsoft365DSC/issues/5086)

diff --git a/...t365DSC/DSCResources/MSFT_TeamsGroupPolicyAssignment/MSFT_TeamsGroupPolicyAssignment.psm1 b/...t365DSC/DSCResources/MSFT_TeamsGroupPolicyAssignment/MSFT_TeamsGroupPolicyAssignment.psm1
@@ -75,8 +75,12 @@ function Get-TargetResource
     try
     {
         Write-Verbose -Message "Getting Group with Id {$GroupId}"
-        $Group = Find-CsGroup -SearchQuery $GroupId -ExactMatchOnly $true -ErrorAction SilentlyContinue
-
+        if ($GroupId -match '\b[A-Fa-f0-9]{8}(?:-[A-Fa-f0-9]{4}){3}-[A-Fa-f0-9]{12}\b' -and $GroupId -ne '00000000-0000-0000-0000-000000000000'){
+            $Group = Find-CsGroup -SearchQuery $GroupId -ExactMatchOnly $true -ErrorAction SilentlyContinue
+        }
+        else {
+            $Group = $null
+        }
         if ($null -eq $Group)
         {
             Write-Verbose -Message "Could not find Group with Id {$GroupId}, searching with DisplayName {$GroupDisplayName}"

diff --git a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsGroupPolicyAssignment.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsGroupPolicyAssignment.Tests.ps1
@@ -38,7 +38,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
             Mock -CommandName Find-CsGroup -MockWith {
                 return @(
                     @{
-                        Id= '00000000-0000-0000-0000-000000000000'
                         Displayname = 'TestGroup'
                     }
                 )