Missing changes from main (#6564)

* Sync up the default branch as main (#6239) Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com> Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com> * Bump version to 5.20.2 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * resolves inspec/inspec#6042 (#6043) Signed-off-by: Marijus Ravickas <marijus.ravickas@gmail.com> Signed-off-by: Marijus Ravickas <marijus.ravickas@gmail.com> * Enhance `lxc` resource to test properties (#6243) * ENHANCE: Extend lxc resource to test the properties Signed-off-by: Sonu Saha <sonu.saha@progress.com> * TEST: Extend test for introduced properties Signed-off-by: Sonu Saha <sonu.saha@progress.com> * DOCS: Extend test for introduced properties Signed-off-by: Sonu Saha <sonu.saha@progress.com> * FIX: Correct exception class to handle bad yaml Signed-off-by: Sonu Saha <sonu.saha@progress.com> * Doc Review Signed-off-by: Deepa Kumaraswamy <dkumaras@progress.com> * FIX: Handle specific exception to handle bad yaml Signed-off-by: Sonu Saha <sonu.saha@progress.com> Signed-off-by: Sonu Saha <sonu.saha@progress.com> Signed-off-by: Deepa Kumaraswamy <dkumaras@progress.com> Co-authored-by: Deepa Kumaraswamy <dkumaras@progress.com> * Bump version to 5.20.3 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * CFINSPEC-462: Fixes inspec sign breaks when there is period or dot in the profile name (#6261) Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Bump version to 5.20.4 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * CFINSPEC-374 DSL keyword `only_applicable_if` added (#6229) * Not applicable if logic addition Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Changes from not applicable if to only applicable if Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Fix to enable placing only_applicable_if at any position in control and for keeping impact zero intact Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Doc change added for only_applicable_if Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Doc Review Signed-off-by: Deepa Kumaraswamy <dkumaras@progress.com> * Added generic examples that supports cross platform for testing Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Yet another build fix due to changes in test Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> Signed-off-by: Deepa Kumaraswamy <dkumaras@progress.com> Co-authored-by: Deepa Kumaraswamy <dkumaras@progress.com> * Bump version to 5.21.0 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * CFINSPEC-458 Oracle DB session resource compatibility with AIX-C shell (#6257) * Oracle DB session resource compatibility with AIX-Cshell Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Fixes in oracledb session unit test using oracle_query_string Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Bump version to 5.21.1 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Replace faraday_middleware with faraday-follow_redirects (#6238) faraday_middleware was already DEPRECATED in 2022-01. Only FaradayMiddleware::FollowRedirects from faraday_middleware has been used, and so we can replace it with faraday-follow_redirects. faraday-follow_redirects 0.3.0 requires faraday ~> 1.0, which is as same as "faraday_middleware 1.0.0 or higher. Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com> Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com> * Bump version to 5.21.2 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Update Faraday gem (#6267) Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Bump version to 5.21.3 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Bump test-kitchen from 3.3.1 to 3.3.2 in /omnibus (#6227) Bumps [test-kitchen](https://github.com/test-kitchen/test-kitchen) from 3.3.1 to 3.3.2. - [Release notes](https://github.com/test-kitchen/test-kitchen/releases) - [Changelog](https://github.com/test-kitchen/test-kitchen/blob/main/CHANGELOG.md) - [Commits](https://github.com/test-kitchen/test-kitchen/commits) --- updated-dependencies: - dependency-name: test-kitchen dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump version to 5.21.4 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Bump omnibus-software from `1d540dc` to `7d0e0fe` in /omnibus (#6274) Bumps [omnibus-software](https://github.com/chef/omnibus-software) from `1d540dc` to `7d0e0fe`. - [Release notes](https://github.com/chef/omnibus-software/releases) - [Commits](1d540dcdef...7d0e0fe472) --- updated-dependencies: - dependency-name: omnibus-software dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump version to 5.21.5 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Fix for omnibus build failure on Windows (#6289) Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Bump version to 5.21.6 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * RESOURCE-527 Add an inspec init template for alicloud (#6304) * adding the alicloud in the spec.files Signed-off-by: Soumyodeep Karmakar <soumyo.k13@gmail.com> * adding the test for generating inspec profile alicloud Signed-off-by: Soumyodeep Karmakar <soumyo.k13@gmail.com> * adding the alicloud profile Signed-off-by: Soumyodeep Karmakar <soumyo.k13@gmail.com> * fix lint error Signed-off-by: Soumyodeep Karmakar <soumyo.k13@gmail.com> Signed-off-by: Soumyodeep Karmakar <soumyo.k13@gmail.com> * Bump version to 5.21.7 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Fix Ruby 2.7 Bundle Installs on CI Verify Pipeline (#6324) * We will never be on 2.6 again Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> * Only run html-proofer test on Ruby 3 Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> * Pin to chef 16 on ruby 2.7, 17+ on Ruby 3 Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> * Bump version to 5.21.8 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * CFINSPEC-493 update signing_identity (#6298) * update signing_identity Signed-off-by: Sathish <sbabu@progress.com> * pin chef to older version for ruby version lesser than 3.0 Signed-off-by: Sathish <sbabu@progress.com> Signed-off-by: Sathish <sbabu@progress.com> Co-authored-by: Clinton Wolfe <clintoncwolfe@gmail.com> * Bump version to 5.21.9 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Cfinspec 488 fix nokigiri omnibus (#6305) * update signing_identity Signed-off-by: Sathish <sbabu@progress.com> * pin chef 17.0 to ruby 2.7 Signed-off-by: Sathish <sbabu@progress.com> * add nokogiri as dependency Signed-off-by: Sathish <sbabu@progress.com> * pin chef to older version for ruby version lesser than 3.0 Signed-off-by: Sathish <sbabu@progress.com> * Linting Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> Signed-off-by: Sathish <sbabu@progress.com> Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> Co-authored-by: Clinton Wolfe <clintoncwolfe@gmail.com> * Bump version to 5.21.10 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Remove Windows 3.0 testing. Chef 18 was never released for Ruby 3.0, only 3.1 (#6330) Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> * Bump version to 5.21.11 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Prevent negative status from crashing launchd service resource (#6262) Signed-off-by: dtheyer <davidheyer2016@gmail.com> Signed-off-by: dtheyer <davidheyer2016@gmail.com> * Bump version to 5.21.12 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Update chefstyle from 2.0.x to 2.2.2 to use RuboCop 1.25.1 (#6240) Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com> Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com> * Bump version to 5.21.13 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Update readme for usage via Docker (CFINSPEC-516) (#6329) * DOCS: Update readme for usage via Docker (CFINSPEC-516) Signed-off-by: Sonu Saha <sonu.saha@progress.com> * DOCS: Explain updated readme (CFINSPEC-516) Signed-off-by: Sonu Saha <sonu.saha@progress.com> Signed-off-by: Sonu Saha <sonu.saha@progress.com> * Bump version to 5.21.14 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * CFINSPEC-393 - Fix for custom plugin loading issue when gemspec file is invalid and unable to load the lib path. (#6334) Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Bump version to 5.21.15 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * CFINSPEC-517: Fix for habitat buld failure (#6340) * Fix for habitat buld failure - Git load issue Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Updating ruby installer version to 3.2.1 Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Revert "Updating ruby installer version to 3.2.1" This reverts commit 53bae0f71e. * Checking removing the lines which are not needed. Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Revert "Checking removing the lines which are not needed." This reverts commit b5561abc51. Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Bump version to 5.21.16 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Upgraded mock ubuntu test from 20.04 to 22.04 (#6351) Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Fixing typo in user_permissions (#6344) * Fixing typo in user_permissions Signed-off-by: Magruder, Micah <Micah.Magruder@oracle.com> * Corrected spacing Signed-off-by: Magruder, Micah <Micah.Magruder@oracle.com> Signed-off-by: Magruder, Micah <Micah.Magruder@oracle.com> * Bump version to 5.21.17 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Fix env smoke test by updating ERB.new in `inspec env`; add additional test (#6342) * Failing test for Ruby 3.1 - ERB.new call options changed Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> * Fix for Ruby 3.1 by using named params to ERB.new Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> * Restrict test to non-windows systems Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> * Restrict test to non-windows systems Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> * CFINSPEC-533: Fix undefined method 'summary' for Gem::SourceFetchProblem (NoMethodError) when airgapped (#6337) * This fixes the undefined method 'summary' for #<Gem::SourceFetchProblem:0x000000000139dc70> (NoMethodError) while invoking any inspec command if the custom plugin is installed and if inspec commands are run in an air gap environment. This fix removes an earlier call for getting gem specification from rubygems.org which is the cause for above error and replaces it with fetching the summary from a locally saved gemspec file. This will work in both airgap and non-airgap environments. Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Adds test for reading description from local gemspec file. Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Bump version to 5.21.18 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Fix omnibus build which is picking ruby 2.7.4 which has vulnerability (#6341) Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> Co-authored-by: Vasu1105 <vasundhara.jagdale@chef.io> * Bump version to 5.21.19 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Bump version to 5.21.20 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Update CHANGELOG.md with details from pull request #6341 Obvious fix; these changes are the result of automation not creative thinking. * Revert "CFINSPEC-240 Extended file format support for waivers (#6193)" (#6366) This reverts commit b7ddac9dcc. * Bump version to 5.21.21 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Revert the nokogiri dependency from omnibus project configuration (#6372) Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Bump version to 5.21.22 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * CFINSPEC-553: Fix failing verify pipeline builds on ruby 3.0 (#6378) * bundle install without kitchen group from Gemfile as verify pipeline is breaking for ruby 3.0 as Chef 18 requires to be work with ruby 3.1. In future we will be removing the support for ruby 3.0 as Chef 18 never released with ruby 3.0 Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Removes all excluded groups from the bundle config set which was removed from the Gemfile. Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Exclude the gem dependencies for kitchen for omnibus builds Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Exclude the kitchen dependencies on windows platform too Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Bump version to 5.21.23 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Ruby 3.1 support: Adds ucrt platform to resolve windows omnibus build. (#6381) * Adds the ucrt platform support for Windows Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Adds the environment variable to ignore artifactory proxy as some gem are getting 500 error when tries to download from artifactory Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Bump version to 5.21.24 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * CFINSPEC-240 Extended file format support for waivers: JSON & CSV (#6369) * Revert "Revert "CFINSPEC-240 Extended file format support for waivers (#6193)" (#6366)" This reverts commit 30146e07fe. * Waiver support for csv and json Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Removed the word excel from image tag Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Update waivers.md Signed-off-by: Ian Maddaus <ian.maddaus@progress.com> Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> Signed-off-by: Ian Maddaus <ian.maddaus@progress.com> Co-authored-by: Ian Maddaus <ian.maddaus@progress.com> * Bump version to 5.21.25 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * CFINSPEC-542 Bug fix for profiles with dependent profiles (#6377) * Matching semver using regex to determine profile name without version in dsl logic Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Testing for selecting control using version in require control dsl Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Documentation for using version with profile name when including or selecting controls in a profile Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Commenting in dsl library about logic for fetching version and matching it Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Comment for regex used to fetch version Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Minor improvement for regex variable placement Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Bump version to 5.21.26 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Bump version of omnibus-software (#6385) Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Bump version to 5.21.27 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Add ruby-msys2-devkit as dependency and check (#6391) Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * adding new private verify, as this will kick off the expeditor bump version (#6397) Signed-off-by: Sean Simmons <ssimmons@progress.com> Signed-off-by: Sean Simmons <ssimmons@progress.com> * Bump version to 5.21.28 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Update copyright year in README (#6395) Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> * Bump version to 5.21.29 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Executed '.expeditor/update_dockerfile.sh' Obvious fix; these changes are the result of automation not creative thinking. * CFINSPEC-522: Remove rake tasks which are no longer used (#6367) * CLEAN-UP: Remove unused rake tasks missing, kitchen and version tasks are not used Signed-off-by: Sonu Saha <sonu.saha@progress.com> * CLEAN-UP: Remove functional rake test test:default covers both unit and functional tests default was introduced to cover both functional and unit in PR #4102 Signed-off-by: Sonu Saha <sonu.saha@progress.com> * CLEAN-UP: Remove unused docs related tasks Signed-off-by: Sonu Saha <sonu.saha@progress.com> * CLEAN-UP: Remove tasks/* from expeditor config Signed-off-by: Sonu Saha <sonu.saha@progress.com> * REVERT: Undo deletion of functional test Signed-off-by: Sonu Saha <sonu.saha@progress.com> * RECOVER: Retain docs:cli task Signed-off-by: Sonu Saha <sonu.saha@progress.com> * UNDO: Revert changes to config Signed-off-by: Sonu Saha <sonu.saha@progress.com> * CHORE: Add reference to this PR in note for future use Signed-off-by: Sonu Saha <sonu.saha@progress.com> --------- Signed-off-by: Sonu Saha <sonu.saha@progress.com> * RAKE TEST: Fix rake task for docs:cli Signed-off-by: Sonu Saha <sonu.saha@progress.com> * DOCS: Generate cli.md with rake docs:cli Signed-off-by: Sonu Saha <sonu.saha@progress.com> * Remove unused require Signed-off-by: Sonu Saha <sonu.saha@progress.com> * FORMAT: Use html dl, dt, dd tags for displaying subcommands Signed-off-by: Sonu Saha <sonu.saha@progress.com> * REFACTOR: Remove repetitive dl closing for subcommands of single command Signed-off-by: Sonu Saha <sonu.saha@progress.com> * Bump version to 5.21.30 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * CFINSPEC-573: Fix for mongo_session resources prints debug level of information in output of the run result. (#6401) Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Updates release process docs as per current changes (#6398) Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Bump version to 5.21.31 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Bump version to 5.21.32 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * CFINSPEC-576 : Fix profile gem dependency loading issue when dependent gem is required inside profile libraries. (#6408) * Test profile consist of custom resource which has a gem dependency Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * CFINSPEC-576 Fix for profile gem depedency loading issue if depedent gem is required in libraries files of the profile Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Fix windows test failure for profile gem dependency Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> --------- Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Bump version to 5.21.33 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * CFINSPEC-580 Dependent profiles fix for any scheme of version used in profiles (#6410) * Dependent profiles fix for any scheme of version used in profiles Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Dependent profile fix when version is blank in dependent profiles Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> --------- Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Bump version to 5.21.34 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Formatting fixes for podman docs (#6386) * Formatting fixes for podman docs Signed-off-by: Ian Maddaus <ian.maddaus@progress.com> * Minor fix Signed-off-by: Ian Maddaus <ian.maddaus@progress.com> * Update docs-chef-io/content/inspec/resources/podman.md Signed-off-by: Ian Maddaus <ian.maddaus@progress.com> Co-authored-by: Vasundhara Jagdale <vasundhara.jagdale@chef.io> * Update docs-chef-io/content/inspec/resources/podman.md Signed-off-by: Ian Maddaus <ian.maddaus@progress.com> Co-authored-by: Vasundhara Jagdale <vasundhara.jagdale@chef.io> --------- Signed-off-by: Ian Maddaus <ian.maddaus@progress.com> Co-authored-by: Vasundhara Jagdale <vasundhara.jagdale@chef.io> * Bump version to 5.21.35 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * CFINSPEC-550 Add RHEL9 to build matrix (#6403) Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Bump omnibus-software from `6a13693` to `225e357` in /omnibus (#6442) Bumps [omnibus-software](https://github.com/chef/omnibus-software) from `6a13693` to `225e357`. - [Release notes](https://github.com/chef/omnibus-software/releases) - [Commits](6a13693685...225e3576c4) --- updated-dependencies: - dependency-name: omnibus-software dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump version to 5.21.36 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Bump omnibus from `c66e97c` to `cf97613` in /omnibus (#6423) Bumps [omnibus](https://github.com/chef/omnibus) from `c66e97c` to `cf97613`. - [Release notes](https://github.com/chef/omnibus/releases) - [Commits](c66e97c211...cf97613115) --- updated-dependencies: - dependency-name: omnibus dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump version to 5.21.37 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Bump kitchen-vagrant from 1.12.1 to 1.14.1 in /omnibus (#6427) Bumps [kitchen-vagrant](https://github.com/opscode/kitchen-vagrant) from 1.12.1 to 1.14.1. - [Release notes](https://github.com/opscode/kitchen-vagrant/releases) - [Changelog](https://github.com/test-kitchen/kitchen-vagrant/blob/main/CHANGELOG.md) - [Commits](https://github.com/opscode/kitchen-vagrant/compare/v1.12.1...v1.14.1) --- updated-dependencies: - dependency-name: kitchen-vagrant dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump version to 5.21.38 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Bump test-kitchen from 3.3.2 to 3.5.0 in /omnibus (#6360) Bumps [test-kitchen](https://github.com/test-kitchen/test-kitchen) from 3.3.2 to 3.5.0. - [Release notes](https://github.com/test-kitchen/test-kitchen/releases) - [Changelog](https://github.com/test-kitchen/test-kitchen/blob/main/CHANGELOG.md) - [Commits](https://github.com/test-kitchen/test-kitchen/commits/v3.5.0) --- updated-dependencies: - dependency-name: test-kitchen dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump version to 5.21.39 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Bump rack from 2.2.4 to 2.2.6.2 in /omnibus (#6388) Bumps [rack](https://github.com/rack/rack) from 2.2.4 to 2.2.6.2. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/2.2.4...v2.2.6.2) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump version to 5.21.40 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Revert "adding new private verify, as this will kick off the expeditor bump version (#6397)" (#6479) This reverts commit 227b0f2d35. * Bump version to 5.21.41 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * CHEF-1458 Multiple values changes in SimpleConfig library (#6489) * Simple config changes to return array of values with multiple values opt Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * New option added to split multiple values with a delimiter regex Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> --------- Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Bump version to 5.21.42 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Adds configuration required for sonarqube integration. (#6480) Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Bump version to 5.21.43 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Add nftables resources (#6499) * Fix systemd path for Leap image Signed-off-by: Jeremy JACQUE <jeremy.jacque@algolia.com> * Use vhef client version 17 as doocker cookbook do not support >= 18 Signed-off-by: Jeremy JACQUE <jeremy.jacque@algolia.com> * Add nftables resource Signed-off-by: Jeremy JACQUE <jeremy.jacque@algolia.com> * Add nftables tests Signed-off-by: Jeremy JACQUE <jeremy.jacque@algolia.com> * Add fixtures for nftables tests Signed-off-by: Jeremy JACQUE <jeremy.jacque@algolia.com> * enable nftables only when attr is true - then disable iptables Signed-off-by: Jeremy JACQUE <jeremy.jacque@algolia.com> * By default test iptables, not nftables Signed-off-by: Jeremy JACQUE <jeremy.jacque@algolia.com> * Fix tests and lint errors Signed-off-by: Jeremy JACQUE <jeremy.jacque@algolia.com> * Increase unit test coverage for nftables Signed-off-by: Jeremy JACQUE <jeremy.jacque@algolia.com> * Do not use -nn nft option as behaviour changes based on nft version Signed-off-by: Jeremy JACQUE <jeremy.jacque@algolia.com> * Base nft params identification on its version, not os version Signed-off-by: Jeremy JACQUE <jeremy.jacque@algolia.com> * Make test more human friendly by reversing unless/if logic Signed-off-by: Jeremy JACQUE <jeremy.jacque@algolia.com> * Update mocked cmds with nft params Signed-off-by: Jeremy JACQUE <jeremy.jacque@algolia.com> * Fix quoting issue with rubocop Signed-off-by: Jeremy JACQUE <jeremy.jacque@algolia.com> * Fix uninitiallized class vars Signed-off-by: Jeremy JACQUE <jeremy.jacque@algolia.com> * Fix unit test by adding nft version mocking Signed-off-by: Jeremy JACQUE <jeremy.jacque@algolia.com> * Clean nftables doc Signed-off-by: Jeremy JACQUE <jeremy.jacque@algolia.com> --------- Signed-off-by: Jeremy JACQUE <jeremy.jacque@algolia.com> * Bump version to 5.21.44 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Clarify key_rsa docs regarding SSH keys (#6507) * Clarify that an RSA resource can only work on RSA keypairs Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> * Update docs-chef-io/content/inspec/resources/key_rsa.md Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> Co-authored-by: Ian Maddaus <IanMadd@users.noreply.github.com> --------- Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> Co-authored-by: Ian Maddaus <IanMadd@users.noreply.github.com> * CHEF-2438 Add train-kubernetes to inspec gemspec (#6512) * Add train-kubernetes to inspec gemspec, fix spacing Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> * Fix failing test to detect system plugins Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> --------- Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> Co-authored-by: Vasu1105 <vasundhara.jagdale@chef.io> * Bump version to 5.22.0 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Bump omnibus from `cf97613` to `ae855f3` in /omnibus (#6515) Bumps [omnibus](https://github.com/chef/omnibus) from `cf97613` to `ae855f3`. - [Release notes](https://github.com/chef/omnibus/releases) - [Commits](cf97613115...ae855f3060) --- updated-dependencies: - dependency-name: omnibus dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump rack from 2.2.6.2 to 2.2.6.4 in /omnibus (#6490) Bumps [rack](https://github.com/rack/rack) from 2.2.6.2 to 2.2.6.4. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.6.2...v2.2.6.4) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump version to 5.22.1 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Bump omnibus-software from `225e357` to `f06bbea` in /omnibus (#6508) Bumps [omnibus-software](https://github.com/chef/omnibus-software) from `225e357` to `f06bbea`. - [Release notes](https://github.com/chef/omnibus-software/releases) - [Commits](225e3576c4...f06bbea744) --- updated-dependencies: - dependency-name: omnibus-software dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix: ensure Invoke-WebRequest headers can be configured (#6484) * fix: ensure Invoke-WebRequest headers can be configured Signed-off-by: Adrian Mlodzianowski <amlodzianowski@logicworks.net> * fix: use array for custom headers Signed-off-by: Adrian Mlodzianowski <amlodzianowski@logicworks.net> * test: add unit test for Windows simple HTTP request with headers Signed-off-by: Adrian Mlodzianowski <amlodzianowski@logicworks.net> --------- Signed-off-by: Adrian Mlodzianowski <amlodzianowski@logicworks.net> Co-authored-by: Adrian Mlodzianowski <amlodzianowski@logicworks.net> * Bump version to 5.22.2 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * For #6493 : Add postgres_session support for custom port with a socket connection (#6494) * Add support for custom port with a socket connection Signed-off-by: Pg <pg.developper.fr@gmail.com> * Add tests for the postgres_session with custom port Signed-off-by: Pg <pg.developper.fr@gmail.com> --------- Signed-off-by: Pg <pg.developper.fr@gmail.com> * Bump version to 5.22.3 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Update host resource to resolve all ipaddresses (#6481) Signed-off-by: Alan Foster <alan@alanfoster.me> * CHEF-1631 Clarify that command timeout default was withdrawn (#6511) * Clarify that command timeout default was withdrawn Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> * Delete reference to timeout default entirely. Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> Co-authored-by: Ian Maddaus <IanMadd@users.noreply.github.com> --------- Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> Co-authored-by: Ian Maddaus <IanMadd@users.noreply.github.com> * Bump version to 5.22.4 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Executed '.expeditor/update_dockerfile.sh' Obvious fix; these changes are the result of automation not creative thinking. * Update rspec to 3.12 (#6523) Update RSpec dependency. There are some fixes and no breaking changes in 3.12 Signed-off-by: Phil Pirozhkov <hello@fili.pp.ru> * Bump version to 5.22.5 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Update Docker base image to be ubuntu 22.04 (#6526) Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> * Update CHANGELOG.md with details from pull request #6526 Obvious fix; these changes are the result of automation not creative thinking. * SUPPORT: Update dockerfile for m1 support (#6541) Signed-off-by: Sonu Saha <sonu.saha@progress.com> * Update CHANGELOG.md with details from pull request #6541 Obvious fix; these changes are the result of automation not creative thinking. * Bump omnibus from `ae855f3` to `9c0643a` in /omnibus (#6543) Bumps [omnibus](https://github.com/chef/omnibus) from `ae855f3` to `9c0643a`. - [Release notes](https://github.com/chef/omnibus/releases) - [Commits](ae855f3060...9c0643a3a4) --- updated-dependencies: - dependency-name: omnibus dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump version to 5.22.6 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Bump berkshelf from 8.0.2 to 8.0.7 in /omnibus (#6530) Bumps [berkshelf](https://github.com/chef/berkshelf) from 8.0.2 to 8.0.7. - [Changelog](https://github.com/chef/berkshelf/blob/main/CHANGELOG.md) - [Commits](https://github.com/chef/berkshelf/compare/v8.0.2...v8.0.7) --- updated-dependencies: - dependency-name: berkshelf dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump version to 5.22.7 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Bump omnibus-software from `f06bbea` to `4b08f0b` in /omnibus (#6548) Bumps [omnibus-software](https://github.com/chef/omnibus-software) from `f06bbea` to `4b08f0b`. - [Commits](f06bbea744...4b08f0bc06) --- updated-dependencies: - dependency-name: omnibus-software dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump version to 5.22.8 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * YAML reporter test fix (#6563) * Fix for yaml reporter data, not matching empty values with spaces Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Additional comment to document affecting fields Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> --------- Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Bump version to 5.22.9 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Add inspec-6 branch to Dependabot monitoring. This change must be made on main for Dependabot to pick it up. (#6569) Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> * Update CHANGELOG.md with details from pull request #6569 Obvious fix; these changes are the result of automation not creative thinking. * CHEF-4115 Added ability to merge reporter configurations from both CLI and config (#6568) * Added ability to merge cli and config reporter options Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Test cases to validate working of reporter configuration using cli and config Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Documentation change to add information on reporter configurations usage with both Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Added Doc review changes and text fixture for config json Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Verify fix Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Verify pipeline test fixes for reporter options to be read successfully Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Test changes in both cli and config reporter usage scenarios to fix verify pipeline Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Review comments to improvise Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Renamed testing fixture file for reporter cli config file Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> --------- Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> * Bump version to 5.22.10 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * EULA: Update installer license text (#6582) Signed-off-by: Sonu Saha <sonu.saha@progress.com> * Bump version to 5.22.11 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * CHEF-5200 Waived controls are not getting waived (skipped) in case of failure at resource level. (#6588) * CHEF-5200: This fix applies waiver if exception occurs while eval the control inside control block. This ensures that waiver are got applied in case of resouce level failures too. Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * When waiver file is empty error should be raised the written is invalid for the empty waiver file. Added different test to check only_if waiver is applied when the waived control in the waived file has expired. Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Fix lint Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Fix test failing on windows due to different exit code on the Windows. Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> --------- Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> * Bump version to 5.22.12 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * remove kitchen group * keep waiver refactoring for inspec-6 Signed-off-by: Sathish <sbabu@progress.com> --------- Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com> Signed-off-by: Marijus Ravickas <marijus.ravickas@gmail.com> Signed-off-by: Sonu Saha <sonu.saha@progress.com> Signed-off-by: Deepa Kumaraswamy <dkumaras@progress.com> Signed-off-by: Vasu1105 <vasundhara.jagdale@chef.io> Signed-off-by: Nikita Mathur <nikita.mathur@chef.io> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Soumyodeep Karmakar <soumyo.k13@gmail.com> Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com> Signed-off-by: Sathish <sbabu@progress.com> Signed-off-by: dtheyer <davidheyer2016@gmail.com> Signed-off-by: Magruder, Micah <Micah.Magruder@oracle.com> Signed-off-by: Ian Maddaus <ian.maddaus@progress.com> Signed-off-by: Sean Simmons <ssimmons@progress.com> Signed-off-by: Jeremy JACQUE <jeremy.jacque@algolia.com> Signed-off-by: Adrian Mlodzianowski <amlodzianowski@logicworks.net> Signed-off-by: Pg <pg.developper.fr@gmail.com> Signed-off-by: Alan Foster <alan@alanfoster.me> Signed-off-by: Phil Pirozhkov <hello@fili.pp.ru> Co-authored-by: Takuya N <takninnovationresearch@gmail.com> Co-authored-by: Chef Expeditor <chef-ci@chef.io> Co-authored-by: Marijus Ravickas <marijus.ravickas@gmail.com> Co-authored-by: Sonu Saha <98935583+ahasunos@users.noreply.github.com> Co-authored-by: Deepa Kumaraswamy <dkumaras@progress.com> Co-authored-by: Vasundhara Jagdale <vasundhara.jagdale@chef.io> Co-authored-by: Nikita Mathur <Nik08@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Soumyodeep Karmakar <63713087+soumyo13@users.noreply.github.com> Co-authored-by: Clinton Wolfe <clintoncwolfe@gmail.com> Co-authored-by: dtheyer <davidheyer2016@gmail.com> Co-authored-by: Micah Magruder <micah.magruder@cerner.com> Co-authored-by: Ian Maddaus <ian.maddaus@progress.com> Co-authored-by: sean-simmons-progress <111799713+sean-simmons-progress@users.noreply.github.com> Co-authored-by: Sonu Saha <sonu.saha@progress.com> Co-authored-by: Ian Maddaus <IanMadd@users.noreply.github.com> Co-authored-by: jjacque <jeremy.jacque@algolia.com> Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com> Co-authored-by: Adrian Mlodzianowski <amlodzianowski@logicworks.net> Co-authored-by: Pg <pg.developper.fr@gmail.com> Co-authored-by: Alan Foster <alan@alanfoster.me> Co-authored-by: Phil Pirozhkov <pirj@users.noreply.github.com> Co-authored-by: Nikita Mathur <nikita.mathur@chef.io>
2024-11-10 07:04:15 +00:00 · 2023-08-14 18:45:07 +05:30 · 2023-08-14 18:45:07 +05:30 · 5d0ae06a01
commit 5d0ae06a01
parent 844a4f68c5
17 changed files with 169 additions and 74 deletions
--- a/.expeditor/buildkite/verify.sh
+++ b/.expeditor/buildkite/verify.sh
@ -65,7 +65,7 @@ RAKE_EXIT=$?
 # If coverage is enabled, then we need to pick up the coverage/coverage.json file
 if [ -n "${CI_ENABLE_COVERAGE:-}" ]; then
  echo "--- installing sonarscanner"
-  export SONAR_SCANNER_VERSION=4.6.2.2472
+  export SONAR_SCANNER_VERSION=4.7.0.2747
  export SONAR_SCANNER_HOME=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux
  curl --create-dirs -sSLo $HOME/.sonar/sonar-scanner.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux.zip
  unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
@ -82,7 +82,7 @@ if [ -n "${CI_ENABLE_COVERAGE:-}" ]; then
  echo "--- running sonarscanner"
  sonar-scanner \
  -Dsonar.sources=. \
-  -Dsonar.host.url=https://sonarcloud.io
+  -Dsonar.host.url=https://sonar.progress.com
 fi

 exit $RAKE_EXIT
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -24,3 +24,15 @@ updates:
  schedule:
    interval: daily
  open-pull-requests-limit: 10
+- package-ecosystem: bundler
+  target-branch: "inspec-6"
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+- package-ecosystem: bundler
+  target-branch: "inspec-6"
+  directory: "/omnibus"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -8,8 +8,8 @@
 - CHEF-4010 make a clean exit for License list command [#6552](https://github.com/inspec/inspec/pull/6552) ([sathish-progress](https://github.com/sathish-progress))
 <!-- latest_release -->

-<!-- release_rollup since=5.18.14 -->
-### Changes since 5.18.14 release
+<!-- release_rollup since=5.22.12 -->
+### Changes since 5.22.12 release

 #### Merged Pull Requests
 - CHEF-4010 make a clean exit for License list command [#6552](https://github.com/inspec/inspec/pull/6552) ([sathish-progress](https://github.com/sathish-progress)) <!-- 6.4.43 -->
@ -122,7 +122,91 @@
 - Trivial README change to trigger new omnibus build [#6203](https://github.com/inspec/inspec/pull/6203) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 5.18.15 -->
 <!-- release_rollup -->

+<!-- latest_stable_release 5.22.12 -->
+## [v5.22.12](https://github.com/inspec/inspec/tree/v5.22.12) (2023-08-09)
+
+#### Merged Pull Requests
+- CHEF-5200 Waived controls are not getting waived (skipped) in case of failure at resource level. [#6588](https://github.com/inspec/inspec/pull/6588) ([Vasu1105](https://github.com/Vasu1105)) <!-- 5.22.12 -->
+- CHEF-4080: Point to latest EULA in GUI installers for InSpec-5 [#6582](https://github.com/inspec/inspec/pull/6582) ([ahasunos](https://github.com/ahasunos)) <!-- 5.22.11 -->
+- CHEF-4115 Added ability to merge reporter configurations from both CLI and config [#6568](https://github.com/inspec/inspec/pull/6568) ([Nik08](https://github.com/Nik08)) <!-- 5.22.10 -->
+- Add inspec-6 branch to Dependabot monitoring [#6569](https://github.com/inspec/inspec/pull/6569) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 5.22.9 -->
+- YAML reporter test fix [#6563](https://github.com/inspec/inspec/pull/6563) ([Nik08](https://github.com/Nik08)) <!-- 5.22.9 -->
+- Bump omnibus-software from `f06bbea` to `4b08f0b` in /omnibus [#6548](https://github.com/inspec/inspec/pull/6548) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 5.22.8 -->
+- Bump berkshelf from 8.0.2 to 8.0.7 in /omnibus [#6530](https://github.com/inspec/inspec/pull/6530) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 5.22.7 -->
+- Bump omnibus from `ae855f3` to `9c0643a` in /omnibus [#6543](https://github.com/inspec/inspec/pull/6543) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 5.22.6 -->
+- Update Dockerfile for M1 support [#6541](https://github.com/inspec/inspec/pull/6541) ([ahasunos](https://github.com/ahasunos)) <!-- 5.22.5 -->
+- Update Docker base image to be ubuntu 22.04 [#6526](https://github.com/inspec/inspec/pull/6526) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 5.22.5 -->
+- Update RSpec to 3.12 [#6523](https://github.com/inspec/inspec/pull/6523) ([pirj](https://github.com/pirj)) <!-- 5.22.5 -->
+- CHEF-1631 Clarify that command timeout default was withdrawn [#6511](https://github.com/inspec/inspec/pull/6511) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 5.22.4 -->
 <!-- latest_stable_release -->
+
+## [v5.22.3](https://github.com/inspec/inspec/tree/v5.22.3) (2023-05-18)
+
+#### Merged Pull Requests
+- CFINSPEC-554: Update CLI Docs rake task to work with current InSpec docs. [#6384](https://github.com/inspec/inspec/pull/6384) ([ahasunos](https://github.com/ahasunos))
+- CFINSPEC-573: Fix for mongodb_session resource prints debug level of information in profile run result. [#6401](https://github.com/inspec/inspec/pull/6401) ([Vasu1105](https://github.com/Vasu1105))
+- Updates Release Process Docs [#6398](https://github.com/inspec/inspec/pull/6398) ([Vasu1105](https://github.com/Vasu1105))
+- CFINSPEC-576 : Fix profile gem dependency loading issue when dependent gem is required inside profile libraries. [#6408](https://github.com/inspec/inspec/pull/6408) ([Vasu1105](https://github.com/Vasu1105))
+- CFINSPEC-580 Dependent profiles fix for any scheme of version used in profiles [#6410](https://github.com/inspec/inspec/pull/6410) ([Nik08](https://github.com/Nik08))
+- Formatting fixes for podman docs [#6386](https://github.com/inspec/inspec/pull/6386) ([IanMadd](https://github.com/IanMadd))
+- Bump omnibus-software from `6a13693` to `225e357` in /omnibus [#6442](https://github.com/inspec/inspec/pull/6442) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump omnibus from `c66e97c` to `cf97613` in /omnibus [#6423](https://github.com/inspec/inspec/pull/6423) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump kitchen-vagrant from 1.12.1 to 1.14.1 in /omnibus [#6427](https://github.com/inspec/inspec/pull/6427) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump test-kitchen from 3.3.2 to 3.5.0 in /omnibus [#6360](https://github.com/inspec/inspec/pull/6360) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump rack from 2.2.4 to 2.2.6.2 in /omnibus [#6388](https://github.com/inspec/inspec/pull/6388) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Revert &quot;adding new private verify, as this will kick off the expeditor bump version&quot; [#6479](https://github.com/inspec/inspec/pull/6479) ([Vasu1105](https://github.com/Vasu1105))
+- CHEF-1458 Multiple values changes in SimpleConfig library [#6489](https://github.com/inspec/inspec/pull/6489) ([Nik08](https://github.com/Nik08))
+- CHEF-105 Adds configuration required for sonarqube integration. [#6480](https://github.com/inspec/inspec/pull/6480) ([Vasu1105](https://github.com/Vasu1105))
+- Add nftables resources [#6499](https://github.com/inspec/inspec/pull/6499) ([jjacque](https://github.com/jjacque))
+- CHEF-2438 Add train-kubernetes to inspec gemspec [#6512](https://github.com/inspec/inspec/pull/6512) ([clintoncwolfe](https://github.com/clintoncwolfe))
+- Bump rack from 2.2.6.2 to 2.2.6.4 in /omnibus [#6490](https://github.com/inspec/inspec/pull/6490) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- fix: ensure Invoke-WebRequest headers can be configured [#6484](https://github.com/inspec/inspec/pull/6484) ([amlodzianowski](https://github.com/amlodzianowski))
+- For #6493 : Add postgres_session support for custom port with a socket connection [#6494](https://github.com/inspec/inspec/pull/6494) ([Taknok](https://github.com/Taknok))
+
+## [v5.21.29](https://github.com/inspec/inspec/tree/v5.21.29) (2023-01-24)
+
+#### Merged Pull Requests
+- Trivial README change to trigger new omnibus build [#6203](https://github.com/inspec/inspec/pull/6203) ([clintoncwolfe](https://github.com/clintoncwolfe))
+- Docs spellcheck [#6214](https://github.com/inspec/inspec/pull/6214) ([IanMadd](https://github.com/IanMadd))
+- CFINSPEC-400 Fix for verify pipeline failure [#6218](https://github.com/inspec/inspec/pull/6218) ([Vasu1105](https://github.com/Vasu1105))
+- CFINSPEC-237 Added enhanced_outcomes option [#6145](https://github.com/inspec/inspec/pull/6145) ([Nik08](https://github.com/Nik08))
+- Adds podman resources. [#6183](https://github.com/inspec/inspec/pull/6183) ([Vasu1105](https://github.com/Vasu1105))
+- Fix the dependabot adding  ffi (1.15.5-x64-unknown) to omnibus bump [#6213](https://github.com/inspec/inspec/pull/6213) ([Vasu1105](https://github.com/Vasu1105))
+- Sync up the default branch as main [#6239](https://github.com/inspec/inspec/pull/6239) ([tnir](https://github.com/tnir))
+- Enhance `lxc` resource to test properties [#6243](https://github.com/inspec/inspec/pull/6243) ([ahasunos](https://github.com/ahasunos))
+- CFINSPEC-462: Fixes inspec sign breaks when there is period n the profile name [#6261](https://github.com/inspec/inspec/pull/6261) ([Vasu1105](https://github.com/Vasu1105))
+- CFINSPEC-374 DSL keyword `only_applicable_if` added [#6229](https://github.com/inspec/inspec/pull/6229) ([Nik08](https://github.com/Nik08))
+- CFINSPEC-458 Oracle DB session resource compatibility with AIX-C shell [#6257](https://github.com/inspec/inspec/pull/6257) ([Nik08](https://github.com/Nik08))
+- Replace faraday_middleware with faraday-follow_redirects [#6238](https://github.com/inspec/inspec/pull/6238) ([tnir](https://github.com/tnir))
+- Faraday gem update [#6267](https://github.com/inspec/inspec/pull/6267) ([Vasu1105](https://github.com/Vasu1105))
+- Bump test-kitchen from 3.3.1 to 3.3.2 in /omnibus [#6227](https://github.com/inspec/inspec/pull/6227) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump omnibus-software from `1d540dc` to `7d0e0fe` in /omnibus [#6274](https://github.com/inspec/inspec/pull/6274) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Fix for omnibus build failure on Windows [#6289](https://github.com/inspec/inspec/pull/6289) ([Vasu1105](https://github.com/Vasu1105))
+- RESOURCE-527 Add an inspec init template for alicloud [#6304](https://github.com/inspec/inspec/pull/6304) ([soumyo13](https://github.com/soumyo13))
+- Fix Ruby 2.7 Bundle Installs on CI Verify Pipeline [#6324](https://github.com/inspec/inspec/pull/6324) ([clintoncwolfe](https://github.com/clintoncwolfe))
+- CFINSPEC-493 update signing_identity [#6298](https://github.com/inspec/inspec/pull/6298) ([sathish-progress](https://github.com/sathish-progress))
+- Cfinspec 488 fix nokigiri omnibus [#6305](https://github.com/inspec/inspec/pull/6305) ([sathish-progress](https://github.com/sathish-progress))
+- Remove Windows Ruby 3.0 testing [#6330](https://github.com/inspec/inspec/pull/6330) ([clintoncwolfe](https://github.com/clintoncwolfe))
+- Prevent negative status from crashing launchctl service resource [#6262](https://github.com/inspec/inspec/pull/6262) ([dtheyer](https://github.com/dtheyer))
+- Update chefstyle from 2.0.x to 2.2.2 to use RuboCop 1.25.1 [#6240](https://github.com/inspec/inspec/pull/6240) ([tnir](https://github.com/tnir))
+- Update readme for usage via Docker (CFINSPEC-516) [#6329](https://github.com/inspec/inspec/pull/6329) ([ahasunos](https://github.com/ahasunos))
+- CFINSPEC-393 - Fix train-kubernetes plugin load issue [#6334](https://github.com/inspec/inspec/pull/6334) ([Vasu1105](https://github.com/Vasu1105))
+- CFINSPEC-517: Fix for habitat buld failure  [#6340](https://github.com/inspec/inspec/pull/6340) ([Vasu1105](https://github.com/Vasu1105))
+- CFINSPEC-528 Upgraded mock Ubuntu fixture to latest LTS version. [#6351](https://github.com/inspec/inspec/pull/6351) ([Nik08](https://github.com/Nik08))
+- Fixing typo in user_permissions [#6344](https://github.com/inspec/inspec/pull/6344) ([magicmicah](https://github.com/magicmicah))
+- Fix env smoke test by updating ERB.new in `inspec env`; add additional test [#6342](https://github.com/inspec/inspec/pull/6342) ([clintoncwolfe](https://github.com/clintoncwolfe))
+- CFINSPEC-533: Fix undefined method &#39;summary&#39; for Gem::SourceFetchProblem (NoMethodError) when airgapped  [#6337](https://github.com/inspec/inspec/pull/6337) ([Vasu1105](https://github.com/Vasu1105))
+- Use Ruby 3.1.2 in Omnibus build [#6341](https://github.com/inspec/inspec/pull/6341) ([clintoncwolfe](https://github.com/clintoncwolfe))
+- Revert &quot;CFINSPEC-240 Extended file format support for waivers&quot; [#6366](https://github.com/inspec/inspec/pull/6366) ([Nik08](https://github.com/Nik08))
+- Revert the nokogiri dependency from omnibus project configuration [#6372](https://github.com/inspec/inspec/pull/6372) ([Vasu1105](https://github.com/Vasu1105))
+- CFINSPEC-553: Fix failing verify pipeline builds on ruby 3.0 [#6378](https://github.com/inspec/inspec/pull/6378) ([Vasu1105](https://github.com/Vasu1105))
+- Ruby 3.1 support: Adds ucrt platform to resolve windows omnibus build. [#6381](https://github.com/inspec/inspec/pull/6381) ([Vasu1105](https://github.com/Vasu1105))
+- CFINSPEC-240 Extended file format support for waivers: JSON &amp; CSV [#6369](https://github.com/inspec/inspec/pull/6369) ([Nik08](https://github.com/Nik08))
+- CFINSPEC-542 Bug fix for profiles with dependent profiles [#6377](https://github.com/inspec/inspec/pull/6377) ([Nik08](https://github.com/Nik08))
+- Bump version of omnibus-software [#6385](https://github.com/inspec/inspec/pull/6385) ([Vasu1105](https://github.com/Vasu1105))
+- adding new private verify, as this will kick off the expeditor bump v… [#6397](https://github.com/inspec/inspec/pull/6397) ([sean-simmons-progress](https://github.com/sean-simmons-progress))
+- Update copyright year in README, attempt 2 [#6395](https://github.com/inspec/inspec/pull/6395) ([clintoncwolfe](https://github.com/clintoncwolfe))
+
 ## [v5.18.14](https://github.com/inspec/inspec/tree/v5.18.14) (2022-07-13)

 #### Merged Pull Requests
@ -155,7 +239,6 @@
 - Bump omnibus-software from `a9b13a0` to `7bb8c7b` in /omnibus [#6191](https://github.com/inspec/inspec/pull/6191) ([dependabot[bot]](https://github.com/dependabot[bot]))
 - Trial - Update the omnibus/Gemfile.lock (can be the reason for omnibus build failure) [#6195](https://github.com/inspec/inspec/pull/6195) ([Vasu1105](https://github.com/Vasu1105))
 - CFINSPEC-239 Attestations Design Doc [#6188](https://github.com/inspec/inspec/pull/6188) ([clintoncwolfe](https://github.com/clintoncwolfe))
-<!-- latest_stable_release -->

 ## [v5.17.4](https://github.com/inspec/inspec/tree/v5.17.4) (2022-05-25)

--- a/2
+++ b/2
@ -1,7 +1,7 @@
 FROM --platform=linux/amd64 ubuntu:22.04
 LABEL maintainer="Chef Software, Inc. <docker@chef.io>"

-ARG VERSION=5.18.14
+ARG VERSION=5.22.3
 ARG CHANNEL=stable

 ENV PATH=/opt/inspec/bin:/opt/inspec/embedded/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
--- a/docs-chef-io/content/inspec/cli.md
+++ b/docs-chef-io/content/inspec/cli.md
@ -903,3 +903,4 @@ This subcommand has the following additional options:
 <dl>
 <dt><code>--format=FORMAT</code></dt>
 </dl>
+
--- a/docs-chef-io/content/inspec/resources/command.md
+++ b/docs-chef-io/content/inspec/resources/command.md
@ -147,7 +147,6 @@ end
 ```

 This example would run the `find` command for up to 300 seconds, then give up and fail the control if it exceeded that time.
-On supported target platforms, the default timeout is 3600 seconds (one hour).

 Aside from setting the value on a per-resource basis, you may also use the `--command-timeout` CLI option to globally set a command timeout. The CLI option takes precedence over any per-resource `timeout:` options.

--- a/docs-chef-io/content/inspec/waivers.md
+++ b/docs-chef-io/content/inspec/waivers.md
@ -11,7 +11,6 @@ gh_repo = "inspec"
    weight = 140
 +++

-
 Waivers allow you to waive controls and to dictate the running and/or reporting of those controls. A waiver file identifies:

 1. which controls are waived
--- a/lib/inspec/rule.rb
+++ b/lib/inspec/rule.rb
@ -63,6 +63,11 @@ module Inspec
          # Rubocop thinks we are raising an exception - we're actually calling RSpec's fail()
          its(location) { fail e.message } # rubocop: disable Style/SignalException
        end
+
+        # instance_eval evaluates the describe block and raise errors if at the resource level any execution is failed
+        # Waived controls expect not to raise any controls and get skipped if run is false so __apply_waivers needs to be called here too
+        # so that waived control are actually gets waived.
+        __apply_waivers
      end
    end

--- a/lib/inspec/waiver_file_reader.rb
+++ b/lib/inspec/waiver_file_reader.rb
@ -41,7 +41,7 @@ module Inspec
        validate_headers(headers)
      elsif file_extension == ".json"
        data = Waivers::JSONFileReader.resolve(file_path)
-        validate_json_yaml(data)
+        validate_json_yaml(data) unless data.nil?
      end
      data
    end
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@ -34,21 +34,21 @@ GEM
    artifactory (3.0.15)
    awesome_print (1.9.2)
    aws-eventstream (1.2.0)
-    aws-partitions (1.783.0)
-    aws-sdk-core (3.176.1)
+    aws-partitions (1.784.0)
+    aws-sdk-core (3.177.0)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.651.0)
      aws-sigv4 (~> 1.5)
      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.68.0)
-      aws-sdk-core (~> 3, >= 3.176.0)
+    aws-sdk-kms (1.70.0)
+      aws-sdk-core (~> 3, >= 3.177.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-s3 (1.116.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
-    aws-sdk-secretsmanager (1.77.0)
-      aws-sdk-core (~> 3, >= 3.174.0)
+    aws-sdk-secretsmanager (1.79.0)
+      aws-sdk-core (~> 3, >= 3.177.0)
      aws-sigv4 (~> 1.1)
    aws-sigv4 (1.6.0)
      aws-eventstream (~> 1, >= 1.0.2)
@ -187,7 +187,7 @@ GEM
    ed25519 (1.3.0)
    erubi (1.12.0)
    erubis (2.7.0)
-    faraday (2.7.7)
+    faraday (2.7.10)
      faraday-net_http (>= 2.0, < 3.1)
      ruby2_keywords (>= 0.0.4)
    faraday-follow_redirects (0.3.0)
--- a/omnibus/config/projects/inspec.rb
+++ b/omnibus/config/projects/inspec.rb
@ -41,7 +41,6 @@ overrides_path = File.expand_path("../../../omnibus_overrides.rb", __dir__)
 instance_eval(File.read(overrides_path), overrides_path)

 dependency "preparation"
-
 dependency "inspec"

 # Remove all .dll.a and .a files needed for static linkage.
--- a/sonar-project.properties
+++ b/sonar-project.properties
@ -1,8 +1,15 @@
+# must be unique in a given SonarQube instance
+sonar.projectKey=inspec_inspec_AYahEXtgJ4YHsO5MtHEr
+
+# path to test coverage report generated by simplecov
 sonar.ruby.coverage.reportPaths=coverage/coverage.json
-sonar.projectKey=inspec_inspec
-sonar.organization=inspec
+
+# exclude test directories from coverage
 sonar.coverage.exclusions=test/*,lib/plugins/*/test/*
+
 sonar.exclusions=**/*.java,**/*.js,vendor/*
+
+# skip C-language processor
 sonar.c.file.suffixes=-
 sonar.cpp.file.suffixes=-
-sonar.objc.file.suffixes=-
+sonar.objc.file.suffixes=-
--- a/test/fixtures/profiles/waivers/only_if/controls/only_if_controls.rb
+++ b/test/fixtures/profiles/waivers/only_if/controls/only_if_controls.rb
@ -7,3 +7,10 @@ control "01_only_if" do
    it { should eq true }
  end
 end
+
+control "02_only_if_when_waiver_is_expired" do
+  only_if("test_message_from_dsl_02_only_if") { false }
+  describe true do
+    it { should eq true }
+  end
+end
--- a/test/fixtures/profiles/waivers/only_if/files/waiver.yaml
+++ b/test/fixtures/profiles/waivers/only_if/files/waiver.yaml
@ -1,3 +1,8 @@
 01_only_if:
  run: false
  justification: test_message_from_waiver
+
+02_only_if_when_waiver_is_expired:
+  expiration_date: 1977-06-01
+  run: false
+  justification: test_message_from_waiver
--- a/test/fixtures/reporters/yaml_output_ruby3plus
+++ b/test/fixtures/reporters/yaml_output_ruby3plus
@ -1,38 +0,0 @@
---
-:platform:
-  :name: fedora
-  :release: '28'
-  :target_id: ''
-:profiles:
- :name: tests from t.rb
-  :sha256: 9260af15d2b7568443df4d9d2556f773f425f92491c97eb1d201c535c7a9f5e0
-  :title: tests from t.rb
-  :supports: []
-  :attributes: []
-  :groups:
-  - :id: t.rb
-    :controls:
-    - "(generated from t.rb:1 0aa70d93be7b0cf41b97a1363bb5e8b8)"
-  :controls:
-  - :id: "(generated from t.rb:1 0aa70d93be7b0cf41b97a1363bb5e8b8)"
-    :title:
-    :desc:
-    :descriptions: []
-    :impact: 0.5
-    :refs: []
-    :tags: {}
-    :code: ''
-    :source_location:
-      :line: 89
-      :ref: "/home/frezbo/git/work/ruby/inspec/lib/inspec/control_eval_context.rb"
-    :waiver_data: {}
-    :results:
-    - :status: passed
-      :code_desc: File /tmp should exist
-      :run_time: 0.001313935
-      :start_time: '2018-05-31T16:22:19+05:30'
-      :resource_params: ''
-      :resource_id: ''
-:statistics:
-  :duration: 0.002678506
-:version: 2.1.83
--- a/test/functional/waivers_test.rb
+++ b/test/functional/waivers_test.rb
@ -72,8 +72,8 @@ describe "waivers" do
    assert_empty act
  end

-  def assert_skip_message(yea, nay)
-    msg = controls_by_id.dig("01_only_if", "results", 0, "skip_message")
+  def assert_skip_message(yea, nay, control_id = "01_only_if")
+    msg = controls_by_id.dig(control_id, "results", 0, "skip_message")
    assert_includes msg, yea
    refute_includes msg, nay
  end
@ -241,10 +241,24 @@ describe "waivers" do
  describe "waivers and only_if" do
    let(:profile_name) { "only_if" }

-    describe "when an only_if is used with no waiver" do
+    describe "when an only_if is used with empty waiver file" do
      let(:waiver_file) { "empty.yaml" }
-      it "skips the control with an only_if message" do
-        assert_skip_message "due to only_if", "waiver"
+
+      it "raise unable to parse empty.yaml file error" do
+        result = run_result
+        assert_includes result.stderr, "unable to parse"
+        if windows?
+          assert_equal 1, result.exit_status
+        else
+          assert_equal 102, result.exit_status
+        end
+      end
+    end
+
+    describe "when an only_if is used with waiver file which has waived control with past expiration date" do
+      let(:waiver_file) { "waiver.yaml" }
+      it "skips the control with a waiver message" do
+        assert_skip_message "test_message_from_dsl_02_only_if", "waiver", "02_only_if_when_waiver_is_expired"
      end
    end

--- a/test/unit/reporters/yaml_test.rb
+++ b/test/unit/reporters/yaml_test.rb
@ -2,25 +2,27 @@ require "helper"
 require "inspec/reporters"

 describe Inspec::Reporters::Yaml do
-  RUBY3_PLUS = Gem.ruby_version >= Gem::Version.new("3.0")
-
  let(:report) do
    data = YAML.load_file("test/fixtures/reporters/run_data.yml")
    Inspec::Reporters::Yaml.new({ run_data: data })
  end

+  # Match yaml reporter data
+  # Strip leading white spaces from empty scalar values for testing
+  # In Ruby, depending on its version, empty values are generated with or without leading spaces
+  # This was affecting the title: and desc: fields
+  def strip_white_spaces_from_empty_values(output)
+    output.gsub(/:\s*\n/, ":\n")
+  end
+
  describe "#render" do
    it "confirm render output" do
-      if ( windows? || darwin? ) && RUBY3_PLUS
-        # On Ruby 3+, empty scalar values are generated without a trailing space
-        # this affects the title: and desc: fields
-        output = File.read("test/fixtures/reporters/yaml_output_ruby3plus")
-      else
-        output = File.read("test/fixtures/reporters/yaml_output")
-      end
-
+      output = File.read("test/fixtures/reporters/yaml_output")
      report.render
-      _(report.rendered_output).must_equal output
+      stripped_rendered_output = strip_white_spaces_from_empty_values(report.rendered_output)
+      stripped_output = strip_white_spaces_from_empty_values(output)
+      # Match successful parsing of YAML reporter data
+      _(stripped_rendered_output).must_equal stripped_output
    end
  end
 end