From 113486f37094b1db72aa1226543a0529c92d042a Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Tue, 6 Jul 2021 17:18:20 -0400 Subject: [PATCH 1/4] InitialFixes --- CHANGELOG.md | 6 ++++++ .../MSFT_EXOHostedContentFilterPolicy.psm1 | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5296978282..7661b076ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ * Change the logic to remove an entry to disable it instead since the cmdlet didn't exist to remove it. ISSUE #1253 +* EXOHostedContentFilterPolicy + * Fixed the value type for the senders addresses, regions and domains; + ISSUE #1165 +* EXOOutboundConnector + * Fixed the creation logic to include ValidationRecipients; + ISSUE #1165 * EXOSharedMailbox * Improved speed of extraction and removed warning about maximum 1,000 items retrieved; diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/MSFT_EXOHostedContentFilterPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/MSFT_EXOHostedContentFilterPolicy.psm1 index f39904fa96..dfd04de195 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/MSFT_EXOHostedContentFilterPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/MSFT_EXOHostedContentFilterPolicy.psm1 @@ -291,15 +291,17 @@ function Get-TargetResource } else { + $AllowedSendersValues = $HostedContentFilterPolicy.AllowedSenders.Sender | Select-Object Address -ExpandProperty Address + $BlockedSendersValues = $HostedContentFilterPolicy.BlockedSenders.Sender | Select-Object Address -ExpandProperty Address $result = @{ Ensure = 'Present' Identity = $Identity AddXHeaderValue = $HostedContentFilterPolicy.AddXHeaderValue AdminDisplayName = $HostedContentFilterPolicy.AdminDisplayName - AllowedSenderDomains = $HostedContentFilterPolicy.AllowedSenderDomains - AllowedSenders = $HostedContentFilterPolicy.AllowedSenders - BlockedSenderDomains = $HostedContentFilterPolicy.BlockedSenderDomains - BlockedSenders = $HostedContentFilterPolicy.BlockedSenders + AllowedSenderDomains = $HostedContentFilterPolicy.AllowedSenderDomains.Domain + AllowedSenders = $AllowedSendersValues + BlockedSenderDomains = $HostedContentFilterPolicy.BlockedSenderDomains.Domain + BlockedSenders = $BlockedSendersValues BulkSpamAction = $HostedContentFilterPolicy.BulkSpamAction BulkThreshold = $HostedContentFilterPolicy.BulkThreshold DownloadLink = $HostedContentFilterPolicy.DownloadLink From 1fc30ca98961a84ceac7b6ec18f41d04129d3edc Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Tue, 6 Jul 2021 17:19:01 -0400 Subject: [PATCH 2/4] Update MSFT_EXOOutboundConnector.psm1 --- .../MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 | 1 - 1 file changed, 1 deletion(-) diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 index efe8a5d8cf..cf4d6fd491 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 @@ -337,7 +337,6 @@ function Set-TargetResource Write-Verbose -Message "Creating OutBoundConnector $($Identity)." $OutBoundConnectorParams.Add("Name", $Identity) $OutBoundConnectorParams.Remove('Identity') | Out-Null - $OutBoundConnectorParams.Remove("ValidationRecipients") | Out-Null New-OutBoundConnector @OutBoundConnectorParams } elseif (('Present' -eq $Ensure ) -and ($Null -ne $OutBoundConnector)) From bb57b0757a17ea679e94aa24411e9d68a9ffbae3 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Wed, 7 Jul 2021 08:50:32 -0400 Subject: [PATCH 3/4] Release 1.21.707.1 --- Modules/Microsoft365DSC/Microsoft365DSC.psd1 | 28 +++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 index 200746a50e..2d0560cf11 100644 --- a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 +++ b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 @@ -3,7 +3,7 @@ # # Generated by: Microsoft Corporation # -# Generated on: 2021-06-30 +# Generated on: 2021-07-07 @{ @@ -11,7 +11,7 @@ # RootModule = '' # Version number of this module. - ModuleVersion = '1.21.630.1' + ModuleVersion = '1.21.707.1' # Supported PSEditions # CompatiblePSEditions = @() @@ -177,11 +177,25 @@ IconUri = 'https://github.com/microsoft/Microsoft365DSC/blob/Dev/Modules/Microsoft365DSC/Dependencies/Images/Logo.png?raw=true' # ReleaseNotes of this module - ReleaseNotes = "* O365User - * Fix where export was throwing an error about an empty DSCBlock - ISSUE #1275; - * SPOTenantSettings - * Added support for specifying MarkNewFilesSensitiveByDefault" + ReleaseNotes = "* EXODkimSigningConfig + * Change the logic to remove an entry to disable it instead since the + cmdlet didn't exist to remove it. + ISSUE #1253 + * EXOHostedContentFilterPolicy + * Fixed the value type for the senders addresses, regions and domains; + ISSUE #1165 + * EXOOutboundConnector + * Fixed the creation logic to include ValidationRecipients; + ISSUE #1165 + * EXOSharedMailbox + * Improved speed of extraction and removed warning about maximum 1,000 + items retrieved; + * DEPENDENCIES + * Updated Microsoft.PowerApps.Administration.PowerShell to 2.0.127; + * MISC + * Delta Report - Fixes to compare null arrays properly and report as + a discrepancy. + ISSUES #1178 & #1249" # Flag to indicate whether the module requires explicit user acceptance for install/update # RequireLicenseAcceptance = $false From e1fdddc8416f4670cdc884c119a83b98c5885c2d Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Wed, 7 Jul 2021 10:42:38 -0400 Subject: [PATCH 4/4] Update MSFT_EXOOutboundConnector.psm1 --- .../MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 index 5db908018e..541a221f7a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 @@ -337,6 +337,7 @@ function Set-TargetResource Write-Verbose -Message "Creating OutBoundConnector $($Identity)." $OutBoundConnectorParams.Add("Name", $Identity) $OutBoundConnectorParams.Remove('Identity') | Out-Null + $OutBoundConnectorParams.Remove("ValidationRecipients") | Out-Null New-OutBoundConnector @OutBoundConnectorParams if ($null -ne $ValidationRecipients)