Merge pull request microsoft#2128 from NikCharlebois/Fix-#1820

Fixes microsoft#1820
NikCharlebois · Jul 21, 2022 · 147cf9d · 147cf9d
2 parents e5035c1 + c57883e
commit 147cf9d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 # UNRELEASED
 
+* EXOTransportRule
+  * Fixed issue where the MessageContainsDataClassifications property was not properly extracted due to single quote exiting.
+  FIXES [#1820](https://github.com/microsoft/Microsoft365DSC/issues/1820)
 * IntuneDeviceConfigurationPolicyWindows10
   * Fixed issue where the edgeSearchEngine value was not properly retrieved.
   FIXES [#1783](https://github.com/microsoft/Microsoft365DSC/issues/1783)

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTransportRule/MSFT_EXOTransportRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOTransportRule/MSFT_EXOTransportRule.psm1
@@ -766,6 +766,11 @@ function Get-TargetResource
     }
     else
     {
+        $MessageContainsDataClassificationsValue = $null
+        if ($null -ne $TransportRule.MessageContainsDataClassifications)
+        {
+            $MessageContainsDataClassificationsValue = $TransportRule.MessageContainsDataClassifications.Replace('"', "'")
+        }
         $result = @{
             Name                                          = $TransportRule.Name
             ADComparisonAttribute                         = $TransportRule.ADComparisonAttribute
@@ -888,7 +893,7 @@ function Get-TargetResource
             ManagerAddresses                              = $TransportRule.ManagerAddresses
             ManagerForEvaluatedUser                       = $TransportRule.ManagerForEvaluatedUser
             MessageContainsAllDataClassifications         = $TransportRule.MessageContainsAllDataClassifications
-            MessageContainsDataClassifications            = $TransportRule.MessageContainsDataClassifications
+            MessageContainsDataClassifications            = $MessageContainsDataClassificationsValue
             MessageSizeOver                               = $TransportRule.MessageSizeOver
             MessageTypeMatches                            = $TransportRule.MessageTypeMatches
             Mode                                          = $TransportRule.Mode