kitchen-inspec 2.0.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf548caf32e38ac4f651467f17d41b1057122cf6fd486964ba25021957c392f0
-  data.tar.gz: ad173dfa6c01162998533c3630382c90b66ca0bf9fade4e85f234143af6574e0
+  metadata.gz: 70b9d58f03c7423e22abdc9aca993b2c7cb018a7ae31b7bca567ea95df03eddc
+  data.tar.gz: 8eda963ba46ed0861aca99a709ffd8d156c4aad2ff850a05ea1c5ac674dc6af0
 SHA512:
-  metadata.gz: 160d7363ad42ef3f6f80796ffef20e72159cfe4ea462b3305b11496508258db0aeb33ecd98abdb441c06f6587d7ea300e81ed664b395ada665b3329d168c237f
-  data.tar.gz: 6bc8274fab1fdd47df48d964d1b4b9aa135ea6ccb5e627cfc423b6899fa288aba7913e779931a5668de230aad4b9f9993b6556b891f4e70d2b8bbfe64c9b8388
+  metadata.gz: b814b4e844792e3b3b2180106246d52955fdf0d0ac97f3765708bee3ae83e34e0abea6c07be4919b44d29fc8c242e8e01c35ee15719604b933622153f6eac0dd
+  data.tar.gz: 4c48353297d378f7a376d416af1eca0d96c286349fe761536cd703d82a975fd3aef16e434c8d65299f3abdaeb8155ade43a37711c9dd2a2dde036d68c5db5d30

data/lib/kitchen/verifier/inspec.rb

@@ -37,8 +37,15 @@ module Kitchen
       kitchen_verifier_api_version 1
       plugin_version Kitchen::Verifier::INSPEC_VERSION
 
+      # Chef InSpec is based on RSpec, which is not thread safe
+      # (https://github.com/rspec/rspec-core/issues/1254)
+      # Tell test kitchen not to multithread the verify step
+      no_parallel_for :verify
+
       default_config :inspec_tests, []
-      default_config :load_plugins, false
+      default_config :load_plugins, true
+      default_config :plugin_config, {}
+      default_config :backend_cache, true
 
       # A lifecycle method that should be invoked when the object is about
       # ready to be used. A reference to an Instance is required as
@@ -76,25 +83,23 @@ module Kitchen
         # add inputs
         setup_inputs(opts, config)
 
-        # setup logger
+        # setup Inspec
         ::Inspec::Log.init(STDERR)
         ::Inspec::Log.level = Kitchen::Util.from_logger_level(logger.level)
+        load_plugins # Must load plugins prior to config validation
+        inspec_config = ::Inspec::Config.new(opts)
 
-        # initialize runner
-        runner = ::Inspec::Runner.new(opts)
+        # handle plugins
+        setup_plugin_config(inspec_config)
 
-        # load plugins
-        if config[:load_plugins]
-          v2_loader = ::Inspec::Plugin::V2::Loader.new
-          v2_loader.load_all
-          v2_loader.exit_on_load_error
-        end
+        # initialize runner
+        runner = ::Inspec::Runner.new(inspec_config)
 
         # add each profile to runner
         tests = collect_tests
         profile_ctx = nil
         tests.each do |target|
-          profile_ctx = runner.add_target(target, opts)
+          profile_ctx = runner.add_target(target)
         end
 
         profile_ctx ||= []
@@ -136,6 +141,32 @@ module Kitchen
         end
       end
 
+      def load_plugins
+        return unless config[:load_plugins]
+
+        v2_loader = ::Inspec::Plugin::V2::Loader.new
+        v2_loader.load_all
+        v2_loader.exit_on_load_error
+
+        # Suppress input caching or all suites will get identical inputs, not different ones
+        if ::Inspec::InputRegistry.instance.respond_to?(:cache_inputs=) && config[:cache_inputs]
+          ::Inspec::InputRegistry.instance.cache_inputs = !!config[:cache_inputs]
+        end
+      end
+
+      def setup_plugin_config(inspec_config)
+        return unless config[:load_plugins]
+
+        unless inspec_config.respond_to?(:merge_plugin_config)
+          logger.warn("kitchen-inspec: skipping `plugin_config` which requires InSpec version 4.26.2 or higher. Your version: #{::Inspec::VERSION}")
+          return
+        end
+
+        config[:plugin_config].each do |plugin_name, plugin_config|
+          inspec_config.merge_plugin_config(plugin_name, plugin_config)
+        end
+      end
+
       # (see Base#load_needed_dependencies!)
       def load_needed_dependencies!
         require "inspec"
@@ -158,7 +189,7 @@ module Kitchen
       #
       # we support the base directories
       # - test/integration
-      # - test/integration/inspec (prefered if used with other test environments)
+      # - test/integration/inspec (preferred if used with other test environments)
       #
       # we do not filter for specific directories, this is core of inspec
       #
@@ -291,7 +322,7 @@ module Kitchen
       # @api private
       def runner_options_for_winrm(config_data)
         kitchen = instance.transport.send(:connection_options, config_data).dup
-        opts = {
+        {
           "backend" => "winrm",
           "logger" => logger,
           "ssl" => URI(kitchen[:endpoint]).scheme == "https",
@@ -304,7 +335,6 @@ module Kitchen
           "connection_retry_sleep" => kitchen[:connection_retry_sleep],
           "max_wait_until_ready" => kitchen[:max_wait_until_ready],
         }
-        opts
       end
 
       # Returns a configuration Hash that can be passed to a `Inspec::Runner`.
@@ -335,11 +365,10 @@ module Kitchen
       # @return [Hash] a configuration hash of string-based keys
       # @api private
       def runner_options_for_exec(config_data)
-        opts = {
+        {
           "backend" => "local",
           "logger" => logger,
         }
-        opts
       end
 
       # Returns a configuration Hash that can be passed to a `Inspec::Runner`.

data/lib/kitchen/verifier/inspec_version.rb

@@ -20,6 +20,6 @@
 module Kitchen
   module Verifier
     # Version string for InSpec Kitchen verifier
-    INSPEC_VERSION = "2.0.0".freeze
+    INSPEC_VERSION = "2.4.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-inspec
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inspec
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.7'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.7'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -54,16 +54,22 @@ dependencies:
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: A Test Kitchen Verifier for InSpec
 email:
 - info@chef.io
@@ -93,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Verifier for InSpec