Implemented full support for GlobalQuarantinePolicy #3312
Conversation
|
@microsoft-github-policy-service agree |
CHANGELOG.md
Outdated
| @@ -39,7 +39,7 @@ | |||
| * Initial release | |||
| FIXES [#3253](https://github.com/microsoft/Microsoft365DSC/issues/3253) | |||
| * EXOQuarantinePolicy | |||
| * Support exporting global quarantine policy | |||
| * Support exporting and importing global quarantine policy | |||
There was a problem hiding this comment.
Please add this under the unreleased section above.
Modules/Microsoft365DSC/DSCResources/MSFT_EXOQuarantinePolicy/MSFT_EXOQuarantinePolicy.psm1
Show resolved
Hide resolved
Modules/Microsoft365DSC/DSCResources/MSFT_EXOQuarantinePolicy/MSFT_EXOQuarantinePolicy.psm1
Outdated
Show resolved
Hide resolved
| QuarantinePolicyType = $QuarantinePolicy.QuarantinePolicyType | ||
| } | ||
| } | ||
| else |
There was a problem hiding this comment.
Why do we need an else statement here? What would be the issue with passing in QuarantinePolicyType for all scenarios, even if it's not equal to 'GlobalQuarantineTag'? The Get-TargetResource should then be handling it correctly no matter what.
There was a problem hiding this comment.
You are right, Nik. I removed the redundant if statement since it is not necessary there
| @@ -17,4 +17,7 @@ class MSFT_EXOQuarantinePolicy : OMI_BaseResource | |||
| [Write, Description("Username can be made up to anything but password will be used for CertificatePassword"), EmbeddedInstance("MSFT_Credential")] String CertificatePassword; | |||
| [Write, Description("Path to certificate used in service principal usually a PFX file.")] String CertificatePath; | |||
| [Write, Description("Managed ID being used for authentication.")] Boolean ManagedIdentity; | |||
| [Write, Description("The EndUserSpamNotificationFrequency parameter species how often quarantine notifications are sent to users. Valid values are: 04:00:00 (4 hours),1.00:00:00 (1 day),7.00:00:00 (7 days)")] String EndUserSpamNotificationFrequency; | |||
| [Write, Description("The QuarantinePolicyType parameter filters the results by the specified quarantine policy type. Valid values are: QuarantinePolicy, GlobalQuarantinePolicy")] String QuarantinePolicyType; | |||
| [Write, Description("This parameter is reserved for internal Microsoft use.")] String EndUserSpamNotificationFrequencyInDays; | |||
| }; | |||
There was a problem hiding this comment.
Looks like we are missing a few parameters e.g., CustomDisclaimer. We need to make sure that all new parameters are defined in the schema.
There was a problem hiding this comment.
Added missed parameters.
|
@max-freshmethod Hi, it looks good to me even though unfortunately cannot test it since I don't have any windows machine available right now, but please change the mockups I added to the tests on my previous PR to return GlobalQuarantineTag instead of DefaultGlobalPolicy. |
Pull Request (PR) description
Updated Microsoft365DSC.EXOQuarantinePolicy to properly support the import and export of GlobalQuarantinePolicy with all parameters. The changes are needed because GlobalQuarantinePolicy has a different set of parameters compared to the regular QuarantinePolicy
This Pull Request (PR) fixes the following issues
Fixes #3285