kitchen-inspec 2.0.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf548caf32e38ac4f651467f17d41b1057122cf6fd486964ba25021957c392f0
-  data.tar.gz: ad173dfa6c01162998533c3630382c90b66ca0bf9fade4e85f234143af6574e0
+  metadata.gz: d5e0bb94f9512364a36a2566f22f1a44c77dfb02e10d63a0e0c2376a9d984413
+  data.tar.gz: ce3e7d981810c794854b2fb3bb8f19c8f414d4e55e428d49567df0c6feddd56b
 SHA512:
-  metadata.gz: 160d7363ad42ef3f6f80796ffef20e72159cfe4ea462b3305b11496508258db0aeb33ecd98abdb441c06f6587d7ea300e81ed664b395ada665b3329d168c237f
-  data.tar.gz: 6bc8274fab1fdd47df48d964d1b4b9aa135ea6ccb5e627cfc423b6899fa288aba7913e779931a5668de230aad4b9f9993b6556b891f4e70d2b8bbfe64c9b8388
+  metadata.gz: 005f68ba11e4cc19d341eef0ef3e38ad78e0c2415ebabaeebbdf0d8a6d2834dcb3280bb1c0cda2986bd69bcdb457ebe06b0e8a1bcd3cea224f2913f79a6b2bb2
+  data.tar.gz: 7b7c8d5ef3f4fc8b04713e16f85dac071a9b8458e8daf2c203ad0e8e4e84a64bb0719d52ccb31d29ddca339703dff1f18eed510c4ebc1170bd5a5e3319b40948

data/lib/kitchen/verifier/inspec.rb

@@ -37,8 +37,13 @@ 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
 
       # A lifecycle method that should be invoked when the object is about
       # ready to be used. A reference to an Instance is required as
@@ -80,16 +85,20 @@ module Kitchen
         ::Inspec::Log.init(STDERR)
         ::Inspec::Log.level = Kitchen::Util.from_logger_level(logger.level)
 
-        # initialize runner
-        runner = ::Inspec::Runner.new(opts)
-
         # load plugins
         if config[:load_plugins]
           v2_loader = ::Inspec::Plugin::V2::Loader.new
           v2_loader.load_all
           v2_loader.exit_on_load_error
+
+          if ::Inspec::InputRegistry.instance.respond_to?(:cache_inputs=) && config[:cache_inputs]
+            ::Inspec::InputRegistry.instance.cache_inputs = !!config[:cache_inputs]
+          end
         end
 
+        # initialize runner
+        runner = ::Inspec::Runner.new(opts)
+
         # add each profile to runner
         tests = collect_tests
         profile_ctx = nil
@@ -158,7 +167,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 +300,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 +313,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 +343,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.2.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.2.1
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2020-09-15 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'