kitchen-inspec 2.6.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9d70411df860e3a89c696f56ed42605d60ec46e4c7ddf19612021773ae00eb0
-  data.tar.gz: bc5b0fdb35f6aaf1be688a43e35464054beeafea0c82eec80aa1400100e37425
+  metadata.gz: 4bd522a4a21b9c8613c5ee2bb6dd527d34f3f47bef521c696f956a4601bfbfa8
+  data.tar.gz: e0b38cace2dd217e12e78c3c87d3e4e95d38062c28e05b37d55645d88d3a9610
 SHA512:
-  metadata.gz: 527eca8c14d450ea1f81b7de1e7b62e0a4e4e0c0568bebfd5f7be03ba19cc2d71e6770ac013c033e425d3369c79e698b75380ed232e85e0f6f0772125ad3425f
-  data.tar.gz: 8def8f8cf1eb3b271f8668b58b1391c1222cc6816aca48dedd99a8b711d76c34a04c6175f5692ad93306c3b940c4056fdc13a6a1f32d5d4c10cdc0a8908713a5
+  metadata.gz: b5b90bf59c398b2f5eaffcc217a15a2cffd7d7b7085f7b814f9d97bf4f7562489170b79a20b10181d1bc4c948e9f567ed3d243e51c0218644b06bbd990c3fe18
+  data.tar.gz: a3b88ecd3f60a921842c88b0d60610a9ba2b09ae6055ef1835828d6ce0f8371dcc2cff6916072ec50fd3f3511a82452a3fcf320d133181c8cf741afe401b4a18

data/lib/kitchen/verifier/inspec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 #
 # Author:: Fletcher Nichol (<fnichol@chef.io>)
 # Author:: Christoph Hartmann (<chartmann@chef.io>)
@@ -22,8 +21,8 @@ require "kitchen/transport/winrm"
 require "kitchen/verifier/inspec_version"
 require "kitchen/verifier/base"
 
-require "uri"
-require "pathname"
+require "uri" unless defined?(URI)
+require "pathname" unless defined?(Pathname)
 require "hashie"
 
 require "inspec/plugin/v2"
@@ -83,6 +82,8 @@ module Kitchen
         # add inputs and waivers
         setup_inputs(opts, config)
         setup_waivers(opts, config)
+        # Configure Chef License Key and URL through kitchen
+        setup_chef_license_config(opts, config)
 
         # setup Inspec
         ::Inspec::Log.init(STDERR)
@@ -111,11 +112,19 @@ module Kitchen
         exit_code = runner.run
         # 101 is a success as well (exit with no fails but has skipped controls)
         return if exit_code == 0 || exit_code == 101
+
         raise ActionFailed, "InSpec Runner returns #{exit_code}"
       end
 
       private
 
+      def setup_chef_license_config(opts, config)
+        # Pass chef_license_key to inspec if it is set
+        # Pass chef_license_server to inspec if it is set
+        opts[:chef_license_key] = config[:chef_license_key] || ENV["CHEF_LICENSE_KEY"]
+        opts[:chef_license_server] = config[:chef_license_server] || ENV["CHEF_LICENSE_SERVER"]
+      end
+
       def setup_waivers(opts, config)
         # InSpec expects the singular inflection
         opts[:waiver_file] = config[:waiver_files] || []
@@ -176,17 +185,8 @@ module Kitchen
       # (see Base#load_needed_dependencies!)
       def load_needed_dependencies!
         require "inspec"
-        # TODO: this should be easier. I would expect to load a single class here
-        # load supermarket plugin, this is part of the inspec gem
-        require "bundles/inspec-supermarket/api"
-        require "bundles/inspec-supermarket/target"
-
-        # load the compliance plugin
-        require "bundles/inspec-compliance/configuration"
-        require "bundles/inspec-compliance/support"
-        require "bundles/inspec-compliance/http"
-        require "bundles/inspec-compliance/api"
-        require "bundles/inspec-compliance/target"
+        # Plugins (supermarket, compliance, etc.) are loaded automatically
+        # via the Inspec::Plugin::V2::Loader system in the load_plugins method
       end
 
       # Returns an Array of test suite filenames for the related suite currently
@@ -231,8 +231,8 @@ module Kitchen
             # foiled by extra stuff. However, if the only entry is a "name" key, then
             # 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, :relative_path]
+              type_keys = %i{path url git compliance supermarket}
+              git_keys = %i{branch tag ref relative_path}
               supermarket_keys = [:supermarket_url]
               test_item.delete_if { |k, v| !(type_keys + git_keys + supermarket_keys).include?(k) }
             end
@@ -271,7 +271,7 @@ module Kitchen
           raise Kitchen::UserError, "Verifier #{name} does not support the #{transport.name} Transport"
         end.tap do |runner_options|
           # default color to true to match InSpec behavior
-          runner_options["color"] = (config[:color].nil? ? true : config[:color])
+          runner_options["color"] = (config[:color].nil? || config[:color])
           runner_options["format"] = config[:format] unless config[:format].nil?
           runner_options["output"] = config[:output] % { platform: platform, suite: suite } unless config[:output].nil?
           runner_options["profiles_path"] = config[:profiles_path] unless config[:profiles_path].nil?
@@ -363,7 +363,7 @@ module Kitchen
           "connection_retry_sleep" => kitchen[:connection_retry_sleep],
           "max_wait_until_ready" => kitchen[:max_wait_until_ready],
         }
-        logger.debug "Connect to Container: #{opts['host']}"
+        logger.debug "Connect to Container: #{opts["host"]}"
         opts
       end
 
@@ -388,7 +388,7 @@ module Kitchen
           "logger" => logger,
           "host" => config_data[:container_id],
         }
-        logger.debug "Connect to Container: #{opts['host']}"
+        logger.debug "Connect to Container: #{opts["host"]}"
         opts
       end
     end

data/lib/kitchen/verifier/inspec_version.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 #
 # Author:: Fletcher Nichol (<fnichol@chef.io>)
 # Author:: Christoph Hartmann (<chartmann@chef.io>)
@@ -20,6 +19,6 @@
 module Kitchen
   module Verifier
     # Version string for InSpec Kitchen verifier
-    INSPEC_VERSION = "2.6.2".freeze
+    INSPEC_VERSION = "3.1.0".freeze
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-inspec
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-06 00:00:00.000000000 Z
+date: 2026-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: inspec
+  name: inspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -19,7 +19,7 @@ dependencies:
         version: 2.2.64
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,47 +29,61 @@ dependencies:
         version: 2.2.64
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
-  name: test-kitchen
+  name: train
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
-    - - "<="
+        version: '2.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
-    - - "<="
+        version: '2.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
 description: A Test Kitchen Verifier for InSpec
 email:
 - info@chef.io
@@ -99,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Verifier for InSpec