From a7bc2dc0116e5a970449b957b7d14d294fc81e6c Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Fri, 2 Feb 2024 07:08:23 -0500 Subject: [PATCH 1/2] Release 1.24.131.2 --- CHANGELOG.md | 7 +++++ .../MSFT_TeamsMeetingPolicy.psm1 | 27 ++++++++++++++++--- .../MSFT_TeamsUpdateManagementPolicy.psm1 | 6 ++++- Modules/Microsoft365DSC/Microsoft365DSC.psd1 | 8 ++++-- 4 files changed, 41 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c40168611..ced60757cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Change log for Microsoft365DSC +# 1.24.131.2 + +* TeamsMeetingPolicy + * Fixed issue with missing ManagedIdentity parameter in Test signature. +* TeamsUpdateManagementPolicy + * Fixed issue with missing ManagedIdentity parameter in Test signature. + # 1.24.131.1 * EXOAvailabilityAddressSpace diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.psm1 index 197912037e..494656a498 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.psm1 @@ -295,7 +295,11 @@ function Get-TargetResource [Parameter()] [System.String] - $CertificateThumbprint + $CertificateThumbprint, + + [Parameter()] + [Switch] + $ManagedIdentity ) Write-Verbose -Message "Getting the Teams Meeting Policy $($Identity)" @@ -396,6 +400,7 @@ function Get-TargetResource ApplicationId = $ApplicationId TenantId = $TenantId CertificateThumbprint = $CertificateThumbprint + ManagedIdentity = $ManagedIdentity.IsPresent } } catch @@ -706,7 +711,11 @@ function Set-TargetResource [Parameter()] [System.String] - $CertificateThumbprint + $CertificateThumbprint, + + [Parameter()] + [Switch] + $ManagedIdentity ) Write-Verbose -Message 'Setting Teams Meeting Policy' @@ -734,6 +743,7 @@ function Set-TargetResource $SetParameters.Remove('ApplicationId') | Out-Null $SetParameters.Remove('TenantId') | Out-Null $SetParameters.Remove('CertificateThumbprint') | Out-Null + $SetParameters.Remove('ManagedIdentity') | Out-Null $SetParameters.Remove('Verbose') | Out-Null # Needs to be implicitly removed for the cmdlet to work if ($Ensure -eq 'Present' -and $CurrentValues.Ensure -eq 'Absent') @@ -1074,7 +1084,11 @@ function Test-TargetResource [Parameter()] [System.String] - $CertificateThumbprint + $CertificateThumbprint, + + [Parameter()] + [Switch] + $ManagedIdentity ) #Ensure the proper dependencies are installed in the current environment. Confirm-M365DSCDependencies @@ -1134,7 +1148,11 @@ function Export-TargetResource [Parameter()] [System.String] - $CertificateThumbprint + $CertificateThumbprint, + + [Parameter()] + [Switch] + $ManagedIdentity ) $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftTeams' ` -InboundParameters $PSBoundParameters @@ -1166,6 +1184,7 @@ function Export-TargetResource ApplicationId = $ApplicationId TenantId = $TenantId CertificateThumbprint = $CertificateThumbprint + ManagedIdentity = $ManagedIdentity.IsPresent } $Results = Get-TargetResource @Params $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.psm1 index 01388d09ad..7f795ddcb8 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.psm1 @@ -197,7 +197,11 @@ function Set-TargetResource [Parameter()] [System.String] - $CertificateThumbprint + $CertificateThumbprint, + + [Parameter()] + [Switch] + $ManagedIdentity ) #Ensure the proper dependencies are installed in the current environment. diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 index 4ded070db3..8c1d7b4685 100644 --- a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 +++ b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 @@ -3,7 +3,7 @@ # # Generated by: Microsoft Corporation # -# Generated on: 2024-02-01 +# Generated on: 2024-02-02 @{ @@ -11,7 +11,7 @@ # RootModule = '' # Version number of this module. - ModuleVersion = '1.24.131.1' + ModuleVersion = '1.24.131.2' # Supported PSEditions # CompatiblePSEditions = @() @@ -161,6 +161,10 @@ * TeamsEmergencyCallRoutingPolicy * Fix deletion of resource FIXES [#4261](https://github.com/microsoft/Microsoft365DSC/issues/4261) + * TeamsMeetingPolicy + * Fixed issue with missing ManagedIdentity parameter in Test signature. + * TeamsUpdateManagementPolicy + * Fixed issue with missing ManagedIdentity parameter in Test signature. * TEAMS * Added support for ManagedIdentity Authentication across Teams resources. * DEPENDENCIES From 1d57cd98f9afe8b478eb8fda7d00538002234734 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Fri, 2 Feb 2024 07:09:40 -0500 Subject: [PATCH 2/2] Updates --- CHANGELOG.md | 2 +- Modules/Microsoft365DSC/Microsoft365DSC.psd1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ced60757cc..af75d9bbd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ * TeamsMeetingPolicy * Fixed issue with missing ManagedIdentity parameter in Test signature. * TeamsUpdateManagementPolicy - * Fixed issue with missing ManagedIdentity parameter in Test signature. + * Fixed issue with missing ManagedIdentity parameter in Set signature. # 1.24.131.1 diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 index 8c1d7b4685..bd1c11a715 100644 --- a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 +++ b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 @@ -164,7 +164,7 @@ * TeamsMeetingPolicy * Fixed issue with missing ManagedIdentity parameter in Test signature. * TeamsUpdateManagementPolicy - * Fixed issue with missing ManagedIdentity parameter in Test signature. + * Fixed issue with missing ManagedIdentity parameter in Set signature. * TEAMS * Added support for ManagedIdentity Authentication across Teams resources. * DEPENDENCIES