simp-beaker-helpers 1.15.1 → 1.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94c82000c46c2d7aea58c330826814c2836ce2cf275c115e4423372b7b5365b0
-  data.tar.gz: e99f777227c80738917ae29133b3937a838b7299d26e111032061cc3e4dda9f3
+  metadata.gz: 30ef05fd3ec301d3aa104b886c6e3ed8946dc6cecd0cabf3177191425eca6e1e
+  data.tar.gz: 717e4661e75865f9be5d623b7609aec88a1791fa4ab5bf772d63773b77da30ab
 SHA512:
-  metadata.gz: a90a968d0050489f711ada9be6aa1db3dd3a25c65b2825107c511ace7c4a66d7d30326ee7163d225555a92dcdf21fb3e4e41985a0b926b27dec5e278a30f1c31
-  data.tar.gz: 0b44843331c79bd05305e5bf59ae0a600ae1e999c163c35a544c22118fba0631e9b933d77234e1e40761d7f67fa573787330d6e230728ff00febdcef11b9548d
+  metadata.gz: f971e19851625ec8d4c4db64b7458a50b144ffc103e20b0649b6b4e3c3497a46076b42abf5253bb2d82d5d41c43b82acbe84699e234c489605a7cbd2f6299444
+  data.tar.gz: 8e33acde2f3be6e75b52e5884eb48afce050a5d585bb34d73a1b6d782cbf2212e169a5d54c810fce36876e8d5259b49488d53829190c30af6f5e3ae44186afad

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 1.15.2 / 2019-09-13
+* Fix an issue where the inspec reports were not processed properly
+
 ### 1.15.1 / 2019-08-26
 * Ensure that any user on the SUT can use the RedHat entitlements
 

data/README.md

@@ -44,6 +44,7 @@ Methods to assist beaker acceptance tests for SIMP.
     * [PUPPET_VERSION](#puppet_version)
     * [BEAKER_RHSM_USER](#beaker_rhsm_user)
     * [BEAKER_RHSM_PASS](#beaker_rhsm_pass)
+    * [BEAKER_inspec_version](#beaker_inspec_version)
 * [Examples](#examples)
   * [Prep OS, Generate and copy PKI certs to each SUT](#prep-os-generate-and-copy-pki-certs-to-each-sut)
   * [Specify the version of Puppet to run in the SUTs](#specify-the-version-of-puppet-to-run-in-the-suts)
@@ -400,6 +401,13 @@ Will not be output to the screen.
 Note:  When using Subscription Manager, make sure your nodeset has the setting validation: false.   Otherwise Beaker:Rspec
 might try to install packages before subscription manager is configured.
 
+#### BEAKER_inspec_version
+
+The version of InSpec to use when running inspec tests. Currently hard-coded to
+`4.16.14` due to a bug introduced in `4.16.15`.
+
+Let to 'latest' to use the latest available in the upstream repos.
+
 ## Examples
 
 ### Prep OS, Generate and copy PKI certs to each SUT

data/lib/simp/beaker_helpers/inspec.rb

@@ -19,9 +19,17 @@ module Simp::BeakerHelpers
     #   The name of the profile against which to run
     #
     def initialize(sut, profile)
+      @inspec_version = ENV['BEAKER_inspec_version'] || '4.16.14'
+
       @sut = sut
 
-      @sut.install_package('inspec')
+      @sut.install_package('git')
+
+      if @inspec_version == 'latest'
+        @sut.install_package('inspec')
+      else
+        @sut.install_package("inspec-#{@inspec_version}")
+      end
 
       os = fact_on(@sut, 'operatingsystem')
       os_rel = fact_on(@sut, 'operatingsystemmajrelease')
@@ -179,6 +187,9 @@ module Simp::BeakerHelpers
       end
 
       if !profiles || profiles.empty?
+      require 'pry'
+      binding.pry
+
         fail("Error: Could not find 'profiles' in the passed results")
       end
 
@@ -196,31 +207,59 @@ module Simp::BeakerHelpers
 
           next unless title
 
-          stats[:profiles][profile_name][:controls][title] = {}
+          base_title = title.scan(/.{1,60}\W|.{1,60}/).map(&:strip).join("\n           ")
 
-          formatted_title = title.scan(/.{1,72}\W|.{1,72}/).map(&:strip).join("\n           ")
+          if control['results'] && (control['results'].size > 1)
+            control['results'].each do |result|
+              control_title = " => { #{result['code_desc']} }"
 
-          stats[:profiles][profile_name][:controls][title][:formatted_title] = formatted_title
+              full_title = title + control_title
+              formatted_title = base_title + control_title
 
-          if control['results'] && !control['results'].empty?
-            status = control['results'].first['status']
+              stats[:profiles][profile_name][:controls][full_title] = {}
 
-            if status == /^fail/
-              status = :failed
-              color = 'red'
-            else
+              stats[:profiles][profile_name][:controls][full_title][:formatted_title] = formatted_title
+
+              if result['status'] =~ /^fail/
+                status = :failed
+                color = 'red'
+              else
+                status = :passed
+                color = 'green'
+              end
+
+              stats[:global][status] << formatted_title.color
+
+              stats[:profiles][profile_name][:controls][full_title][:status] = status
+              stats[:profiles][profile_name][:controls][full_title][:source] = control['source_location']['ref']
+            end
+          else
+            formatted_title = base_title
+
+            stats[:profiles][profile_name][:controls][title] = {}
+
+            stats[:profiles][profile_name][:controls][title][:formatted_title] = formatted_title
+
+            if control['results'] && !control['results'].empty?
               status = :passed
               color = 'green'
+
+              control['results'].each do |result|
+                if results['status'] =~ /^fail/
+                  status = :failed
+                  color = 'red'
+                end
+              end
+
+            else
+              status = :skipped
             end
-          else
-            status = :skipped
-            color = 'yellow'
-          end
 
-          stats[:global][status] << title.to_s.color
+            stats[:global][status] << formatted_title.color
 
-          stats[:profiles][profile_name][:controls][title][:status] = status
-          stats[:profiles][profile_name][:controls][title][:source] = control['source_location']['ref']
+            stats[:profiles][profile_name][:controls][title][:status] = status
+            stats[:profiles][profile_name][:controls][title][:source] = control['source_location']['ref']
+          end
         end
       end
 

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.15.1'
+  VERSION = '1.15.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.15.1
+  version: 1.15.2
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-27 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker