From 37cd2b7d1d3843c2cc45e0f95cd7956e3eea88f5 Mon Sep 17 00:00:00 2001 From: Julius Rauschen Date: Wed, 19 Feb 2025 08:21:42 +0100 Subject: [PATCH 1/2] Add ReportChatMessageEnabled, ReportChatMessageToCustomizedAddressEnabled properties --- CHANGELOG.md | 2 ++ .../MSFT_EXOReportSubmissionPolicy.psm1 | 26 +++++++++++++++++++ .../MSFT_EXOReportSubmissionPolicy.schema.mof | 2 ++ 3 files changed, 30 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d6119d856..8aee321a67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ * EXOSmtpDaneInbound * Updated authentication properties to align with MOF definition. FIXES [#5709](https://github.com/microsoft/Microsoft365DSC/issues/5709) +* EXOReportSubmissionPolicy + * Add ReportChatMessageEnabled, ReportChatMessageToCustomizedAddressEnabled * MISC * PowerPlatform resource revamp to use direct REST API calls. * DEPENDENCIES diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionPolicy/MSFT_EXOReportSubmissionPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionPolicy/MSFT_EXOReportSubmissionPolicy.psm1 index ecdfa2dbde..f9192d310b 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionPolicy/MSFT_EXOReportSubmissionPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionPolicy/MSFT_EXOReportSubmissionPolicy.psm1 @@ -105,6 +105,14 @@ function Get-TargetResource [System.String[]] $ThirdPartyReportAddresses = @(), + [Parameter()] + [System.Boolean] + $ReportChatMessageEnabled, + + [Parameter()] + [System.Boolean] + $ReportChatMessageToCustomizedAddressEnabled, + [Parameter()] [ValidateSet('Present', 'Absent')] [System.String] @@ -209,6 +217,8 @@ function Get-TargetResource ReportPhishAddresses = $ReportSubmissionPolicy.ReportPhishAddresses ReportPhishToCustomizedAddress = $ReportSubmissionPolicy.ReportPhishToCustomizedAddress ThirdPartyReportAddresses = $ReportSubmissionPolicy.ThirdPartyReportAddresses + ReportChatMessageEnabled = $ReportSubmissionPolicy.ReportChatMessageEnabled + ReportChatMessageToCustomizedAddressEnabled = $ReportSubmissionPolicy.ReportChatMessageToCustomizedAddressEnabled Credential = $Credential Ensure = 'Present' ApplicationId = $ApplicationId @@ -344,6 +354,14 @@ function Set-TargetResource [System.String[]] $ThirdPartyReportAddresses = @(), + [Parameter()] + [System.Boolean] + $ReportChatMessageEnabled, + + [Parameter()] + [System.Boolean] + $ReportChatMessageToCustomizedAddressEnabled, + [Parameter()] [ValidateSet('Present', 'Absent')] [System.String] @@ -538,6 +556,14 @@ function Test-TargetResource [System.String[]] $ThirdPartyReportAddresses = @(), + [Parameter()] + [System.Boolean] + $ReportChatMessageEnabled, + + [Parameter()] + [System.Boolean] + $ReportChatMessageToCustomizedAddressEnabled, + [Parameter()] [ValidateSet('Present', 'Absent')] [System.String] diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionPolicy/MSFT_EXOReportSubmissionPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionPolicy/MSFT_EXOReportSubmissionPolicy.schema.mof index f1a5df9d22..858cbd25fc 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionPolicy/MSFT_EXOReportSubmissionPolicy.schema.mof +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionPolicy/MSFT_EXOReportSubmissionPolicy.schema.mof @@ -27,6 +27,8 @@ class MSFT_EXOReportSubmissionPolicy : OMI_BaseResource [Write, Description("The ReportPhishAddresses parameter specifies the email address of the reporting mailbox in Exchange Online to receive user reported messages in reporting in Outlook using Microsoft or third-party reporting tools in Outlook.")] String ReportPhishAddresses[]; [Write, Description("The ReportPhishToCustomizedAddress parameter specifies whether to send user reported messages from Outlook (using Microsoft or third-party reporting tools) to the reporting mailbox as part of reporting in Outlook.")] Boolean ReportPhishToCustomizedAddress; [Write, Description("Use the ThirdPartyReportAddresses parameter to specify the email address of the reporting mailbox when you're using a third-party product for user submissions instead of reporting in Outlook.")] String ThirdPartyReportAddresses[]; + [Write, Description("")] Boolean ReportChatMessageEnabled; + [Write, Description("")] Boolean ReportChatMessageToCustomizedAddressEnabled; [Write, Description("Specifies if this report submission policy should exist."), ValueMap{"Present","Absent"}, Values{"Present","Absent"}] String Ensure; [Write, Description("Credentials of the Exchange Global Admin"), EmbeddedInstance("MSFT_Credential")] string Credential; [Write, Description("Id of the Azure Active Directory application to authenticate with.")] String ApplicationId; From 7eb5decb80956f86f2f7454dddfd885377328b25 Mon Sep 17 00:00:00 2001 From: Julius Rauschen Date: Thu, 20 Feb 2025 14:16:35 +0100 Subject: [PATCH 2/2] Add placeholder descriptions to EXOReportSubmissionPolicy.schema.mof --- .../MSFT_EXOReportSubmissionPolicy.schema.mof | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionPolicy/MSFT_EXOReportSubmissionPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionPolicy/MSFT_EXOReportSubmissionPolicy.schema.mof index 858cbd25fc..422b9dec9f 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionPolicy/MSFT_EXOReportSubmissionPolicy.schema.mof +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOReportSubmissionPolicy/MSFT_EXOReportSubmissionPolicy.schema.mof @@ -27,8 +27,8 @@ class MSFT_EXOReportSubmissionPolicy : OMI_BaseResource [Write, Description("The ReportPhishAddresses parameter specifies the email address of the reporting mailbox in Exchange Online to receive user reported messages in reporting in Outlook using Microsoft or third-party reporting tools in Outlook.")] String ReportPhishAddresses[]; [Write, Description("The ReportPhishToCustomizedAddress parameter specifies whether to send user reported messages from Outlook (using Microsoft or third-party reporting tools) to the reporting mailbox as part of reporting in Outlook.")] Boolean ReportPhishToCustomizedAddress; [Write, Description("Use the ThirdPartyReportAddresses parameter to specify the email address of the reporting mailbox when you're using a third-party product for user submissions instead of reporting in Outlook.")] String ThirdPartyReportAddresses[]; - [Write, Description("")] Boolean ReportChatMessageEnabled; - [Write, Description("")] Boolean ReportChatMessageToCustomizedAddressEnabled; + [Write, Description("TBD")] Boolean ReportChatMessageEnabled; + [Write, Description("TBD")] Boolean ReportChatMessageToCustomizedAddressEnabled; [Write, Description("Specifies if this report submission policy should exist."), ValueMap{"Present","Absent"}, Values{"Present","Absent"}] String Ensure; [Write, Description("Credentials of the Exchange Global Admin"), EmbeddedInstance("MSFT_Credential")] string Credential; [Write, Description("Id of the Azure Active Directory application to authenticate with.")] String ApplicationId;