Skip to content

Commit

Permalink
Merge pull request #4654 from ricmestre/fix4653
Browse files Browse the repository at this point in the history
TeamsMeetingPolicy: Fix creation and set of resource
  • Loading branch information
NikCharlebois committed May 14, 2024
2 parents fd10d40 + 5393264 commit 821cc68
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
* IntuneDeviceConfigurationDefenderForEndpointOnboardingPolicyWindows10
* Fixed a creation and update issue when the exported policy contains a
onboarding blob and the tenant is connected to Defender for Endpoint Service.
<<<<<<< fix4653
* TeamsMeetingPolicy
* Fix creation and set of resource when cloud recording is set to false (off)
FIXES [#4653](https://github.com/microsoft/Microsoft365DSC/issues/4653)
=======
* SPOSharingSettings
* Remove properties from being tested in certain conditions
FIXES [#4649](https://github.com/microsoft/Microsoft365DSC/issues/4649)
Expand All @@ -30,6 +35,7 @@
* Remove unnecessary parameters from PSBoundParameters such as authentication
methods, Ensure and Verbose by calling Remove-M365DSCAuthenticationParameter
FIXES [#4651](https://github.com/microsoft/Microsoft365DSC/issues/4651)
>>>>>>> Dev
* M365DSCUtil
* Fixed an issue where one could not pass empty arrays to the
`Compare-PSCustomObjectArrays` function.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,10 @@ function Set-TargetResource
$SetParameters.Remove('ManagedIdentity') | Out-Null
$SetParameters.Remove('Verbose') | Out-Null # Needs to be implicitly removed for the cmdlet to work
$SetParameters.Remove('AccessTokens') | Out-Null
if ($AllowCloudRecording -eq $false -and $SetParameters.Keys -contains 'AllowRecordingStorageOutsideRegion')
{
$SetParameters.Remove('AllowRecordingStorageOutsideRegion') | Out-Null
}

if ($Ensure -eq 'Present' -and $CurrentValues.Ensure -eq 'Absent')
{
Expand Down Expand Up @@ -1135,6 +1139,11 @@ function Test-TargetResource
# The AllowUserToJoinExternalMeeting doesn't do anything based on official documentation
$ValuesToCheck.Remove('AllowUserToJoinExternalMeeting') | Out-Null

if ($AllowCloudRecording -eq $false -and $ValuesToCheck.Keys -contains 'AllowRecordingStorageOutsideRegion')
{
$ValuesToCheck.Remove('AllowRecordingStorageOutsideRegion') | Out-Null
}

$TestResult = Test-M365DSCParameterState -CurrentValues $CurrentValues `
-Source $($MyInvocation.MyCommand.Source) `
-DesiredValues $PSBoundParameters `
Expand Down

0 comments on commit 821cc68

Please sign in to comment.