Skip to content

Commit

Permalink
Major Refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
NikCharlebois committed Apr 9, 2020
1 parent 6fa01a8 commit 22e3628
Show file tree
Hide file tree
Showing 547 changed files with 2,112 additions and 1,475 deletions.
98 changes: 49 additions & 49 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -4,52 +4,52 @@
# review when someone opens a pull request.
* @nikcharlebois

/Modules/Office365DSC/DSCResources/MSFT_EXOAcceptedDomain/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_AntiPhishRule/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_EXOCASMailboxPlan/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_EXOClientAccessRule/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_DkimSigningConfig/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_EXOHostedCOntentFilterRule/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_EXOMailboxSettings/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_EXOMailTips/ @poiriersimon
/Modules/Office365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_EXOSafeLinksRule/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_EXOSharedMailbox/ @nikcharlebois

/Modules/Office365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_O365Group/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_O365User/ @nikcharlebois

/Modules/Office365DSC/DSCResources/MSFT_ODSettings/ @desmay

/Modules/Office365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_SCRetentionComplianceRule/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/ @nikcharlebois

/Modules/Office365DSC/DSCResources/MSFT_SPOAccessControlSettings/ @thorstenloeschmann
/Modules/Office365DSC/DSCResources/MSFT_SPOApp/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_SPOHubSite/ @ykuijs
/Modules/Office365DSC/DSCResources/MSFT_SPOSearchManagedProperty/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_SPOSearchResultSource/ @nikcharlebois
/Modules/Office365DSC/DSCResources/MSFT_SPOSharingSettings/ @thorstenloeschmann
/Modules/Office365DSC/DSCResources/MSFT_SPOSite/ @thorstenloeschmann
/Modules/Office365DSC/DSCResources/MSFT_SPOSiteDesign/ @thorstenloeschmann
/Modules/Office365DSC/DSCResources/MSFT_SPOSiteDesignRights/ @thorstenloeschmann
/Modules/Office365DSC/DSCResources/MSFT_SPOStorageEntity/ @thorstenloeschmann
/Modules/Office365DSC/DSCResources/MSFT_SPOTenantSettings/ @thorstenloeschmann
/Modules/Office365DSC/DSCResources/MSFT_SPOTheme/ @thorstenloeschmann


/Modules/Office365DSC/DSCResources/MSFT_TeamsTeam/ @desmay
/Modules/Office365DSC/DSCResources/MSFT_TeamsChannel/ @desmay
/Modules/Office365DSC/DSCResources/MSFT_TeamsUser/ @desmay

/Modules/Office365DSC/Modules/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAcceptedDomain/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_AntiPhishRule/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCASMailboxPlan/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_EXOClientAccessRule/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_DkimSigningConfig/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedCOntentFilterRule/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxSettings/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailTips/ @poiriersimon
/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksRule/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharedMailbox/ @nikcharlebois

/Modules/Microsoft365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_O365Group/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_O365User/ @nikcharlebois

/Modules/Microsoft365DSC/DSCResources/MSFT_ODSettings/ @desmay

/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionComplianceRule/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/ @nikcharlebois

/Modules/Microsoft365DSC/DSCResources/MSFT_SPOAccessControlSettings/ @thorstenloeschmann
/Modules/Microsoft365DSC/DSCResources/MSFT_SPOApp/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_SPOHubSite/ @ykuijs
/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchManagedProperty/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchResultSource/ @nikcharlebois
/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSharingSettings/ @thorstenloeschmann
/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSite/ @thorstenloeschmann
/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesign/ @thorstenloeschmann
/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesignRights/ @thorstenloeschmann
/Modules/Microsoft365DSC/DSCResources/MSFT_SPOStorageEntity/ @thorstenloeschmann
/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/ @thorstenloeschmann
/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTheme/ @thorstenloeschmann


/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTeam/ @desmay
/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannel/ @desmay
/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUser/ @desmay

/Modules/Microsoft365DSC/Modules/ @nikcharlebois
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
.vs
.psproj
.sln
Modules/Office365Dsc/DscResource.Tests
Modules/Office365Dsc/DscResource.Tests/*
Modules/Microsoft365DSC/DscResource.Tests
Modules/Microsoft365DSC/DscResource.Tests/*
node_modules
node_modules/*
markdownissues.txt
start-unittests.ps1
TestDSCresource.ps1
Modules/Office365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/Set-MalwareFilterPolicy.txt
Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/Set-MalwareFilterPolicy.txt

Modules/start-extraction.ps1
Modules/Office365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/Add-AvailabilityAddressSpace-parameterset.txt
Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/Add-AvailabilityAddressSpace-parameterset.txt
*.log
4 changes: 2 additions & 2 deletions .vscode/GetTestCoverage.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ param(
[Parameter(Mandatory = $true)]
[string]
$CmdletModule = (Join-Path -Path $PSScriptRoot `
-ChildPath "..\Stubs\Office365.psm1" `
-ChildPath "..\Stubs\Microsoft365.psm1" `
-Resolve)
)

Expand All @@ -25,7 +25,7 @@ if ($UnitTestFilePath.EndsWith("Tests.ps1"))
$unitTestName = "$($unitTest.Name.Split('.')[1])"

$unitTestFilePath = (Join-Path -Path $PSScriptRoot `
-ChildPath "..\Modules\Office365DSC\DSCResources\MSFT_$($unitTestName)\MSFT_$($unitTestName).psm1" `
-ChildPath "..\Modules\Microsoft365DSC\DSCResources\MSFT_$($unitTestName)\MSFT_$($unitTestName).psm1" `
-Resolve)

Invoke-Pester -Script $pesterParameters -CodeCoverage $UnitTestFilePath -Verbose
Expand Down
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Change log for Office365Dsc
# Change log for Microsoft365DSC

## UNRELEASED

Expand All @@ -21,8 +21,8 @@
a drift;
* TeamsUpgradePolicy
* Initial Release;
* Office365DSCUtil
* Added the new Assert-O365DSCTemplate cmdlet to assess remote templates;
* M365DSCUtil
* Added the new Assert-M365DSCTemplate cmdlet to assess remote templates;
* ReverseDSC
* Change to allow ComponentsToExtract without the 'chck' prefix;
* Introduction of Extraction Modes and Visual Indicators;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function Get-TargetResource
$data = [System.Collections.Generic.Dictionary[[String], [String]]]::new()
$data.Add("Resource", $MyInvocation.MyCommand.ModuleName)
$data.Add("Method", $MyInvocation.MyCommand)
Add-O365DSCTelemetryEvent -Data $data
Add-M365DSCTelemetryEvent -Data $data
#endregion

Test-MSCloudLogin -CloudCredential $GlobalAdminAccount `
Expand All @@ -57,7 +57,7 @@ function Get-TargetResource
GlobalAdminAccount = $GlobalAdminAccount
}

Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)"
Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)"
return $result
}
}
Expand Down Expand Up @@ -95,7 +95,7 @@ function Set-TargetResource
$data = [System.Collections.Generic.Dictionary[[String], [String]]]::new()
$data.Add("Resource", $MyInvocation.MyCommand.ModuleName)
$data.Add("Method", $MyInvocation.MyCommand)
Add-O365DSCTelemetryEvent -Data $data
Add-M365DSCTelemetryEvent -Data $data
#endregion

Test-MSCloudLogin -CloudCredential $GlobalAdminAccount `
Expand Down Expand Up @@ -165,13 +165,13 @@ function Test-TargetResource

$CurrentValues = Get-TargetResource @PSBoundParameters

Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)"
Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)"
Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)"
Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)"

$ValuesToCheck = $PSBoundParameters
$ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null

$TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues `
$TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues `
-Source $($MyInvocation.MyCommand.Source) `
-DesiredValues $PSBoundParameters `
-ValuesToCheck $ValuesToCheck.Keys
Expand All @@ -196,7 +196,7 @@ function Export-TargetResource
$data = [System.Collections.Generic.Dictionary[[String], [String]]]::new()
$data.Add("Resource", $MyInvocation.MyCommand.ModuleName)
$data.Add("Method", $MyInvocation.MyCommand)
Add-O365DSCTelemetryEvent -Data $data
Add-M365DSCTelemetryEvent -Data $data
#endregion

$content = ''
Expand Down
Loading

0 comments on commit 22e3628

Please sign in to comment.