test-kitchen 3.8.2 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba3fe607706ce3ef90092722eb9c1e6a687f8eb55e8cd4e9fef82e9b24666517
-  data.tar.gz: 3be60ac0bbb386924f6013eb757f46c08af31f568cb878e189da0246f9f4f684
+  metadata.gz: 7fae4c8857a3ec9bf61d2e6309ce8b9c593ad5704f497aefeb491c9cc9d5f2a6
+  data.tar.gz: ae7e88b27e210a1b484823b4bed9004e18e346df4b90176788823c78c754cfe8
 SHA512:
-  metadata.gz: 4a6cb06303ca237abbcded23088db2e657de019d0cafb780bc5e78c8b02f493fe52bebec01c51527b1123f48f176fba2c41961594ad13addcf2a830de4e1b51a
-  data.tar.gz: '0819c669fc524ea36a24d2a14530e202c92da5656d9b1f78080b1e3138cf20d348afa1b38a356f5c053bfe7508beebd58bf3d93eea9434ee45cd62cec3d5920c'
+  metadata.gz: bea3627796d12458f2f65a62d0bb5f5d3efd986fdf3bd2800a4adb0b360003ffa4da0f2a0705462388cae152a9faef30cba1d1bef5bc17ceb5ba17e04b653f44
+  data.tar.gz: 47d8c9adc151d38b2670b0f191bddb31966c523e87612dddee898584aaa5ad9ca1bc07eb8ec2544363125c78faa8430dd3b45f19e7df82d00143bfb06df72295

data/lib/kitchen/transport/ssh.rb

@@ -22,6 +22,7 @@ require "fileutils" unless defined?(FileUtils)
 require "net/ssh" unless defined?(Net::SSH)
 require "net/ssh/gateway"
 require "net/ssh/proxy/http"
+require "net/ssh/proxy/command"
 require "net/scp"
 require "timeout" unless defined?(Timeout)
 require "benchmark" unless defined?(Benchmark)
@@ -63,6 +64,8 @@ module Kitchen
       default_config :ssh_http_proxy_user, nil
       default_config :ssh_http_proxy_password, nil
 
+      default_config :ssh_proxy_command, nil
+
       default_config :ssh_key, nil
       expand_path_for :ssh_key
 
@@ -164,7 +167,9 @@ module Kitchen
           if options.key?(:forward_agent)
             args += %W{ -o ForwardAgent=#{options[:forward_agent] ? "yes" : "no"} }
           end
-          if ssh_gateway
+          if ssh_proxy_command
+            args += %W{ -o ProxyCommand=#{ssh_proxy_command} }
+          elsif ssh_gateway
             gateway_command = "ssh -q #{ssh_gateway_username}@#{ssh_gateway} nc #{hostname} #{port}"
             args += %W{ -o ProxyCommand=#{gateway_command} -p #{ssh_gateway_port} }
           end
@@ -309,6 +314,11 @@ module Kitchen
         # @api private
         attr_reader :ssh_http_proxy_password
 
+        # @return [String] The ProxyCommand to use when connecting to the
+        #   remote SSH host
+        # @api private
+        attr_reader :ssh_proxy_command
+
         # Establish an SSH session on the remote host using a gateway host.
         #
         # @param opts [Hash] retry options
@@ -341,7 +351,13 @@ module Kitchen
         # @api private
         def establish_connection(opts)
           retry_connection(opts) do
-            Net::SSH.start(hostname, username, options)
+            # Handle proxy command creation at connection time
+            connection_options = options.dup
+            if connection_options[:ssh_proxy_command_string]
+              proxy_command = connection_options.delete(:ssh_proxy_command_string)
+              connection_options[:proxy] = Net::SSH::Proxy::Command.new(proxy_command)
+            end
+            Net::SSH.start(hostname, username, connection_options)
           end
         end
 
@@ -428,6 +444,7 @@ module Kitchen
           @ssh_http_proxy_user     = @options.delete(:ssh_http_proxy_user)
           @ssh_http_proxy_password = @options.delete(:ssh_http_proxy_password)
           @ssh_http_proxy_port     = @options.delete(:ssh_http_proxy_port)
+          @ssh_proxy_command       = @options.delete(:ssh_proxy_command)
         end
 
         # Returns a connection session, or establishes one when invoked the
@@ -488,6 +505,7 @@ module Kitchen
           ssh_gateway: data[:ssh_gateway],
           ssh_gateway_username: data[:ssh_gateway_username],
           ssh_gateway_port: data[:ssh_gateway_port],
+          ssh_proxy_command: data[:ssh_proxy_command],
         }
 
         if data[:ssh_key] && !data[:password]
@@ -501,6 +519,9 @@ module Kitchen
           options_http_proxy[:user] = data[:ssh_http_proxy_user]
           options_http_proxy[:password] = data[:ssh_http_proxy_password]
           opts[:proxy] = Net::SSH::Proxy::HTTP.new(data[:ssh_http_proxy], data[:ssh_http_proxy_port], options_http_proxy)
+        elsif data[:ssh_proxy_command]
+          # Store the command string, create proxy object during connection
+          opts[:ssh_proxy_command_string] = data[:ssh_proxy_command]
         end
 
         if data[:ssh_key_only]

data/lib/kitchen/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 3.8.2
+  version: 3.9.0
 platform: ruby
 authors:
 - Fletcher Nichol