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.

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

Add test to assert dependent module versions #555

Merged
merged 5 commits into from
Dec 19, 2019
Merged

Add test to assert dependent module versions #555

merged 5 commits into from
Dec 19, 2019

Conversation

jcwalker
Copy link
Member

@jcwalker jcwalker commented Dec 16, 2019

And test to verify module versions

Pull Request (PR) description:

Add test to verify the dependant DSC module versions in the manifest match what is int he DSC Composite resources.

This Pull Request (PR) fixes the following issues:

This fixes #520

Task list:

  • Change details added to Unreleased section of CHANGELOG.md (Not required for Convert modules)?
  • Added/updated documentation, comment-based help and descriptions where appropriate?
  • Examples appropriately updated?
  • New/changed code adheres to Style Guidelines?
  • Unit and (optional) Integration tests created/updated where possible?

This change is Reviewable

And test to verify module versions
@jcwalker jcwalker changed the title Added helper function Add test to assert dependent module versions Dec 16, 2019
Copy link
Contributor

@stevehose stevehose left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 3 files at r1, 3 of 3 files at r2.
Reviewable status: 1 of 4 files reviewed, 1 unresolved discussion (waiting on @jcwalker and @stevehose)


Tests/Integration/PowerStig.Integration.tests.ps1, line 32 at r3 (raw file):

            It "Should require the same module listed in the manifest for DscResource $dscCompositeFile Module: $($moduleInfo.ModuleName)" {
                $moduleInfo.ModuleVersion | Should -Be $moduleData.ModuleVersion

Syntax error: "-Be" is incorrect for the current version of Pester. Use "Be" instead.

@codecov-io
Copy link

codecov-io commented Dec 16, 2019

Codecov Report

Merging #555 into 4.2.0 will not change coverage.
The diff coverage is 0%.

Impacted file tree graph

@@          Coverage Diff          @@
##           4.2.0    #555   +/-   ##
=====================================
  Coverage   78.1%   78.1%           
=====================================
  Files         16      16           
  Lines        201     201           
  Branches       3       3           
=====================================
  Hits         157     157           
  Misses        41      41           
  Partials       3       3
Impacted Files Coverage Δ
DSCResources/SqlServer/SqlServer.schema.psm1 63.63% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7d8afc6...e7e3d66. Read the comment docs.

@jcwalker
Copy link
Member Author


Tests/Integration/PowerStig.Integration.tests.ps1, line 32 at r3 (raw file):

Previously, stevehose (Steve Hose) wrote…

Syntax error: "-Be" is incorrect for the current version of Pester. Use "Be" instead.

It passes the build so the version the build agent uses is compatible. I think we should move out tests to the new pester syntax.

Copy link
Contributor

@stevehose stevehose left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 1 files at r3, 2 of 2 files at r4.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@bcwilhite bcwilhite merged commit 0807f0e into 4.2.0 Dec 19, 2019
@bcwilhite bcwilhite deleted the jcwalker#512 branch December 19, 2019 02:25
bcwilhite added a commit that referenced this pull request Dec 20, 2019
* Updated based on issue (#523)

* Feature request: additional support for servicerule properties #514 (#525)

* Added property based on community request

* updated issue version

* Updated win10 system drive path in convert module (#526)

* added support for 2012R2 MS/DC 2.17/2.18 (#532)

* added support for 2012R2 MS/DC 2.17/2.18

* added new line on the xccdf

* removed tab from processed xml.

* updated to successfully parse Win10 V1R19 (#534)

* added support for FireFox 4.27 (#541)

* added support for IE 1.18 (#539)

* added support for .net 4.0 V1R9 (#536)

* Update PowerSTIG to parse the IIS 8.5 1.9 Site and Server STIGs (#537)

* Initial Convert and update IIS 8.5 1.9

* remove n-2 STIGs

* removed quotes

* added newline to raw xccdf

* updated based on PR feedback

* Update PowerSTIG to successfully parse Microsoft SQL Server 2016 Instance STIG - Ver 1, Rel 7 (#544)

* fixed and updated SQL Instance STIGs

* updated sqlserver composite and removed tabs

* updated sqlserver composite.

* removed tabs

* Updated JRE rule V-66941.a to be a org setting (#543)

* updated JRE rule V-66941.a to be a org settings

* updated name of processed STIG

* update changelog

* added space to TS build issue.

* Need a test to verify the conversionstatus="fail" does not exist in processed STIGs (#550)

* updated Win2016DC failed converts and added tests

* removed V-73517 from MS-1.9 as the rule no longer
exist.

* Update PowerSTIG to parse and apply OfficeSystem 2013 STIG V1R9 / 2016 V1R1 (#553)

* added Office-System2013 STIG support.

* reconverted xccdfs, corrected issues in some
processed stigs.

* added OfficeSystem 2016 V1R1 STIG

* updated changelog.md

* stevehose#443 and #528 check list bug fixes (#529)

* Update to fix checklist bugs

* Fixed bug in checklist parameter ManualCheckFile

* Updated Checklist Pester tests

* Updates based upon PR comments

* Updated changelog.md

* Add test to assert dependent module versions (#555)

* Added helper function
And test to verify module versions

* Added tests to assert dependant module versions.

* Removed commented code

* Removed whitespace

* Update PowerSTIG to parse and apply Windows Server 2019 V1R2 STIG (#557)

* added support for 2019 MS
modified hardcoded parser rule ids to support
2019 MS

* added support for 2019 DC STIG; parser update
to address failed AD permission rules
(ActiveDirectoryAuditRule) which isn't currently
implemented

* Added ProcessMitigation to WindowsServer composite

* regenerated all xccdfs, 6 were corrected/modified

* updated changelog.md

* appveyor build issue - space insert

* prep for 4.2.0 release, update changelog, filehash
markdowns and module manifest

Co-authored-by: Eric Jenkins <erjenkin@microsoft.com>
Co-authored-by: Steve Hose <33662177+stevehose@users.noreply.github.com>
Co-authored-by: Jason Walker <walkerjason@live.com>
bcwilhite added a commit that referenced this pull request Feb 13, 2020
* Updated based on issue (#523)

* Feature request: additional support for servicerule properties #514 (#525)

* Added property based on community request

* updated issue version

* Updated win10 system drive path in convert module (#526)

* Updates for Issues #259 and #527

* added support for 2012R2 MS/DC 2.17/2.18 (#532)

* added support for 2012R2 MS/DC 2.17/2.18

* added new line on the xccdf

* removed tab from processed xml.

* updated to successfully parse Win10 V1R19 (#534)

* added support for FireFox 4.27 (#541)

* added support for IE 1.18 (#539)

* added support for .net 4.0 V1R9 (#536)

* Update PowerSTIG to parse the IIS 8.5 1.9 Site and Server STIGs (#537)

* Initial Convert and update IIS 8.5 1.9

* remove n-2 STIGs

* removed quotes

* added newline to raw xccdf

* updated based on PR feedback

* Version update

* MInor updates

* Update PowerSTIG to successfully parse Microsoft SQL Server 2016 Instance STIG - Ver 1, Rel 7 (#544)

* fixed and updated SQL Instance STIGs

* updated sqlserver composite and removed tabs

* updated sqlserver composite.

* removed tabs

* Code changes to correct issues

* Updated JRE rule V-66941.a to be a org setting (#543)

* updated JRE rule V-66941.a to be a org settings

* updated name of processed STIG

* update changelog

* added space to TS build issue.

* Updates to add functionality and address bugs

* Need a test to verify the conversionstatus="fail" does not exist in processed STIGs (#550)

* updated Win2016DC failed converts and added tests

* removed V-73517 from MS-1.9 as the rule no longer
exist.

* Update PowerSTIG to parse and apply OfficeSystem 2013 STIG V1R9 / 2016 V1R1 (#553)

* added Office-System2013 STIG support.

* reconverted xccdfs, corrected issues in some
processed stigs.

* added OfficeSystem 2016 V1R1 STIG

* updated changelog.md

* Update: duplicate rules for checklist & bug fixes

* Updates to fix DSC results bugs

* Fixed error in New-StigChecklist

* Minor update to support debugging

* Final commit prior to PR. Updated changelog.

* stevehose#443 and #528 check list bug fixes (#529)

* Update to fix checklist bugs

* Fixed bug in checklist parameter ManualCheckFile

* Updated Checklist Pester tests

* Updates based upon PR comments

* Updated changelog.md

* Add test to assert dependent module versions (#555)

* Added helper function
And test to verify module versions

* Added tests to assert dependant module versions.

* Removed commented code

* Removed whitespace

* Update PowerSTIG to parse and apply Windows Server 2019 V1R2 STIG (#557)

* added support for 2019 MS
modified hardcoded parser rule ids to support
2019 MS

* added support for 2019 DC STIG; parser update
to address failed AD permission rules
(ActiveDirectoryAuditRule) which isn't currently
implemented

* Added ProcessMitigation to WindowsServer composite

* regenerated all xccdfs, 6 were corrected/modified

* updated changelog.md

* appveyor build issue - space insert

* Updates to fix build bugs

* Updated to fix bugs in build

* Fix to missing reference

* Build error fix - missing newline

* prep for 4.2.0 release, update changelog, filehash
markdowns and module manifest

* Fix for build missing functions reference

* Relocated file to be picked up during runtime

* Minor update to remove test code

* Updated for build errors

* Updated processed SQL Server 1.3 files

* Updates for PR

* Updates for PR

* Updated for PR

* Updates for PR

* Moving changes for SQL to another branch

* Update for PR

Co-authored-by: Eric Jenkins <erjenkin@microsoft.com>
Co-authored-by: Brian Wilhite <bcwilhite@live.com>
Co-authored-by: Jason Walker <walkerjason@live.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants