From a1ccf4b1e070758b861992ffff100721a167e1f9 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Tue, 14 May 2024 19:33:23 -0400 Subject: [PATCH 1/4] Various Fixes --- CHANGELOG.md | 5 +++++ .../MSFT_EXOManagementRoleEntry.psm1 | 6 +++--- .../MSFT_EXOManagementRoleEntry.schema.mof | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34e8631f43..90c1a192b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change log for Microsoft365DSC +# UNRELEASED + +* EXOManagementRoleEntry + * Added support for the WebSite type. + # 1.24.515.1 * AADActivityBasedTimeoutPolicy diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRoleEntry/MSFT_EXOManagementRoleEntry.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRoleEntry/MSFT_EXOManagementRoleEntry.psm1 index c0be8b1c49..7fb3e69a7a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRoleEntry/MSFT_EXOManagementRoleEntry.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRoleEntry/MSFT_EXOManagementRoleEntry.psm1 @@ -13,7 +13,7 @@ function Get-TargetResource $Parameters, [Parameter()] - [ValidateSet('Cmdlet', 'Script', 'ApplicationPermission')] + [ValidateSet('Cmdlet', 'Script', 'ApplicationPermission', 'WebService')] [System.String] $Type, @@ -137,7 +137,7 @@ function Set-TargetResource $Parameters, [Parameter()] - [ValidateSet('Cmdlet', 'Script', 'ApplicationPermission')] + [ValidateSet('Cmdlet', 'Script', 'ApplicationPermission', 'WebService')] [System.String] $Type, @@ -234,7 +234,7 @@ function Test-TargetResource $Parameters, [Parameter()] - [ValidateSet('Cmdlet', 'Script', 'ApplicationPermission')] + [ValidateSet('Cmdlet', 'Script', 'ApplicationPermission', 'WebService')] [System.String] $Type, diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRoleEntry/MSFT_EXOManagementRoleEntry.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRoleEntry/MSFT_EXOManagementRoleEntry.schema.mof index fc354aa94b..0d01d223f8 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRoleEntry/MSFT_EXOManagementRoleEntry.schema.mof +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRoleEntry/MSFT_EXOManagementRoleEntry.schema.mof @@ -3,7 +3,7 @@ class MSFT_EXOManagementRoleEntry : OMI_BaseResource { [Key, Description("The Identity parameter specifies the role entry that you want to modify.")] String Identity; [Write, Description("The Parameters parameter specifies the parameters to be added to or removed from the role entry.")] String Parameters[]; - [Write, Description("The Type parameter specifies the type of role entry to return."), ValueMap{"Cmdlet","Script","ApplicationPermission"}, Values{"Cmdlet","Script","ApplicationPermission"}] String Type; + [Write, Description("The Type parameter specifies the type of role entry to return."), ValueMap{"Cmdlet","Script","ApplicationPermission","WebService"}, Values{"Cmdlet","Script","ApplicationPermission","WebService"}] String Type; [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; [Write, Description("Id of the Azure Active Directory tenant used for authentication.")] String TenantId; From abf10970cb16b7c0a072220b1476b4f14d21e528 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Tue, 14 May 2024 20:10:32 -0400 Subject: [PATCH 2/4] Various Fixes --- .../MSFT_TeamsMeetingBroadcastPolicy.psm1 | 20 ++++++++++++++++--- .../Modules/M365DSCTelemetryEngine.psm1 | 2 ++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.psm1 index af82d717c7..3840c9f8f2 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.psm1 @@ -160,7 +160,11 @@ function Set-TargetResource [Parameter()] [Switch] - $ManagedIdentity + $ManagedIdentity, + + [Parameter()] + [System.String[]] + $AccessTokens ) Write-Verbose -Message "Setting configuration of Teams Meeting Broadcast Policy {$Identity}" @@ -204,6 +208,7 @@ function Set-TargetResource $SetParams.Remove('CertificateThumbprint') | Out-Null $SetParams.Remove('Ensure') | Out-Null $SetParams.Remove('ManagedIdentity') | Out-Null + $SetParams.Remove('AccessTokens') | Out-Null if ($Ensure -eq 'Present' -and $currentValues.Ensure -eq 'Absent') { @@ -270,7 +275,11 @@ function Test-TargetResource [Parameter()] [Switch] - $ManagedIdentity + $ManagedIdentity, + + [Parameter()] + [System.String[]] + $AccessTokens ) #Ensure the proper dependencies are installed in the current environment. Confirm-M365DSCDependencies @@ -327,7 +336,11 @@ function Export-TargetResource [Parameter()] [Switch] - $ManagedIdentity + $ManagedIdentity, + + [Parameter()] + [System.String[]] + $AccessTokens ) $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftTeams' ` -InboundParameters $PSBoundParameters @@ -360,6 +373,7 @@ function Export-TargetResource TenantId = $TenantId CertificateThumbprint = $CertificateThumbprint ManagedIdentity = $ManagedIdentity.IsPresent + AccessTokens = $AccessTokens } Write-Host " |---[$i/$($policies.Length)] $($policy.Identity)" -NoNewline $Results = Get-TargetResource @Params diff --git a/Modules/Microsoft365DSC/Modules/M365DSCTelemetryEngine.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCTelemetryEngine.psm1 index 4e8f051a5a..cf9fce0d0a 100644 --- a/Modules/Microsoft365DSC/Modules/M365DSCTelemetryEngine.psm1 +++ b/Modules/Microsoft365DSC/Modules/M365DSCTelemetryEngine.psm1 @@ -397,6 +397,8 @@ function Get-M365DSCTelemetryOption [System.EnvironmentVariableTarget]::Machine) ProjectName = [System.Environment]::GetEnvironmentVariable('M365DSCTelemetryProjectName', ` [System.EnvironmentVariableTarget]::Machine) + ConnectionString = [System.Environment]::GetEnvironmentVariable('M365DSCTelemetryConnectionString', ` + [System.EnvironmentVariableTarget]::Machine) } } catch From ce008fc28fa4deff4552d21a26388324866b5293 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Wed, 15 May 2024 06:56:30 -0400 Subject: [PATCH 3/4] Release 1.24.515.2 --- CHANGELOG.md | 2 +- Modules/Microsoft365DSC/Microsoft365DSC.psd1 | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90c1a192b9..537c3a5134 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change log for Microsoft365DSC -# UNRELEASED +# 1.24.515.2 * EXOManagementRoleEntry * Added support for the WebSite type. diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 index 067ccf4745..d86afc51e7 100644 --- a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 +++ b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 @@ -3,7 +3,7 @@ # # Generated by: Microsoft Corporation # -# Generated on: 2024-05-14 +# Generated on: 2024-05-15 @{ @@ -11,7 +11,7 @@ # RootModule = '' # Version number of this module. - ModuleVersion = '1.24.515.1' + ModuleVersion = '1.24.515.2' # Supported PSEditions # CompatiblePSEditions = @() @@ -149,7 +149,8 @@ * AADGroupSettings * Added support for parameter NewUnifiedGroupWritebackDefault * EXOManagementRoleEntry - * Initial Rrelease + * Initial Release + * Added support for the WebSite type. * IntuneAntivirusPolicyWindows10SettingCatalog * Add missing properties from templates * Update setting handling so that the value is reverted to default when unset From c9ed3314b132532cb86d4a50a0d19e4a042354f3 Mon Sep 17 00:00:00 2001 From: NikCharlebois Date: Wed, 15 May 2024 12:12:06 +0000 Subject: [PATCH 4/4] Updated Resources and Cmdlet documentation pages --- docs/docs/resources/exchange/EXOManagementRoleEntry.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/resources/exchange/EXOManagementRoleEntry.md b/docs/docs/resources/exchange/EXOManagementRoleEntry.md index 07fb721e79..2c20553e80 100644 --- a/docs/docs/resources/exchange/EXOManagementRoleEntry.md +++ b/docs/docs/resources/exchange/EXOManagementRoleEntry.md @@ -6,7 +6,7 @@ | --- | --- | --- | --- | --- | | **Identity** | Key | String | The Identity parameter specifies the role entry that you want to modify. | | | **Parameters** | Write | StringArray[] | The Parameters parameter specifies the parameters to be added to or removed from the role entry. | | -| **Type** | Write | String | The Type parameter specifies the type of role entry to return. | `Cmdlet`, `Script`, `ApplicationPermission` | +| **Type** | Write | String | The Type parameter specifies the type of role entry to return. | `Cmdlet`, `Script`, `ApplicationPermission`, `WebService` | | **Credential** | Write | PSCredential | Credentials of the Exchange Global Admin | | | **ApplicationId** | Write | String | Id of the Azure Active Directory application to authenticate with. | | | **TenantId** | Write | String | Id of the Azure Active Directory tenant used for authentication. | |