Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TeamsComplianceRecordingPolicy: ComplianceRecordingApplications Ids are strings not objects #3894

Merged
merged 5 commits into from
Nov 30, 2023
Merged

TeamsComplianceRecordingPolicy: ComplianceRecordingApplications Ids are strings not objects #3894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f01850d
Application Ids are strings not objects
Nov 14, 2023
7f31077
Fix tests
pkernevez Nov 16, 2023
d4cc1de
Fix 2nd part
pkernevez Nov 16, 2023
20d1158
Fix merge
pkernevez Nov 28, 2023
302f4e7
Merge branch 'Dev' into fix-teams-compliance-policy
NikCharlebois Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
* Updated DSCParser to version 1.4.0.1.
* Updated Microsoft.Graph to version 2.10.0.
* Updated MSCloudLoginAssistant to version 1.1.0.
* TeamsTeam
* Fixes incompatible type for ComplianceRecordingApplications, expected string[] but receive object[]
FIXES: [#3890](https://github.com/microsoft/Microsoft365DSC/issues/3890)
* M365DSCDRGUtil
* Added ConvertFrom-IntunePolicyAssignment and ConvertTo-IntunePolicyAssignment
FIXES [#3892](https://github.com/microsoft/Microsoft365DSC/issues/3892)
Expand Down
2 changes: 1 addition & 1 deletion ...DSCResources/MSFT_TeamsComplianceRecordingPolicy/MSFT_TeamsComplianceRecordingPolicy.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ function Get-TargetResource
}
$recordApplicationIds = @()
foreach ($app in $recordingApplications) {
$recordApplicationIds += @{Id=$app.Id}
$recordApplicationIds += $app.Id
}

Write-Verbose -Message "Found an instance with Identity {$Identity}"
Expand Down
2 changes: 1 addition & 1 deletion ...les/Resources/TeamsComplianceRecordingPolicy/1-TeamsComplianceRecordingPolicy-Example.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Configuration Example
{
TeamsComplianceRecordingPolicy 'Example'
{
ComplianceRecordingApplications = @();
ComplianceRecordingApplications = @('qwertzuio-abcd-abcd-abcd-qwertzuio');
Credential = $Credscredential;
DisableComplianceRecordingAudioNotificationForCalls = $False;
Enabled = $False;
Expand Down
10 changes: 5 additions & 5 deletions Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsComplianceRecordingPolicy.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
Description = 'FakeStringValue'
Enabled = $True
DisableComplianceRecordingAudioNotificationForCalls = $True
ComplianceRecordingApplications = @(@{Id="123456"})
ComplianceRecordingApplications = @("123456")
Identity = 'FakeStringValue'
Ensure = 'Present'
Credential = $Credential
Expand Down Expand Up @@ -95,7 +95,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
Description = 'FakeStringValue'
Enabled = $True
DisableComplianceRecordingAudioNotificationForCalls = $True
ComplianceRecordingApplications = @(@{Id='123456'})
ComplianceRecordingApplications = @('123456')
Identity = 'FakeStringValue'
Ensure = 'Absent'
Credential = $Credential
Expand Down Expand Up @@ -124,7 +124,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
$Result = (Get-TargetResource @testParams)
$Result.Ensure | Should -Be 'Present'
$Result.ComplianceRecordingApplications.Length | Should -Be 1
$Result.ComplianceRecordingApplications[0].Id | Should -Be '123456'
$Result.ComplianceRecordingApplications[0] | Should -Be '123456'
Should -Invoke -CommandName Get-CsTeamsComplianceRecordingPolicy -Exactly 1
Should -Invoke -CommandName Get-CsTeamsComplianceRecordingApplication -ParameterFilter {$Filter -eq 'FakeStringValue/*'} -Exactly 1

Expand All @@ -147,7 +147,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
Description = 'FakeStringValue'
Enabled = $True
DisableComplianceRecordingAudioNotificationForCalls = $True
ComplianceRecordingApplications = @(@{Id='123456'})
ComplianceRecordingApplications = @('123456')
Identity = 'FakeStringValue'
Ensure = 'Present'
Credential = $Credential
Expand Down Expand Up @@ -184,7 +184,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
Description = 'FakeStringValue'
Enabled = $True
DisableComplianceRecordingAudioNotificationForCalls = $True
ComplianceRecordingApplications = @{Id='123456'}
ComplianceRecordingApplications = @('123456')
Identity = 'FakeStringValue'
Ensure = 'Present'
Credential = $Credential
Expand Down