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

Unable to Import PowerSTIG 4.4.0 Due to cyclic dependency Error #617

Merged
merged 18 commits into from
May 19, 2020
Merged

Unable to Import PowerSTIG 4.4.0 Due to cyclic dependency Error #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5dbe8d3
removed vmware.vspheredsc as a dependency because all of its required…
erjenkin May 12, 2020
eb79ada
updated module load process for VMware modules
erjenkin May 13, 2020
0f808e8
updated build.yaml
erjenkin May 13, 2020
18ffc7d
updated test
erjenkin May 13, 2020
cc6f6bb
Updated tests
erjenkin May 14, 2020
10e619e
removed stop error action
erjenkin May 14, 2020
06e157a
updated formating
erjenkin May 14, 2020
a5c84fa
updated based on failing hqrm
erjenkin May 14, 2020
516b035
updated module helper
erjenkin May 14, 2020
a2e2717
moved helper module
erjenkin May 14, 2020
77a131f
updated location of module helper
erjenkin May 14, 2020
f7a78d4
reduced vmware.VsphereDSC version
erjenkin May 14, 2020
a81351c
updated build.yaml
erjenkin May 14, 2020
abb69e7
updated data file
erjenkin May 14, 2020
75c0b20
update module version schema
erjenkin May 14, 2020
dc28174
updated based on testing
erjenkin May 15, 2020
44357c8
Update changelog
erjenkin May 15, 2020
6f2655c
Update based on PR feedback
erjenkin May 19, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## [Unreleased]

* Fixed [#616](https://github.com/microsoft/PowerStig/issues/616): Unable to Import PowerSTIG 4.4.0 Due to cyclic dependency Error
* Update PowerSTIG to use Azure Pipelines and DSC Community based build logic: [#600](https://github.com/microsoft/PowerStig/issues/600)
* Update PowerSTIG to parse/convert the Vmware Vsphere 6.5 STIG V1R3: [#604](https://github.com/microsoft/PowerStig/issues/604)

Expand Down
7 changes: 7 additions & 0 deletions Tests/Integration/Module/PowerStig.Integration.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,11 @@ Describe "$moduleName module" {
$compare.Count | Should Be 0
}
}

Context 'Import PowerSTIG should not throw' {

It "Should not throw and error" {
{Import-Module PowerSTIG} | Should -Not -Throw
}
}
}
26 changes: 13 additions & 13 deletions build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,19 +234,19 @@ Begin
}
}

InvokeBuild = 'latest'
PSScriptAnalyzer = 'latest'
Pester = 'latest'
Plaster = 'latest'
ModuleBuilder = '1.0.0'
ChangelogManagement = 'latest'
Sampler = '0.104.0'
xDSCResourceDesigner = 'latest'
PSPKI = 'latest'
MarkdownLinkCheck = 'latest'
'DscResource.Test' = 'latest'
'DscResource.AnalyzerRules' = 'latest'
'powershell-yaml' = 'latest'
InvokeBuild = 'latest'
PSScriptAnalyzer = 'latest'
Pester = 'latest'
Plaster = 'latest'
ModuleBuilder = '1.0.0'
ChangelogManagement = 'latest'
Sampler = '0.104.0'
xDSCResourceDesigner = 'latest'
PSPKI = 'latest'
MarkdownLinkCheck = 'latest'
'DscResource.Test' = 'latest'
'DscResource.AnalyzerRules' = 'latest'
'powershell-yaml' = 'latest'
# The modules below are dynamically inserted from the Begin block of .\build.ps1

'@
Expand Down
14 changes: 7 additions & 7 deletions source/PowerStig.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Description = 'The PowerStig module provides a set of PowerShell classes to acce
2. Ignoring a single or entire class of rules (auto-documenting)
3. Organizational settings to address STIG rules that have allowable ranges.

This module is intended to be used by additional automation as a lightweight portable “database” to audit and enforce the parsed STIG data.'
This module is intended to be used by additional automation as a lightweight portable database to audit and enforce the parsed STIG data.'

# Minimum version of the Windows PowerShell engine required by this module
PowerShellVersion = '5.1'
Expand All @@ -48,13 +48,13 @@ RequiredModules = @(
@{ModuleName = 'WindowsDefenderDsc'; ModuleVersion = '1.0.0.0'},
@{ModuleName = 'xDnsServer'; ModuleVersion = '1.11.0.0'},
@{ModuleName = 'xWebAdministration'; ModuleVersion = '2.5.0.0'}
@{ModuleName = 'VMware.VimAutomation.Sdk'; ModuleVersion = '12.0.0.15939651'}
@{ModuleName = 'VMware.VimAutomation.Sdk'; ModuleVersion = '12.0.0.15939651'},
@{ModuleName = 'VMware.VimAutomation.Common'; ModuleVersion = '12.0.0.15939652'}
@{ModuleName = 'VMware.Vim'; ModuleVersion ='7.0.0.15939650'}
@{ModuleName = 'VMware.VimAutomation.Cis.Core'; ModuleVersion = '12.0.0.15939657'}
@{ModuleName = 'VMware.VimAutomation.Core'; ModuleVersion = '12.0.0.15939655'}
@{ModuleName = 'VMware.VimAutomation.Storage'; ModuleVersion = '12.0.0.15939648'}
@{ModuleName = 'VMware.VimAutomation.Vds'; ModuleVersion = '12.0.0.15940185'}
@{ModuleName = 'VMware.Vim'; ModuleVersion ='7.0.0.15939650'},
@{ModuleName = 'VMware.VimAutomation.Cis.Core'; ModuleVersion = '12.0.0.15939657'},
@{ModuleName = 'VMware.VimAutomation.Core'; ModuleVersion = '12.0.0.15939655'},
@{ModuleName = 'VMware.VimAutomation.Storage'; ModuleVersion = '11.5.0.14901686'},
@{ModuleName = 'VMware.VimAutomation.Vds'; ModuleVersion = '11.2.0.12483615'},
@{ModuleName = 'Vmware.vSphereDsc'; ModuleVersion = '2.1.0.58'}
)

Expand Down