kitchen-inspec 1.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6ca324c7d81de8fce56511eb61fa01de1aa140679b1bad5d0c8df02f86bb36d
-  data.tar.gz: 2b0ea00f5221a1eeae360ddf01f4294cf4d16e8cc2b39cf4fff759cfdb046bd6
+  metadata.gz: 15ac2589b7e3344cae72f65dbe077de9dd2ae2f3fc57909237d08dfa621a5b1f
+  data.tar.gz: afb0e9233902dc0d008fc5019f829cd94eab297d30b2ad74be65db35ec68bca6
 SHA512:
-  metadata.gz: ed7859aebb13637f361a783dc76ec5a8a11b791f2beaa7e6d11e9b6a2eb5fb0f57e264d9a3b0784f781958bb2b350e3099f3234cdc6b9d8b3443da2459ceaba2
-  data.tar.gz: d9ac8df8f88b5f73868bd5ac1ac427c26b656365fbe66ead77c173f1b4b4f32483fd1599904fb8a42bd7283b2586444056c6f987e450ba0ee8307949d1451498
+  metadata.gz: e9f0b64ce565600a4ca279cad1abfebd06c9b505ae3d8afda29ca91996f55664a354937a4fdaec4f904643abcc137be709f78136afb908a55f4070d547ca00d4
+  data.tar.gz: 2249386355d430820a0e8f5aab4112cb3c6bc117d5a638566e414581aae5ce37fb4abede8bc21e23e5b3acda6e7bd62cfb251b256241647b3f25f993bd5c3b37

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)
+        inspec_config = ::Inspec::Config.new(opts)
 
-        # initialize runner
-        runner = ::Inspec::Runner.new(opts)
+        # handle plugins
+        load_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 = "1.3.2".freeze
+    INSPEC_VERSION = "2.4.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-inspec
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inspec
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.47'
+        version: 2.2.64
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.47'
+        version: 2.2.64
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -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