kitchen-inspec 2.2.2 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20386a2940c8e28bf2b427d307b2da9bf6f369c322caa16f18da73188c423a6e
-  data.tar.gz: 07b179d4ba4f967ab4924a43a36f709362522db8aad584faa05fc9f493a06c79
+  metadata.gz: 8200c1bc26b6c3d93ad382da18a082f7a86845f7873edd5db635deead48a9416
+  data.tar.gz: 44a1cdb359735deb16b25a91854e2df9cfd150ebf6f9defbba92784ce8fbf0d5
 SHA512:
-  metadata.gz: f395456c7fb73de0c9f7cc26963c5047ead2fdb971bd5f0ca09151320dafe58993a4530c577df1eb35e101a59a42f09e1d0bcbfa70e14393f71ea1d0cd946d79
-  data.tar.gz: 53af867be8b8bfcf91d04e52780e0fbfe405a2d593809c982385a8cf54ee805b6dbe985a69a263ed8567fc723032cf04fb0e505b27d7a8608cef746ae03716ec
+  metadata.gz: 1f9ce8fb50712c0289704ac649cf47dfdca1cac6649068e0bcfd559150f7c953129f9a56cb3d98cbd9d7418045addc1e56346cf851054d9c428173ecb7177ac7
+  data.tar.gz: 5dedf835404390aed3d7880adc4a4cbf0b5f452ceb59485f1af32df7a9966ca78d4948747e1b71b91ee2b7bc3525245fcd28fc9ecce38c8e3f173fadebe023c5

data/lib/kitchen/verifier/inspec.rb

@@ -44,6 +44,8 @@ module Kitchen
 
       default_config :inspec_tests, []
       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
@@ -81,29 +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)
 
-        # 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
+        # handle plugins
+        setup_plugin_config(inspec_config)
 
         # initialize runner
-        runner = ::Inspec::Runner.new(opts)
+        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 ||= []
@@ -145,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"
@@ -291,6 +313,7 @@ module Kitchen
         opts["bastion_port"] = kitchen[:ssh_gateway_port] if kitchen[:ssh_gateway_port]
         opts["key_files"] = kitchen[:keys] unless kitchen[:keys].nil?
         opts["password"] = kitchen[:password] unless kitchen[:password].nil?
+        opts["forward_agent"] = config[:forward_agent] || kitchen[:forward_agent] if config[:forward_agent] || kitchen[:forward_agent]
         opts
       end
 

data/lib/kitchen/verifier/inspec_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-inspec
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.5.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-11 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inspec
@@ -39,7 +39,7 @@ dependencies:
         version: '2.7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '2.7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -57,9 +57,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -67,9 +67,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.0'
 description: A Test Kitchen Verifier for InSpec
 email:
 - info@chef.io
@@ -99,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