Fixes microsoft#2471

NikCharlebois · Dec 9, 2022 · 512d626 · 512d626
1 parent 787b74b
commit 512d626
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,9 @@
 * PlannerBucket & PlannerPlan
   * Changed invalid permissions in the setting.json files.
     FIXES [#2629](https://github.com/microsoft/Microsoft365DSC/issues/2629)
+* SCRetentionComplianceRule
+  * Fixed an Issue where properties weren't properly set at creation, causing drifts to be detected.
+    FIXES [#2471](https://github.com/microsoft/Microsoft365DSC/issues/2471)
 * SPOUserProfileProperty
   * Removed multi-threading to align with other resources.
   * Fixed an issue where we were contacting Microsoft Graph to retrieve users without authenticating to it.

diff --git a/...oft365DSC/DSCResources/MSFT_SCRetentionComplianceRule/MSFT_SCRetentionComplianceRule.psm1 b/...oft365DSC/DSCResources/MSFT_SCRetentionComplianceRule/MSFT_SCRetentionComplianceRule.psm1
@@ -216,11 +216,11 @@ function Set-TargetResource
         Write-Verbose -Message 'Checking to see if the policy is a Teams based one.'
         $RuleObject = Get-RetentionComplianceRule -Identity $Name `
             -ErrorAction SilentlyContinue
-        $AssociatedPolicy = Get-RetentionCompliancePolicy $RuleObject.Policy
+        $AssociatedPolicy = Get-RetentionCompliancePolicy $Policy
 
         if ($AssociatedPolicy.TeamsPolicy)
         {
-            Write-Verbose -Message 'The current policy is a Teams based one, removing invalid parameters.'
+            Write-Verbose -Message 'The current policy is a Teams based one, removing invalid parameters for Creation.'
             if ($CreationParams.ContainsKey('ApplyComplianceTag'))
             {
                 $CreationParams.Remove('ApplyComplianceTag') | Out-Null
@@ -251,6 +251,7 @@ function Set-TargetResource
             }
         }
 
+        Write-Verbose -Message "Creating new RetentionComplianceRule with values:`r`n$(Convert-M365DscHashtableToString -Hashtable $CreationParams)"
         New-RetentionComplianceRule @CreationParams
     }
     elseif (('Present' -eq $Ensure) -and ('Present' -eq $CurrentRule.Ensure))
@@ -269,7 +270,7 @@ function Set-TargetResource
 
         if ($AssociatedPolicy.TeamsPolicy)
         {
-            Write-Verbose -Message 'The current policy is a Teams based one, removing invalid parameters.'
+            Write-Verbose -Message 'The current policy is a Teams based one, removing invalid parameters for Update.'
 
             if ($CreationParams.ContainsKey('ApplyComplianceTag'))
             {
@@ -301,6 +302,7 @@ function Set-TargetResource
             }
         }
 
+        Write-Verbose -Message "Updating RetentionComplianceRule with values:`r`n$(Convert-M365DscHashtableToString -Hashtable $CreationParams)"
         Set-RetentionComplianceRule @CreationParams
     }
     elseif (('Absent' -eq $Ensure) -and ('Present' -eq $CurrentPolicy.Ensure))