kitchen-inspec 2.2.1 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5e0bb94f9512364a36a2566f22f1a44c77dfb02e10d63a0e0c2376a9d984413
-  data.tar.gz: ce3e7d981810c794854b2fb3bb8f19c8f414d4e55e428d49567df0c6feddd56b
+  metadata.gz: 5b9dda4257139cd710cede4065826607394f0a24f5a6c30b749059a755d7ede8
+  data.tar.gz: 660665093f602f5edecac6554be0337fda3ebbeb380ef209e1aa37da25285b58
 SHA512:
-  metadata.gz: 005f68ba11e4cc19d341eef0ef3e38ad78e0c2415ebabaeebbdf0d8a6d2834dcb3280bb1c0cda2986bd69bcdb457ebe06b0e8a1bcd3cea224f2913f79a6b2bb2
-  data.tar.gz: 7b7c8d5ef3f4fc8b04713e16f85dac071a9b8458e8daf2c203ad0e8e4e84a64bb0719d52ccb31d29ddca339703dff1f18eed510c4ebc1170bd5a5e3319b40948
+  metadata.gz: 17de911adb466958a95569da4c03ef79892616e5bee128271acc61a903301dabb1c752c9e212b466f05066b2f471f6fe312e6a497ee6f2378be5cb5e49533144
+  data.tar.gz: 498b1f8392a35f3d80d7a310eaf1ce744f14725bab25647b34503cf44e6a3c43c8dc9a76d95d1a3235cee9853fd19f48d418596428b0c0cb71b1090b58b75d2f

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.1".freeze
+    INSPEC_VERSION = "2.4.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-inspec
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.4.3
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2021-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inspec
@@ -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