test-kitchen 3.6.0 → 3.7.2

data/lib/kitchen/loader/yaml.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,
@@ -23,7 +23,7 @@ require "yaml" unless defined?(YAML)
 module Kitchen
   module Loader
     # YAML file loader for Test Kitchen configuration. This class is
-    # responisble for parsing the main YAML file and the local YAML if it
+    # responsible for parsing the main YAML file and the local YAML if it
     # exists. Local file configuration will win over the default configuration.
     # The client of this class should not require any YAML loading or parsing
     # logic.
@@ -156,7 +156,7 @@ module Kitchen
         @process_erb ? process_erb(string, file) : string
       end
 
-      # Passes a string through ERb to evaulate any ERb blocks.
+      # Passes a string through ERb to evaluate any ERb blocks.
       #
       # @param string [String] the string to process
       # @param file [String] an absolute path to the file represented as the
@@ -242,7 +242,7 @@ module Kitchen
         File.join(File.expand_path(ENV["HOME"]), ".kitchen", "config.yml")
       end
 
-      # Generate a diganose Hash for a particular YAML file Hash. If an error
+      # Generate a diagnose Hash for a particular YAML file Hash. If an error
       # occurs when loading the data, then a failure hash will be inserted
       # into the `:raw_data` sub-hash.
       #
@@ -263,7 +263,7 @@ module Kitchen
         { filename: file, raw_data: hash }
       end
 
-      # Generates a Hash respresenting a failure, given an Exception object.
+      # Generates a Hash representing a failure, given an Exception object.
       #
       # @param e [Exception] an exception
       # @param file [String] the absolute path to a file (default: `nil`)

data/lib/kitchen/logger.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,

data/lib/kitchen/logging.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,

data/lib/kitchen/login_command.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,
@@ -35,7 +35,7 @@ module Kitchen
     # @param command [String] command
     # @param arguments [Array] array of arguments to the command
     # @param options [Hash] options hash, passed to `Kernel#exec`
-    # @see http://www.ruby-doc.org/core-2.1.2/Kernel.html#method-i-exec
+    # @see https://ruby-doc.org/core-2.1.2/Kernel.html#method-i-exec
     def initialize(command, arguments, options = {})
       @command = command
       @arguments = Array(arguments)

data/lib/kitchen/metadata_chopper.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,

data/lib/kitchen/platform.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,

data/lib/kitchen/platform_filter.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,
@@ -50,7 +50,9 @@ module Kitchen
     #
     # @param [Regexp,String] value of the filter
     def initialize(value)
-      raise ::ArgumentError, "PlatformFilter#new requires value to be a String or a Regexp" unless value.is_a?(::Regexp) || value.is_a?(::String)
+      unless value.is_a?(::Regexp) || value.is_a?(::String)
+        raise ::ArgumentError, "PlatformFilter#new requires value to be a String or a Regexp"
+      end
 
       @value = value
     end

data/lib/kitchen/plugin.rb

@@ -8,7 +8,7 @@
 # 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
+#    https://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,

data/lib/kitchen/plugin_base.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,

data/lib/kitchen/provisioner/base.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,

data/lib/kitchen/provisioner/chef/berkshelf.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,
@@ -87,7 +87,7 @@ module Kitchen
         class << self
           private
 
-          # Load the Berkshelf-specific libary code.
+          # Load the Berkshelf-specific library code.
           #
           # @param logger [Kitchen::Logger] the logger to use
           # @raise [UserError] if the library couldn't be loaded

data/lib/kitchen/provisioner/chef/common_sandbox.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,
@@ -162,7 +162,7 @@ module Kitchen
           info("Removing non-cookbook files before transfer")
           FileUtils.rm(all_files_in_cookbooks - only_cookbook_files)
           Util.list_directory(tmpbooks_dir, recurse: true)
-            .reverse_each { |fn| FileUtils.rmdir(fn) if File.directory?(fn) && Dir.entries(fn).size == 2 }
+            .reverse_each { |fn| FileUtils.rmdir(fn) if File.directory?(fn) && Dir.empty?(fn) }
         end
 
         # @return [Logger] the instance's logger or Test Kitchen's common

data/lib/kitchen/provisioner/chef/policyfile.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,
@@ -63,10 +63,10 @@ module Kitchen
         def resolve
           if policy_group
             info("Exporting cookbook dependencies from Policyfile #{path} with policy_group #{policy_group} using `#{cli_path} export`...")
-            run_command("#{cli_path} export #{escape_path(policyfile)} #{escape_path(path)} --policy_group #{policy_group} --force --chef-license #{license}")
+            run_command("#{cli_path} export #{escape_path(policyfile)} #{escape_path(path)} --policy_group #{policy_group} --force #{chef_license(license)}")
           else
             info("Exporting cookbook dependencies from Policyfile #{path} using `#{cli_path} export`...")
-            run_command("#{cli_path} export #{escape_path(policyfile)} #{escape_path(path)} --force --chef-license #{license}")
+            run_command("#{cli_path} export #{escape_path(policyfile)} #{escape_path(path)} --force #{chef_license(license)}")
           end
         end
 
@@ -78,11 +78,11 @@ module Kitchen
           else
             info("Policy lock file doesn't exist, running `#{cli_path} install` for Policyfile #{policyfile}...")
           end
-          run_command("#{cli_path} install #{escape_path(policyfile)} --chef-license #{license}")
+          run_command("#{cli_path} install #{escape_path(policyfile)} #{chef_license(license)}")
 
           if always_update
             info("Updating policy lock using `#{cli_path} update`")
-            run_command("#{cli_path} update #{escape_path(policyfile)} --chef-license #{license}")
+            run_command("#{cli_path} update #{escape_path(policyfile)} #{chef_license(license)}")
           end
         end
 
@@ -161,6 +161,12 @@ module Kitchen
                         "setting includes the path to the `chef` or `chef-cli` commands.")
           raise UserError, "Could not find the chef or chef-cli executables in your PATH."
         end
+
+        # Return `"--chef-license #{license}"` when `license` is not nil or empty and the empty string otherwise.
+        def chef_license(license)
+          (license.nil? || license.empty?) ? "" : "--chef-license #{license}"
+        end
+
       end
     end
   end

data/lib/kitchen/provisioner/chef_apply.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,
@@ -29,8 +29,8 @@
 #   name: chef_apply
 #
 # platforms:
-#   - name: ubuntu-20.04
-#   - name: centos-8
+#   - name: ubuntu-24.04
+#   - name: almalinux-10
 #
 # suites:
 #   - name: default

data/lib/kitchen/provisioner/chef_base.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,
@@ -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
@@ -272,7 +273,7 @@ module Kitchen
       # @return [String] license id to prompt for acceptance
       def license_acceptance_id
         case
-          when File.exist?(policyfile)
+          when File.exist?(policyfile) && (config[:product_name].nil? || config[:product_name].start_with?("chef"))
             "chef-workstation"
           when config[:product_name]
             config[:product_name]
@@ -391,7 +392,7 @@ module Kitchen
       # @return [Hash] a configuration hash
       # @api private
       def default_config_rb # rubocop:disable Metrics/MethodLength
-        root = config[:root_path].gsub("$env:TEMP", "\#{ENV['TEMP']\}")
+        root = config[:root_path].gsub("$env:TEMP", "\#{ENV['TEMP']}")
 
         config_rb = {
           node_name: instance.name,
@@ -442,7 +443,7 @@ module Kitchen
         if obj.is_a?(String) && obj =~ /^:/
           obj
         elsif obj.is_a?(String)
-          %{"#{obj.gsub(/\\/, "\\\\\\\\")}"}
+          %{"#{obj.gsub("\\", "\\\\\\\\")}"}
         elsif obj.is_a?(Array)
           %{[#{obj.map { |i| format_value(i) }.join(", ")}]}
         else
@@ -600,12 +601,12 @@ module Kitchen
       # @api private
       def sanity_check_sandbox_options!
         if (config[:policyfile_path] || config[:policyfile]) && !File.exist?(policyfile)
-          raise UserError, "policyfile_path set in config "\
+          raise UserError, "policyfile_path set in config " \
             "(#{config[:policyfile_path]} could not be found. " \
             "Expected to find it at full path #{policyfile}."
         end
         if config[:berksfile_path] && !File.exist?(berksfile)
-          raise UserError, "berksfile_path set in config "\
+          raise UserError, "berksfile_path set in config " \
             "(#{config[:berksfile_path]} could not be found. " \
             "Expected to find it at full path #{berksfile}."
         end

data/lib/kitchen/provisioner/chef_infra.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,
@@ -138,7 +138,7 @@ module Kitchen
         debug("Using a dummy validation.pem")
 
         source = File.join(File.dirname(__FILE__),
-                           %w{.. .. .. support dummy-validation.pem})
+          %w{.. .. .. support dummy-validation.pem})
         FileUtils.cp(source, File.join(sandbox_path, "validation.pem"))
       end
 

data/lib/kitchen/provisioner/chef_solo.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,

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
+#
+#    https://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.push(
+          "--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/provisioner/dummy.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,

data/lib/kitchen/provisioner/shell.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,

data/lib/kitchen/provisioner.rb

@@ -8,7 +8,7 @@
 # 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
+#    https://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,

data/lib/kitchen/rake_tasks.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,

data/lib/kitchen/shell_out.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,
@@ -78,7 +78,7 @@ module Kitchen
     # Returns a hash of MixLib::ShellOut options for the command.
     #
     # @param options [Hash] a Hash of options
-    # @return [Hash] a new Hash of options, filterd and merged with defaults
+    # @return [Hash] a new Hash of options, filtered and merged with defaults
     # @api private
     def shell_opts(options)
       filtered_opts = options.reject do |key, _value|

data/lib/kitchen/ssh.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,
@@ -92,7 +92,7 @@ module Kitchen
     # @param remote [String] path to remote file destination
     # @param options [Hash] configuration options that are passed to
     #   `Net::SCP.upload`
-    # @see http://net-ssh.github.io/net-scp/classes/Net/SCP.html#method-i-upload
+    # @see https://net-ssh.github.io/net-scp/classes/Net/SCP.html#method-i-upload
     def upload!(local, remote, options = {}, &progress)
       require "net/scp" unless defined?(Net::SCP)
       if progress.nil?
@@ -124,7 +124,7 @@ module Kitchen
     # @param options [Hash] configuration options that are passed to
     #   `Net::SCP.upload`
     # @option options [true,false] :recursive recursive copy (default: `true`)
-    # @see http://net-ssh.github.io/net-scp/classes/Net/SCP.html#method-i-upload
+    # @see https://net-ssh.github.io/net-scp/classes/Net/SCP.html#method-i-upload
     def upload_path!(local, remote, options = {}, &progress)
       options = { recursive: true }.merge(options)
 

data/lib/kitchen/state_file.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,
@@ -43,7 +43,7 @@ module Kitchen
     # @raise [StateFileLoadError] if there is a problem loading the state file
     #   from disk and loading it into a Hash
     def read
-      if File.exist?(file_name) && !File.zero?(file_name)
+      if File.exist?(file_name) && !File.empty?(file_name)
         Util.symbolized_hash(deserialize_string(read_file))
       else
         {}

data/lib/kitchen/suite.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,

data/lib/kitchen/thor_tasks.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,

data/lib/kitchen/transport/base.rb

@@ -8,7 +8,7 @@
 # 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
+#    https://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,

data/lib/kitchen/transport/dummy.rb

@@ -7,7 +7,7 @@
 # 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
+#    https://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,

data/lib/kitchen/transport/exec.rb

@@ -3,7 +3,7 @@
 # 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
+#    https://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,
@@ -59,7 +59,7 @@ module Kitchen
         # @see Base#upload
         def upload(locals, remote)
           # evaluate $env:temp on Windows
-          real_remote = remote.to_s == "\$env:TEMP\\kitchen" ? kitchen_temp : remote
+          real_remote = remote.to_s == "$env:TEMP\\kitchen" ? kitchen_temp : remote
           FileUtils.mkdir_p(real_remote)
           Array(locals).each do |local|
             FileUtils.cp_r(local, real_remote)