kitchen-inspec 1.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd8f48692455036fcb4a096239db49ea77cc35a40dde906080951d4df283775d
-  data.tar.gz: 3876f0417b27d9c7a34e44a9127937b404af9249b25b530d0ff94a0abf85ee4e
+  metadata.gz: 20386a2940c8e28bf2b427d307b2da9bf6f369c322caa16f18da73188c423a6e
+  data.tar.gz: 07b179d4ba4f967ab4924a43a36f709362522db8aad584faa05fc9f493a06c79
 SHA512:
-  metadata.gz: a8d485c2c565ad7c5867e11f8b749cc924d2319d0e9f44e767d8a230805c1b9064fa6ac3a9c245218927f03f5115a361c0bfa70649725374056be33f558befa2
-  data.tar.gz: 1b3c751144281043f25495e2c38d43a31d189eafecfb84a6b0ea1f7ffc9abc3b70c54ca9d90af6cb5d900157daa25ee4e62057340d7960ae21b82f978a921e57
+  metadata.gz: f395456c7fb73de0c9f7cc26963c5047ead2fdb971bd5f0ca09151320dafe58993a4530c577df1eb35e101a59a42f09e1d0bcbfa70e14393f71ea1d0cd946d79
+  data.tar.gz: 53af867be8b8bfcf91d04e52780e0fbfe405a2d593809c982385a8cf54ee805b6dbe985a69a263ed8567fc723032cf04fb0e505b27d7a8608cef746ae03716ec

data/lib/kitchen/verifier/inspec.rb

@@ -24,6 +24,9 @@ require "kitchen/verifier/base"
 
 require "uri"
 require "pathname"
+require "hashie"
+
+require "inspec/plugin/v2"
 
 module Kitchen
   module Verifier
@@ -34,7 +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, 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,6 +85,17 @@ module Kitchen
         ::Inspec::Log.init(STDERR)
         ::Inspec::Log.level = Kitchen::Util.from_logger_level(logger.level)
 
+        # 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)
 
@@ -147,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
       #
@@ -184,7 +204,7 @@ module Kitchen
             # leave it alone so it can default to resolving to the Supermarket.
             unless test_item.keys == [:name]
               type_keys = [:path, :url, :git, :compliance, :supermarket]
-              git_keys = [:branch, :tag, :ref]
+              git_keys = [:branch, :tag, :ref, :relative_path]
               supermarket_keys = [:supermarket_url]
               test_item.delete_if { |k, v| !(type_keys + git_keys + supermarket_keys).include?(k) }
             end
@@ -280,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",
@@ -293,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`.
@@ -324,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 = "1.2.0".freeze
+    INSPEC_VERSION = "2.2.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-inspec
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2020-12-11 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 description: A Test Kitchen Verifier for InSpec
 email:
 - info@chef.io