Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
# local preference scripts/utilities
.local/

# Required modules folder
RequiredModules/

# Build output folder
output/

Expand Down
1 change: 1 addition & 0 deletions Tests/Integration/DSCResources/Adobe.config.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ configuration Adobe_config
)

Import-DscResource -ModuleName PowerStig
Import-DscResource -ModuleName GPRegistryPolicyDsc

Node localhost
{
Expand Down
1 change: 1 addition & 0 deletions Tests/Integration/DSCResources/Chrome.config.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ configuration Chrome_config
)

Import-DscResource -ModuleName PowerStig
Import-DscResource -ModuleName GPRegistryPolicyDsc

Node localhost
{
Expand Down
4 changes: 4 additions & 0 deletions Tests/Integration/DSCResources/Common.integration.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ Describe ($title + " $($stig.StigVersion) mof output") {
{ & $technologyConfig @testParameterList } | Should -Not -Throw
}

It 'Should compile a useable MOF' {
{ Test-DscConfiguration -Path $testParameterList['OutputPath'] } | Should -Not -Throw
}

$ruleNames = (Get-Member -InputObject $powerstigXml |
Where-Object -FilterScript { $_.Name -match '.*Rule' -and $_.Name -ne 'DocumentRule' -and $_.Name -ne 'ManualRule' }).Name

Expand Down
1 change: 1 addition & 0 deletions Tests/Integration/DSCResources/Edge.config.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ configuration Edge_config
)

Import-DscResource -ModuleName PowerStig
Import-DscResource -ModuleName GPRegistryPolicyDsc

Node localhost
{
Expand Down
1 change: 1 addition & 0 deletions Tests/Integration/DSCResources/Firefox.config.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ configuration Firefox_config
)

Import-DscResource -ModuleName PowerStig
Import-DscResource -ModuleName FileContentDsc

Node localhost
{
Expand Down
4 changes: 2 additions & 2 deletions Tests/Integration/DSCResources/Firefox.integration.tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ foreach ($stig in $stigList)
{
$ruleType = "RegistryRule"
}
else
else
{
$ruleType = "FileContentRule"
}

$skipRule = Get-Random -InputObject $powerstigXml.$ruleType.Rule.id
$skipRuleType = $null
$expectedSkipRuleTypeCount = 0 + $blankSkipRuleId.Count
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ $resourceParameters = $resourceInformation.Properties.Name
$additionalTestParameterList = @{
LogPath = $env:temp
}
<#
<#
foreach ($stig in $stigList)
{
$orgSettingsPath = $stig.Path.Replace('.xml', '.org.default.xml')
Expand Down Expand Up @@ -50,4 +50,4 @@ foreach ($stig in $stigList)

. "$PSScriptRoot\Common.integration.ps1"
}
#>
#>
1 change: 1 addition & 0 deletions Tests/Integration/DSCResources/IisSite.config.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ configuration IisSite_config
)

Import-DscResource -ModuleName PowerStig
Import-DscResource -ModuleName PSDscResources

Node localhost
{
Expand Down
1 change: 1 addition & 0 deletions Tests/Integration/DSCResources/InternetExplorer.config.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ configuration InternetExplorer_config
)

Import-DscResource -ModuleName PowerStig
Import-DscResource -ModuleName GPRegistryPolicyDsc

Node localhost
{
Expand Down
1 change: 1 addition & 0 deletions Tests/Integration/DSCResources/McAfee.config.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ configuration McAfee_config
)

Import-DscResource -ModuleName PowerStig
Import-DscResource -ModuleName PSDscResources

Node localhost
{
Expand Down
1 change: 1 addition & 0 deletions Tests/Integration/DSCResources/Office.config.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ configuration Office_config
)

Import-DscResource -ModuleName PowerStig
Import-DscResource -ModuleName GPRegistryPolicyDsc

Node localhost
{
Expand Down
1 change: 1 addition & 0 deletions Tests/Integration/DSCResources/OracleJRE.config.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ configuration OracleJRE_config
)

Import-DscResource -ModuleName PowerStig
Import-DscResource -ModuleName FileContentDsc

Node localhost
{
Expand Down
1 change: 1 addition & 0 deletions Tests/Integration/DSCResources/SqlServer.config.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ configuration SqlServer_config
)

Import-DscResource -ModuleName PowerStig
Import-DscResource -ModuleName SqlServerDsc

Node localhost
{
Expand Down
1 change: 1 addition & 0 deletions Tests/Integration/DSCResources/Vsphere.config.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ configuration Vsphere_config
)

Import-DscResource -ModuleName PowerStig
Import-DscResource -ModuleName VMware.vSphereDSC

Node localhost
{
Expand Down
1 change: 1 addition & 0 deletions Tests/Integration/DSCResources/WindowsClient.config.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ configuration WindowsClient_config
)

Import-DscResource -ModuleName PowerStig
Import-DscResource -ModuleName AccessControlDSC

Node localhost
{
Expand Down
1 change: 1 addition & 0 deletions Tests/Integration/DSCResources/WindowsDefender.config.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ configuration WindowsDefender_config
)

Import-DscResource -ModuleName PowerStig
Import-DscResource -ModuleName GPRegistryPolicyDsc

Node localhost
{
Expand Down
1 change: 1 addition & 0 deletions Tests/Integration/DSCResources/WindowsDnsServer.config.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ configuration WindowsDnsServer_config
)

Import-DscResource -ModuleName PowerStig
Import-DscResource -ModuleName AccessControlDSC

Node localhost
{
Expand Down
1 change: 1 addition & 0 deletions Tests/Integration/DSCResources/WindowsFirewall.config.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ configuration WindowsFirewall_config
)

Import-DscResource -ModuleName PowerStig
Import-DscResource -ModuleName PSDscResources

Node localhost
{
Expand Down
1 change: 1 addition & 0 deletions Tests/Integration/DSCResources/WindowsServer.config.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ configuration WindowsServer_config
)

Import-DscResource -ModuleName PowerStig
Import-DscResource -ModuleName AccessControlDSC

Node localhost
{
Expand Down
Loading
Loading