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

EXOTransportRule: Fix export of enabled state #4095

Merged
merged 2 commits into from
Dec 29, 2023
Merged

EXOTransportRule: Fix export of enabled state #4095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97cb5ee
Fix export of enabled state
malauter Dec 27, 2023
e958fcf
Merge branch 'Dev' into Fix-3932
NikCharlebois Dec 29, 2023
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
* EXOMailboxCalendarFolder
* Add support for non-English calendar folder names during export
FIXES [#4056](https://github.com/microsoft/Microsoft365DSC/issues/4056)
* EXOTransportRule
* Fix export of enabled state
FIXES [#3932](https://github.com/microsoft/Microsoft365DSC/issues/3932)
* IntuneDeviceConfigurationCustomPolicyWindows10
* Fix issue deploying decrypted OmaSettings to another tenant
FIXES [#4083](https://github.com/microsoft/Microsoft365DSC/issues/4083)
Expand Down
12 changes: 11 additions & 1 deletion Modules/Microsoft365DSC/DSCResources/MSFT_EXOTransportRule/MSFT_EXOTransportRule.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,16 @@ function Get-TargetResource
{
$MessageContainsDataClassificationsValue = $TransportRule.MessageContainsDataClassifications.Replace('"', "'")
}

if ($TransportRule.State -eq "Enabled")
{
$enabled = $true
}
else
{
$enabled = $false
}

$result = @{
Name = $TransportRule.Name
ADComparisonAttribute = $TransportRule.ADComparisonAttribute
Expand Down Expand Up @@ -820,7 +830,7 @@ function Get-TargetResource
CopyTo = $TransportRule.CopyTo
DeleteMessage = $TransportRule.DeleteMessage
DlpPolicy = $TransportRule.DlpPolicy
Enabled = $TransportRule.Enabled
Enabled = $enabled
ExceptIfADComparisonAttribute = $TransportRule.ExceptIfADComparisonAttribute
ExceptIfADComparisonOperator = $TransportRule.ExceptIfADComparisonOperator
ExceptIfAnyOfCcHeader = $TransportRule.ExceptIfAnyOfCcHeader
Expand Down