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

[SCSensitivityLabel] Fixing issue where SiteAndGroupExternalSharingControlType isn't applied correctly #3212

Merged
merged 1 commit into from
Apr 25, 2023
Merged

[SCSensitivityLabel] Fixing issue where SiteAndGroupExternalSharingControlType isn't applied correctly #3212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 2 additions & 74 deletions .github/workflows/CodeCoverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,81 +17,9 @@ jobs:
- name: Install Modules
shell: pwsh
run: |
$Dependencies = @(
@{
ModuleName = 'DSCParser'
},
@{
ModuleName = 'ExchangeOnlineManagement'
},
@{
ModuleName = 'Microsoft.Graph.Applications'
},
@{
ModuleName = 'Microsoft.Graph.Authentication'
},
@{
ModuleName = 'Microsoft.Graph.DeviceManagement'
},
@{
ModuleName = 'Microsoft.Graph.DeviceManagement.Administration'
},
@{
ModuleName = 'Microsoft.Graph.DeviceManagement.Enrolment'
},
@{
ModuleName = 'Microsoft.Graph.Devices.CorporateManagement'
},
@{
ModuleName = 'Microsoft.Graph.Groups'
},
@{
ModuleName = 'Microsoft.Graph.Identity.DirectoryManagement'
},
@{
ModuleName = 'Microsoft.Graph.Identity.Governance'
},
@{
ModuleName = 'Microsoft.Graph.Identity.SignIns'
},
@{
ModuleName = 'Microsoft.Graph.Planner'
},
@{
ModuleName = 'Microsoft.Graph.Teams'
},
@{
ModuleName = 'Microsoft.Graph.Users'
},
@{
ModuleName = 'Microsoft.Graph.Users.Actions'
},
@{
ModuleName = 'Microsoft.PowerApps.Administration.PowerShell'
},
@{
ModuleName = 'MicrosoftTeams'
},
@{
ModuleName = "MSCloudLoginAssistant"
},
@{
ModuleName = 'PnP.PowerShell'
},
@{
ModuleName = 'ReverseDSC'
}
)

foreach ($module in $Dependencies)
{
Install-Module $module.ModuleName -Force -Scope AllUsers
Import-Module $module.ModuleName -Force
}

Install-Module ReverseDSC -Force -Scope AllUsers
Install-Module PSDesiredStateConfiguration -Force -Scope AllUsers
Install-Module Pester -Force -SkipPublisherCheck -RequiredVersion 5.4.0 -Scope AllUsers
Install-Module Profiler -Force -Scope AllUsers
Install-Module Pester -Force -SkipPublisherCheck -Scope AllUsers
[System.Environment]::SetEnvironmentVariable('M365DSCTelemetryEnabled', $false, [System.EnvironmentVariableTarget]::Machine);
- name: Run Quality Checks
shell: pwsh
Expand Down
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 @@ -10,6 +10,9 @@
* SCSensitivityLabel
* Remove property Disabled from schema
FIXES [#3193](https://github.com/microsoft/Microsoft365DSC/issues/3193)
* Corrected issue where SiteAndGroupExternalSharingControlType wasn't
applied correctly with existing labels
FIXES [#3210](https://github.com/microsoft/Microsoft365DSC/issues/3210)
* TeamsTeam
* Fixes an error when trying to extract teams using a Service Principal.
FIXES [#3183](https://github.com/microsoft/Microsoft365DSC/issues/3183)
Expand Down
6 changes: 6 additions & 0 deletions Modules/Microsoft365DSC/DSCResources/MSFT_SCSensitivityLabel/MSFT_SCSensitivityLabel.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,12 @@ function Set-TargetResource
$SetParams['LocaleSettings'] = $locale
}

if ($SetParams.ContainsKey('SiteAndGroupExternalSharingControlType'))
{
$SetParams.SiteExternalSharingControlType = $SetParams.SiteAndGroupExternalSharingControlType
$SetParams.Remove('SiteAndGroupExternalSharingControlType')
}

#Remove unused parameters for Set-Label cmdlet
$SetParams.Remove('Name') | Out-Null

Expand Down