simp-beaker-helpers 1.18.1 → 1.18.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a6d832bb3c5209324dca4c5e3da93e1ab50027574017f9049d580b1046a1984
-  data.tar.gz: 59f15b22bc608c79506cc75471995157cb14ec31febcf74e135ecc9ec931c1f0
+  metadata.gz: 0db7d012be090122587cb25885faf36c1d8717d3c9f6e86714adb558512ea280
+  data.tar.gz: 7a4e2a70a8fb671f140bc9f44598898eb95c4b7eef3b43f4fd6ea85ed7901bfe
 SHA512:
-  metadata.gz: d36935152c4123658b466037619083d3349b157addcf7d218e21edb94ec192fd7b15154194bccaca91f34787dc1d592e7dcdd0daa2f6bd293dd543693f44a9ef
-  data.tar.gz: ec287fcbfb55380400d322c667999b296542e0c0e40ca5c1a0114d2e8c96726b19472243ac11d87ec7293e8bb6db124ba965d3d9586566cbcacc824927526716
+  metadata.gz: 9262da4359d9ca19e65349c3ba6f44f55323167aea9343ae93f8222e70145d6264d90403de65b3874bbe1ebd59e11f826bc9f65c3f2fdaa4e15ccb492a2c42eb
+  data.tar.gz: cf24bab582eb4c373b46d6c7e597e5e690d1a163c49b85d816ef4926ea78959959acaa81c215a5ee6f1678a01271a3dac3ca66d77de1e51707775d93ec9de093

data/CHANGELOG.md

@@ -1,5 +1,27 @@
+### 1.18.6 / 2020-06-24
+* Fix Vagrant snapshot issues
+
+### 1.18.5 / 2020-06-24
+* Allow Vagrant to connect to EL8+ hosts in FIPS mode
+* Add EL8 support to the SSG scans
+
+### 1.18.4 / 2020-03-31
+* Fix capturing error messages when inspec fails to generate results
+
+### 1.18.3 / 2020-02-24
+* Fix the Windows library loading location.
+  * No longer attempt to load windows libraries by default unless the system is
+    actually Windows
+
+### 1.18.2 / 2020-02-24
+
+* The previous location for loading the Windows libraries would not work in a
+  `:before` block. This moves it into its own module space.
+* Bump to the working version of beaker and beaker-puppet
+
 ### 1.18.1 / 2020-02-12
 * Fix gemspec dependencies
+* Fix the windows library loading location
 
 ### 1.18.0 / 2020-02-06
 * Update Windows support

data/lib/simp/beaker_helpers.rb

@@ -19,23 +19,7 @@ module Simp::BeakerHelpers
   end
 
   def is_windows?(sut)
-    is_windows = fact_on(sut, 'osfamily').casecmp?('windows')
-
-    if is_windows
-      begin
-        require 'beaker-windows'
-      rescue LoadError
-        logger.error(%{You must include 'beaker-windows' in your Gemfile for windows support on #{host}})
-        exit 1
-      end
-
-      include BeakerWindows::Path
-      include BeakerWindows::Powershell
-      include BeakerWindows::Registry
-      include BeakerWindows::WindowsFeature
-    end
-
-    return is_windows
+    sut[:platform] =~ /windows/i
   end
 
   # We can't cache this because it may change during a run
@@ -296,7 +280,7 @@ module Simp::BeakerHelpers
     parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
 
     block_on(suts, :run_in_parallel => parallel) do |sut|
-      if sut[:platform] =~ /windows/
+      if is_windows?(sut)
         puts "  -- SKIPPING #{sut} because it is windows"
         next
       end
@@ -343,6 +327,16 @@ module Simp::BeakerHelpers
 
       # Enable FIPS and then reboot to finish.
       on(sut, %(puppet apply --verbose #{fips_enable_modulepath} -e "class { 'fips': enabled => true }"))
+
+      # Work around Vagrant and cipher restrictions in EL8+
+      #
+      # Hopefully, Vagrant will update the used ciphers at some point but who
+      # knows when that will be
+      opensshserver_config = '/etc/crypto-policies/back-ends/opensshserver.config'
+      if file_exists_on(host, opensshserver_config)
+        on(host, "sed --follow-symlinks -i 's/PubkeyAcceptedKeyTypes=/PubkeyAcceptedKeyTypes=ssh-rsa,/' #{opensshserver_config}")
+      end
+
       sut.reboot
     end
   end
@@ -622,7 +616,10 @@ module Simp::BeakerHelpers
   def fix_errata_on( suts = hosts )
     parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
     block_on(suts, :run_in_parallel => parallel) do |sut|
-      if sut[:platform] =~ /windows/
+      if is_windows?(sut)
+        # Load the Windows requirements
+        require 'simp/beaker_helpers/windows'
+
         # Install the necessary windows certificate for testing
         #
         # https://petersouter.xyz/testing-windows-with-beaker-without-cygwin/

data/lib/simp/beaker_helpers/inspec.rb

@@ -116,7 +116,7 @@ module Simp::BeakerHelpers
         FileUtils.remove_entry_secure tmpdir
       end
 
-      unless @results
+      if @results.nil? || @results.empty?
         File.open(@result_file + '.err', 'w') do |fh|
           fh.puts(result.stderr.strip)
         end

data/lib/simp/beaker_helpers/snapshot.rb

@@ -1,5 +1,5 @@
 module Simp::BeakerHelpers
-  # Helpers for working with the SCAP Security Guide
+  # Helpers for managing Vagrant snapshots
   class Snapshot
     # The name of the base snapshot that is created if no snapshots currently exist
     BASE_NAME = '_simp_beaker_base'
@@ -18,9 +18,7 @@ module Simp::BeakerHelpers
 
         if vdir
           Dir.chdir(vdir) do
-            unless exist?(host, BASE_NAME)
-              save(host, BASE_NAME)
-            end
+            save(host, BASE_NAME) unless exist?(host, BASE_NAME)
 
             snap = "#{host.name}_#{snapshot_name}"
 
@@ -67,7 +65,7 @@ module Simp::BeakerHelpers
         Dir.chdir(vdir) do
           output = %x(vagrant snapshot list #{host.name}).lines
           output.map! do |x|
-            x.split(/^#{host.name}_/).last.strip
+            x.split(/^#{host.name}_/).last.split(':').first.delete('==>').strip
           end
         end
       end

data/lib/simp/beaker_helpers/ssg.rb

@@ -29,6 +29,17 @@ module Simp::BeakerHelpers
       'python-jinja2'
     ]
 
+    EL8_PACKAGES = [
+      'python3',
+      'python3-pyyaml',
+      'cmake',
+      'git',
+      'openscap-python3',
+      'openscap-utils',
+      'python3-lxml',
+      'python3-jinja2'
+    ]
+
     OS_INFO = {
       'RedHat' => {
         '6' => {
@@ -46,6 +57,14 @@ module Simp::BeakerHelpers
             'build_target'   => 'rhel7',
             'datastream'     => 'ssg-rhel7-ds.xml'
           }
+        },
+        '8' => {
+          'required_packages' => EL8_PACKAGES,
+          'ssg' => {
+            'profile_target' => 'rhel8',
+            'build_target'   => 'rhel8',
+            'datastream'     => 'ssg-rhel8-ds.xml'
+          }
         }
       },
       'CentOS' => {
@@ -64,6 +83,14 @@ module Simp::BeakerHelpers
             'build_target'   => 'centos7',
             'datastream'     => 'ssg-centos7-ds.xml'
           }
+        },
+        '8' => {
+          'required_packages' => EL8_PACKAGES,
+          'ssg' => {
+            'profile_target' => 'rhel8',
+            'build_target'   => 'centos8',
+            'datastream'     => 'ssg-centos8-ds.xml'
+          }
         }
       },
       'OracleLinux' => {
@@ -73,8 +100,16 @@ module Simp::BeakerHelpers
             'profile_target' => 'ol7',
             'build_target'   => 'ol7',
             'datastream'     => 'ssg-ol7-ds.xml'
+          },
+        '8' => {
+          'required_packages' => EL8_PACKAGES,
+          'ssg' => {
+            'profile_target' => 'ol8',
+            'build_target'   => 'ol8',
+            'datastream'     => 'ssg-ol8-ds.xml'
           }
         }
+        }
       }
     }
 

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.18.1'
+  VERSION = '1.18.6'
 end

data/lib/simp/beaker_helpers/windows.rb

@@ -0,0 +1,16 @@
+module Simp; end
+module Simp::BeakerHelpers; end
+
+module Simp::BeakerHelpers::Windows
+  begin
+    require 'beaker-windows'
+  rescue LoadError
+    logger.error(%{You must include 'beaker-windows' in your Gemfile for windows support})
+    exit 1
+  end
+
+  include BeakerWindows::Path
+  include BeakerWindows::Powershell
+  include BeakerWindows::Registry
+  include BeakerWindows::WindowsFeature
+end

data/simp-beaker-helpers.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |s|
   s.metadata = {
                  'issue_tracker' => 'https://simp-project.atlassian.net'
                }
-  s.add_runtime_dependency 'beaker'                      , ['>= 4.16.0', '< 5.0.0']
+  s.add_runtime_dependency 'beaker'                      , ['>= 4.17.0', '< 5.0.0']
   s.add_runtime_dependency 'beaker-rspec'                , '~> 6.2'
-  s.add_runtime_dependency 'beaker-puppet'               , ['>= 1.18.12', '< 2.0.0']
+  s.add_runtime_dependency 'beaker-puppet'               , ['>= 1.18.14', '< 2.0.0']
   s.add_runtime_dependency 'beaker-docker'               , '~> 0.3'
   s.add_runtime_dependency 'beaker-vagrant'              , ['>= 0.6.4', '< 2.0.0']
   s.add_runtime_dependency 'beaker-puppet_install_helper', '~> 0.9'

data/spec/acceptance/suites/default/nodesets

@@ -1 +1 @@
-spec/acceptance/suites/default/../../nodesets
+../../nodesets

data/spec/acceptance/suites/fips_from_fixtures/nodesets

@@ -1 +1 @@
-spec/acceptance/suites/fips_from_fixtures/../../nodesets
+../../nodesets

data/spec/acceptance/suites/snapshot/00_snapshot_test_spec.rb

@@ -57,7 +57,7 @@ hosts.each do |host|
       end
 
       it 'can list the snapshots' do
-        expect(Simp::BeakerHelpers::Snapshot.list(host)).to eq ['test', 'test2']
+        expect(Simp::BeakerHelpers::Snapshot.list(host)).to eq ["#{host}", 'test', 'test2']
       end
 
       it 'can query for a specific snapshot' do

data/spec/acceptance/suites/snapshot/nodesets

@@ -1 +1 @@
-spec/acceptance/suites/snapshot/../../nodesets
+../../nodesets

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.18.1
+  version: 1.18.6
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -17,7 +17,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.16.0
+        version: 4.17.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.16.0
+        version: 4.17.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.12
+        version: 1.18.14
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -61,7 +61,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.12
+        version: 1.18.14
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -183,6 +183,7 @@ files:
 - lib/simp/beaker_helpers/snapshot.rb
 - lib/simp/beaker_helpers/ssg.rb
 - lib/simp/beaker_helpers/version.rb
+- lib/simp/beaker_helpers/windows.rb
 - lib/simp/rake/beaker.rb
 - simp-beaker-helpers.gemspec
 - spec/acceptance/nodesets/default.yml
@@ -234,9 +235,37 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: beaker helper methods for SIMP
-test_files: []
+test_files:
+- spec/acceptance/nodesets/default.yml
+- spec/acceptance/suites/default/check_puppet_version_spec.rb
+- spec/acceptance/suites/default/enable_fips_spec.rb
+- spec/acceptance/suites/default/fixture_modules_spec.rb
+- spec/acceptance/suites/default/install_simp_deps_repo_spec.rb
+- spec/acceptance/suites/default/nodesets
+- spec/acceptance/suites/default/pki_tests_spec.rb
+- spec/acceptance/suites/default/set_hieradata_on_spec.rb
+- spec/acceptance/suites/default/write_hieradata_to_spec.rb
+- spec/acceptance/suites/fips_from_fixtures/00_default_spec.rb
+- spec/acceptance/suites/fips_from_fixtures/metadata.yml
+- spec/acceptance/suites/fips_from_fixtures/nodesets
+- spec/acceptance/suites/offline/00_default_spec.rb
+- spec/acceptance/suites/offline/README
+- spec/acceptance/suites/offline/nodesets/default.yml
+- spec/acceptance/suites/puppet_collections/00_default_spec.rb
+- spec/acceptance/suites/puppet_collections/metadata.yml
+- spec/acceptance/suites/puppet_collections/nodesets/default.yml
+- spec/acceptance/suites/snapshot/00_snapshot_test_spec.rb
+- spec/acceptance/suites/snapshot/10_general_usage_spec.rb
+- spec/acceptance/suites/snapshot/nodesets
+- spec/acceptance/suites/windows/00_default_spec.rb
+- spec/acceptance/suites/windows/metadata.yml
+- spec/acceptance/suites/windows/nodesets/default.yml
+- spec/acceptance/suites/windows/nodesets/win2016.yml
+- spec/acceptance/suites/windows/nodesets/win2019.yml
+- spec/lib/simp/beaker_helpers_spec.rb
+- spec/spec_helper.rb
+- spec/spec_helper_acceptance.rb