Skip to content

Commit 5e2daad

Browse files
PlagueHOPlagueHO
authored
Convert to DSCResource.Common - Fixes #117 (#120)
* Convert to DscResource.Common * Fix conversion to DscResource.Common
1 parent 1b8534d commit 5e2daad

13 files changed

Lines changed: 65 additions & 2097 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3434
- Change Azure DevOps Pipeline definition to include `source/*` - Fixes [Issue #114](https://github.com/dsccommunity/ActiveDirectoryCSDsc/issues/114).
3535
- Updated pipeline to use `latest` version of `ModuleBuilder` - Fixes [Issue #115](https://github.com/dsccommunity/ActiveDirectoryCSDsc/issues/115).
3636
- Merge `HISTORIC_CHANGELOG.md` into `CHANGELOG.md` - Fixes [Issue #115](https://github.com/dsccommunity/ActiveDirectoryCSDsc/issues/115).
37+
- Fixed build failures caused by changes in `ModuleBuilder` module v1.7.0
38+
by changing `CopyDirectories` to `CopyPaths` - Fixes [Issue #119](https://github.com/dsccommunity/ActiveDirectoryCSDsc/issues/119).
39+
- Updated to use the common module _DscResource.Common_ - Fixes [Issue #117](https://github.com/dsccommunity/ActiveDirectoryCSDsc/issues/117).
40+
- Pin `Pester` module to 4.10.1 because Pester 5.0 is missing code
41+
coverage - Fixes [Issue #118](https://github.com/dsccommunity/ActiveDirectoryCSDsc/issues/118).
3742

3843
### Added
3944

‎RequiredModules.psd1‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@{
2-
PSDependOptions = @{
2+
PSDependOptions = @{
33
AddToPath = $true
44
Target = 'output\RequiredModules'
55
Parameters = @{
@@ -9,7 +9,7 @@
99

1010
InvokeBuild = 'latest'
1111
PSScriptAnalyzer = 'latest'
12-
Pester = 'latest'
12+
Pester = '4.10.1'
1313
Plaster = 'latest'
1414
ModuleBuilder = 'latest'
1515
ChangelogManagement = 'latest'
@@ -18,5 +18,6 @@
1818
'DscResource.Test' = 'latest'
1919
'DscResource.AnalyzerRules' = 'latest'
2020
'DscResource.DocGenerator' = 'latest'
21+
'DscResource.Common' = 'latest'
2122
xDscResourceDesigner = 'latest'
2223
}

‎build.yaml‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,24 @@
22
####################################################
33
# ModuleBuilder Configuration #
44
####################################################
5-
CopyDirectories:
5+
CopyPaths:
66
- en-US
77
- DSCResources
88
- Modules
99
Encoding: UTF8
1010
VersionedOutputDirectory: true
1111

12+
####################################################
13+
# ModuleBuilder Dependent Modules Configuration #
14+
####################################################
15+
16+
NestedModule:
17+
DscResource.Common:
18+
CopyOnly: true
19+
Path: ./output/RequiredModules/DscResource.Common
20+
AddToManifest: false
21+
Exclude: PSGetModuleInfo.xml
22+
1223
####################################################
1324
# Pipeline Configuration #
1425
####################################################
@@ -40,14 +51,14 @@ BuildWorkflow:
4051
- Publish_release_to_GitHub
4152
- publish_module_to_gallery
4253

43-
4454
####################################################
4555
# PESTER Configuration #
4656
####################################################
4757

4858
Pester:
4959
OutputFormat: NUnitXML
5060
ExcludeFromCodeCoverage:
61+
- Modules/DscResource.Common
5162
Script:
5263
- tests/Unit
5364
- tests/Integration
@@ -61,6 +72,8 @@ DscTest:
6172
- 'Common Tests - New Error-Level Script Analyzer Rules'
6273
ExcludeSourceFile:
6374
- output
75+
ExcludeModuleFile:
76+
- Modules/DscResource.Common
6477

6578
Resolve-Dependency:
6679
Gallery: 'PSGallery'

‎source/DSCResources/DSC_AdcsAuthorityInformationAccess/DSC_AdcsAuthorityInformationAccess.psm1‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ Import-Module -Name (Join-Path -Path $modulePath `
55
-ChildPath (Join-Path -Path 'ActiveDirectoryCSDsc.Common' `
66
-ChildPath 'ActiveDirectoryCSDsc.Common.psm1'))
77

8+
Import-Module -Name (Join-Path -Path $modulePath -ChildPath 'DscResource.Common')
9+
810
# Import Localization Strings.
9-
$script:localizedData = Get-LocalizedData -ResourceName 'DSC_AdcsAuthorityInformationAccess'
11+
$script:localizedData = Get-LocalizedData -DefaultUICulture 'en-US'
1012

1113
<#
1214
.SYNOPSIS

‎source/DSCResources/DSC_AdcsCertificationAuthority/DSC_AdcsCertificationAuthority.psm1‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ Import-Module -Name (Join-Path -Path $modulePath `
55
-ChildPath (Join-Path -Path 'ActiveDirectoryCSDsc.Common' `
66
-ChildPath 'ActiveDirectoryCSDsc.Common.psm1'))
77

8+
Import-Module -Name (Join-Path -Path $modulePath -ChildPath 'DscResource.Common')
9+
810
# Import Localization Strings.
9-
$script:localizedData = Get-LocalizedData -ResourceName 'DSC_AdcsCertificationAuthority'
11+
$script:localizedData = Get-LocalizedData -DefaultUICulture 'en-US'
1012

1113
<#
1214
.SYNOPSIS

‎source/DSCResources/DSC_AdcsCertificationAuthoritySettings/DSC_AdcsCertificationAuthoritySettings.psm1‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ Import-Module -Name (Join-Path -Path $modulePath `
77
-ChildPath (Join-Path -Path 'ActiveDirectoryCSDsc.Common' `
88
-ChildPath 'ActiveDirectoryCSDsc.Common.psm1'))
99

10+
Import-Module -Name (Join-Path -Path $modulePath -ChildPath 'DscResource.Common')
11+
1012
# Import Localization Strings.
11-
$script:localizedData = Get-LocalizedData -ResourceName 'DSC_AdcsCertificationAuthoritySettings'
13+
$script:localizedData = Get-LocalizedData -DefaultUICulture 'en-US'
1214

1315
<#
1416
This is an array of all the parameters used by this resource.

‎source/DSCResources/DSC_AdcsEnrollmentPolicyWebService/DSC_AdcsEnrollmentPolicyWebService.psm1‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ Import-Module -Name (Join-Path -Path $modulePath `
55
-ChildPath (Join-Path -Path 'ActiveDirectoryCSDsc.Common' `
66
-ChildPath 'ActiveDirectoryCSDsc.Common.psm1'))
77

8+
Import-Module -Name (Join-Path -Path $modulePath -ChildPath 'DscResource.Common')
9+
810
# Import Localization Strings.
9-
$script:localizedData = Get-LocalizedData -ResourceName 'DSC_AdcsEnrollmentPolicyWebService'
11+
$script:localizedData = Get-LocalizedData -DefaultUICulture 'en-US'
1012

1113
<#
1214
.SYNOPSIS
@@ -152,7 +154,7 @@ function Set-TargetResource
152154
$($script:localizedData.SettingAdcsEnrollmentPolicyWebServiceStatusMessage -f $AuthenticationType)
153155
) -join '' )
154156

155-
$adcsEnrollmentPolicyWebServiceParameters = @{} + $PSBoundParameters
157+
$adcsEnrollmentPolicyWebServiceParameters = @{ } + $PSBoundParameters
156158
$null = $adcsEnrollmentPolicyWebServiceParameters.Remove('Ensure')
157159
$null = $adcsEnrollmentPolicyWebServiceParameters.Remove('Debug')
158160
$null = $adcsEnrollmentPolicyWebServiceParameters.Remove('ErrorAction')
@@ -191,9 +193,9 @@ function Set-TargetResource
191193
if (-not [System.String]::IsNullOrEmpty($errorMessage))
192194
{
193195
Write-Verbose -Message ( @(
194-
"$($MyInvocation.MyCommand): "
195-
$($script:localizedData.AdcsEnrollmentPolicyWebServiceErrorMessage -f $errorMessage)
196-
) -join '' )
196+
"$($MyInvocation.MyCommand): "
197+
$($script:localizedData.AdcsEnrollmentPolicyWebServiceErrorMessage -f $errorMessage)
198+
) -join '' )
197199
New-InvalidOperationException -Message $errorMessage
198200
}
199201
} # function Set-TargetResource
@@ -383,18 +385,18 @@ function Test-AdcsEnrollmentPolicyWebServiceInstallState
383385
if ($null -eq $enrollmentPolicyWebServiceWebApp)
384386
{
385387
Write-Verbose -Message ( @(
386-
"$($MyInvocation.MyCommand): "
387-
$($script:localizedData.AdcsEnrollmentPolicyWebServiceInstallIsNotInstalledMessage -f $AuthenticationType, $KeyBasedRenewal)
388-
) -join '' )
388+
"$($MyInvocation.MyCommand): "
389+
$($script:localizedData.AdcsEnrollmentPolicyWebServiceInstallIsNotInstalledMessage -f $AuthenticationType, $KeyBasedRenewal)
390+
) -join '' )
389391

390392
return $false
391393
}
392394
else
393395
{
394396
Write-Verbose -Message ( @(
395-
"$($MyInvocation.MyCommand): "
396-
$($script:localizedData.AdcsEnrollmentPolicyWebServiceInstallIsInstalledMessage -f $AuthenticationType, $KeyBasedRenewal)
397-
) -join '' )
397+
"$($MyInvocation.MyCommand): "
398+
$($script:localizedData.AdcsEnrollmentPolicyWebServiceInstallIsInstalledMessage -f $AuthenticationType, $KeyBasedRenewal)
399+
) -join '' )
398400

399401
return $true
400402
}

‎source/DSCResources/DSC_AdcsOnlineResponder/DSC_AdcsOnlineResponder.psm1‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ Import-Module -Name (Join-Path -Path $modulePath `
55
-ChildPath (Join-Path -Path 'ActiveDirectoryCSDsc.Common' `
66
-ChildPath 'ActiveDirectoryCSDsc.Common.psm1'))
77

8+
Import-Module -Name (Join-Path -Path $modulePath -ChildPath 'DscResource.Common')
9+
810
# Import Localization Strings.
9-
$script:localizedData = Get-LocalizedData -ResourceName 'DSC_AdcsOnlineResponder'
11+
$script:localizedData = Get-LocalizedData -DefaultUICulture 'en-US'
1012

1113
<#
1214
.SYNOPSIS
@@ -54,7 +56,7 @@ function Get-TargetResource
5456
$($script:localizedData.GettingAdcsOnlineResponderStatusMessage)
5557
) -join '' )
5658

57-
$adcsParameters = @{} + $PSBoundParameters
59+
$adcsParameters = @{ } + $PSBoundParameters
5860
$null = $adcsParameters.Remove('IsSingleInstance')
5961
$null = $adcsParameters.Remove('Ensure')
6062
$null = $adcsParameters.Remove('Debug')
@@ -125,7 +127,7 @@ function Set-TargetResource
125127
$($script:localizedData.SettingAdcsOnlineResponderStatusMessage)
126128
) -join '' )
127129

128-
$adcsParameters = @{} + $PSBoundParameters
130+
$adcsParameters = @{ } + $PSBoundParameters
129131
$null = $adcsParameters.Remove('IsSingleInstance')
130132
$null = $adcsParameters.Remove('Ensure')
131133
$null = $adcsParameters.Remove('Debug')
@@ -144,7 +146,7 @@ function Set-TargetResource
144146
}
145147
else
146148
{
147-
Write-Verbose -Message ( @(
149+
Write-Verbose -Message ( @(
148150
"$($MyInvocation.MyCommand): "
149151
$($script:localizedData.UninstallingAdcsOnlineResponderMessage)
150152
) -join '' )
@@ -204,7 +206,7 @@ function Test-TargetResource
204206
$script:localizedData.TestingAdcsOnlineResponderStatusMessage
205207
) -join '' )
206208

207-
$adcsParameters = @{} + $PSBoundParameters
209+
$adcsParameters = @{ } + $PSBoundParameters
208210
$null = $adcsParameters.Remove('IsSingleInstance')
209211
$null = $adcsParameters.Remove('Ensure')
210212
$null = $adcsParameters.Remove('Debug')

‎source/DSCResources/DSC_AdcsTemplate/DSC_AdcsTemplate.psm1‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ Import-Module -Name (Join-Path -Path $modulePath `
55
-ChildPath (Join-Path -Path 'ActiveDirectoryCSDsc.Common' `
66
-ChildPath 'ActiveDirectoryCSDsc.Common.psm1'))
77

8+
Import-Module -Name (Join-Path -Path $modulePath -ChildPath 'DscResource.Common')
9+
810
# Import Localization Strings.
9-
$script:localizedData = Get-LocalizedData -ResourceName 'DSC_AdcsTemplate'
11+
$script:localizedData = Get-LocalizedData -DefaultUICulture 'en-US'
1012

1113
<#
1214
.SYNOPSIS

‎source/DSCResources/DSC_AdcsWebEnrollment/DSC_AdcsWebEnrollment.psm1‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ Import-Module -Name (Join-Path -Path $modulePath `
55
-ChildPath (Join-Path -Path 'ActiveDirectoryCSDsc.Common' `
66
-ChildPath 'ActiveDirectoryCSDsc.Common.psm1'))
77

8+
Import-Module -Name (Join-Path -Path $modulePath -ChildPath 'DscResource.Common')
9+
810
# Import Localization Strings.
9-
$script:localizedData = Get-LocalizedData -ResourceName 'DSC_AdcsWebEnrollment'
11+
$script:localizedData = Get-LocalizedData -DefaultUICulture 'en-US'
1012

1113
<#
1214
.SYNOPSIS
@@ -61,7 +63,7 @@ function Get-TargetResource
6163
$($script:localizedData.GettingAdcsWebEnrollmentStatusMessage)
6264
) -join '' )
6365

64-
$adcsParameters = @{} + $PSBoundParameters
66+
$adcsParameters = @{ } + $PSBoundParameters
6567
$null = $adcsParameters.Remove('IsSingleInstance')
6668
$null = $adcsParameters.Remove('Ensure')
6769
$null = $adcsParameters.Remove('Debug')
@@ -140,7 +142,7 @@ function Set-TargetResource
140142
$($script:localizedData.SettingAdcsWebEnrollmentStatusMessage)
141143
) -join '' )
142144

143-
$adcsParameters = @{} + $PSBoundParameters
145+
$adcsParameters = @{ } + $PSBoundParameters
144146
$null = $adcsParameters.Remove('IsSingleInstance')
145147
$null = $adcsParameters.Remove('Ensure')
146148
$null = $adcsParameters.Remove('Debug')
@@ -227,7 +229,7 @@ function Test-TargetResource
227229
$($script:localizedData.TestingAdcsWebEnrollmentStatusMessage -f $CAConfig)
228230
) -join '' )
229231

230-
$adcsParameters = @{} + $PSBoundParameters
232+
$adcsParameters = @{ } + $PSBoundParameters
231233
$null = $adcsParameters.Remove('IsSingleInstance')
232234
$null = $adcsParameters.Remove('Ensure')
233235
$null = $adcsParameters.Remove('Debug')

0 commit comments

Comments
 (0)