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.

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

Fixes default value apply of JournalingReportNdrTo in EXO Transport Config #5851

Open
wants to merge 2 commits into
base: Dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

* AADRoleEligibilityScheduleRequest
* Updated startdatetime and enddatetime properties to be of type DATETIME.
* EXOTransportConfig
* Fixed an issue where `JournalingReportNdrTo` with the default value of `<>`
would throw an error during apply.
FIXES [#5606](https://github.com/microsoft/Microsoft365DSC/issues/5606)

# 1.25.226.1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,6 @@ function Set-TargetResource
$ConnectionMode = New-M365DSCConnection -Workload 'ExchangeOnline' `
-InboundParameters $PSBoundParameters


Write-Verbose -Message "Setting EXOTransportConfig with values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)"
$SetValues = [System.Collections.Hashtable]($PSBoundParameters)
$SetValues.Remove('IsSingleInstance') | Out-Null
Expand All @@ -411,6 +410,11 @@ function Set-TargetResource
$SetValues.Remove('ManagedIdentity') | Out-Null
$SetValues.Remove('AccessTokens') | Out-Null

if ($SetValues.JournalingReportNdrTo -eq '<>' -or [System.String]::IsNullOrEmpty($SetValues.JournalingReportNdrTo))
{
$SetValues.Remove('JournalingReportNdrTo') | Out-Null
}

Set-TransportConfig @SetValues
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class MSFT_EXOTransportConfig : OMI_BaseResource
[Write, Description("The InternalDsnReportingAuthority parameter specifies the domain in the machine-readable part of internal DSN messages.")] String InternalDsnReportingAuthority;
[Write, Description("The InternalDsnSendHtml parameter specifies whether internal DSN messages should be HTML or plain text.")] Boolean InternalDsnSendHtml;
[Write, Description("The JournalMessageExpirationDays parameter extends the number of days that undeliverable journal reports are queued before they expire.")] SInt32 JournalMessageExpirationDays;
[Write, Description("The JournalingReportNdrTo parameter specifies the email address to which journal reports are sent if the journaling mailbox is unavailable.")] String JournalingReportNdrTo;
[Write, Description("The JournalingReportNdrTo parameter specifies the email address to which journal reports are sent if the journaling mailbox is unavailable. Once set, it cannot be reset to blank again.")] String JournalingReportNdrTo;
[Write, Description("The MaxRecipientEnvelopeLimit parameter specifies the maximum number of recipients in a message.")] String MaxRecipientEnvelopeLimit;
[Write, Description("Reply all storm block duration hours.")] SInt32 ReplyAllStormBlockDurationHours;
[Write, Description("Reply all storm detection minimum recipients.")] SInt32 ReplyAllStormDetectionMinimumRecipients;
Expand Down