test-kitchen 3.6.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecd483d58546fb48da8bb5a4e5c448b7cc2f8b7d2c0082d0df4b023c380a2594
-  data.tar.gz: cb42f2dae4d33d84ff8515a7412d7e1d14c358504f66429b21465bef7714e48b
+  metadata.gz: 78dcb8180d72d9ce32f3cf860d2dbb90d4c66ba2920cdf03252717bd4674a3f5
+  data.tar.gz: fc68fb60b6fa811425c3079a317946414cfca980198e4e668fbcc0e4c507841a
 SHA512:
-  metadata.gz: 8adf00afe37d4b31dec9b6acca4aee2aa858b265db0fee4f0c0fac8407691f452e7d487d45ec5f72e816d0799060affcaf31d8885597ade1a9d40dc59f6056bc
-  data.tar.gz: bc82343bf133cbce4c9c5096d1d88a9bb7ab56cf619d289f71008388757d553c43432f3188d72ddc87c917212ce6a6278ee0d81a64b8f7d688341e387da2949f
+  metadata.gz: 04e4ddf2b8c612db3a71ef7a7d720c5f586813f8ba3263415d56385f41e90b89663e2c4091fbbd03f60ff4c8922413988df086c71a93fbf7a396f903303b03d9
+  data.tar.gz: 93131c18cdc7889dd9c2e477c598a409ae4d1b47a865fdf4bba6ae54da6b48de59bfc1c7b57015b0dc011a311762e18b13c13955e8e45cc95f852807845d4073

data/Gemfile

@@ -7,15 +7,15 @@ group :test do
   gem "rb-readline"
   gem "aruba",     ">= 0.11", "< 3.0"
   gem "countloc",  "~> 0.4"
-  gem "cucumber",  ">= 2.1", "< 8.1"
+  gem "cucumber",  ">= 9.2", "< 10"
   gem "fakefs",    "~> 2.0"
   gem "maruku",    "~> 0.6"
-  gem "minitest",  "~> 5.3", "< 5.16"
+  gem "minitest",  "~> 5.3", "< 6.0"
   gem "mocha",     "~> 2.0"
 end
 
 group :integration do
-  gem "berkshelf"
+  gem "chef-cli"
   gem "kitchen-dokken"
   gem "kitchen-inspec"
   gem "kitchen-vagrant"

data/lib/kitchen/provisioner/chef_base.rb

@@ -244,6 +244,7 @@ module Kitchen
       end
 
       def doctor(state)
+        deprecated_config = instance.driver.instance_variable_get(:@deprecated_config)
         deprecated_config.each do |attr, msg|
           info("**** #{attr} deprecated\n#{msg}")
         end

data/lib/kitchen/provisioner/chef_target.rb

@@ -0,0 +1,130 @@
+#
+# Author:: Thomas Heinen (<thomas.heinen@gmail.com>)
+#
+# Copyright (C) 2023, Thomas Heinen
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative "chef_infra"
+
+module Kitchen
+  module Provisioner
+    # Chef Target provisioner.
+    #
+    # @author Thomas Heinen <thomas.heinen@gmail.com>
+    class ChefTarget < ChefInfra
+      MIN_VERSION_REQUIRED = "19.0.0".freeze
+      class ChefVersionTooLow < UserError; end
+      class ChefClientNotFound < UserError; end
+      class RequireTrainTransport < UserError; end
+
+      default_config :install_strategy, "none"
+      default_config :sudo, true
+
+      def install_command; ""; end
+      def init_command; ""; end
+      def prepare_command; ""; end
+
+      def chef_args(client_rb_filename)
+        # Dummy execution to initialize and test remote connection
+        connection = instance.remote_exec("echo Connection established")
+
+        check_transport(connection)
+        check_local_chef_client
+
+        instance_name = instance.name
+        credentials_file = File.join(kitchen_basepath, ".kitchen", instance_name + ".ini")
+        File.write(credentials_file, connection.credentials_file)
+
+        super.concat([
+          "--target #{instance_name}",
+          "--credentials #{credentials_file}",
+        ])
+      end
+
+      def check_transport(connection)
+        debug("Checking for active transport")
+
+        unless connection.respond_to? "train_uri"
+          error("Chef Target Mode provisioner requires a Train-based transport like kitchen-transport-train")
+          raise RequireTrainTransport.new("No Train transport")
+        end
+
+        debug("Kitchen transport responds to train_uri function call, as required")
+      end
+
+      def check_local_chef_client
+        debug("Checking for chef-client version")
+
+        begin
+          client_version = `chef-client -v`.chop.split(":")[-1]
+        rescue Errno::ENOENT => e
+          error("Error determining Chef Infra version: #{e.exception.message}")
+          raise ChefClientNotFound.new("Need chef-client installed locally")
+        end
+
+        minimum_version = Gem::Version.new(MIN_VERSION_REQUIRED)
+        installed_version = Gem::Version.new(client_version)
+
+        if installed_version < minimum_version
+          error("Found Chef Infra version #{installed_version}, but require #{minimum_version} for Target Mode")
+          raise ChefVersionTooLow.new("Need version #{MIN_VERSION_REQUIRED} or higher")
+        end
+
+        debug("Chef Infra found and version constraints match")
+      end
+
+      def kitchen_basepath
+        instance.driver.config[:kitchen_root]
+      end
+
+      def create_sandbox
+        super
+
+        # Change config.rb to point to the local sandbox path, not to /tmp/kitchen
+        config[:root_path] = sandbox_path
+        prepare_config_rb
+      end
+
+      def call(state)
+        remote_connection = instance.transport.connection(state)
+
+        config[:uploads].to_h.each do |locals, remote|
+          debug("Uploading #{Array(locals).join(", ")} to #{remote}")
+          remote_connection.upload(locals.to_s, remote)
+        end
+
+        # no installation
+        create_sandbox
+        # no prepare command
+
+        # Stream output to logger
+        require "open3"
+        Open3.popen2e(run_command) do |_stdin, output, _thread|
+          output.each { |line| logger << line }
+        end
+
+        info("Downloading files from #{instance.to_str}")
+        config[:downloads].to_h.each do |remotes, local|
+          debug("Downloading #{Array(remotes).join(", ")} to #{local}")
+          remote_connection.download(remotes, local)
+        end
+        debug("Download complete")
+      rescue Kitchen::Transport::TransportFailed => ex
+        raise ActionFailed, ex.message
+      ensure
+        cleanup_sandbox
+      end
+    end
+  end
+end

data/lib/kitchen/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "3.6.0".freeze
+  VERSION = "3.7.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
@@ -294,6 +294,7 @@ files:
 - lib/kitchen/provisioner/chef_base.rb
 - lib/kitchen/provisioner/chef_infra.rb
 - lib/kitchen/provisioner/chef_solo.rb
+- lib/kitchen/provisioner/chef_target.rb
 - lib/kitchen/provisioner/chef_zero.rb
 - lib/kitchen/provisioner/dummy.rb
 - lib/kitchen/provisioner/shell.rb