Merge pull request #4 from chef/fnichol/full-ssh-tunables

Support all Kitchen/SSH as Train/SSH tunables.

Gemfile

@@ -12,4 +12,4 @@ group :test do
 end
 
 gem "inspec", :git => "[email protected]:chef/inspec.git"
-gem 'train', git: '[email protected]:chef/train.git'
+gem "train", :git => "[email protected]:chef/train.git"

lib/kitchen/verifier/inspec.rb

@@ -88,16 +88,29 @@ def local_suite_files
       # @return [Hash] a configuration hash of string-based keys
       # @api private
       def runner_options_for_ssh(config_data)
-        opts = instance.transport.send(:connection_options, config_data).dup
-        {
+        kitchen = instance.transport.send(:connection_options, config_data).dup
+
+        opts = {
           "backend" => "ssh",
-          "host" => opts[:hostname],
-          "port" => opts[:port],
-          "user" => opts[:username],
-          "key_files" => opts[:keys],
+          "logger" => logger,
           # pass-in sudo config from kitchen verifier
           "sudo" => config[:sudo],
+          "host" => kitchen[:hostname],
+          "port" => kitchen[:port],
+          "user" => kitchen[:username],
+          "keepalive" => kitchen[:keepalive],
+          "keepalive_interval" => kitchen[:keepalive_interval],
+          "connection_timeout" => kitchen[:timeout],
+          "connection_retries" => kitchen[:connection_retries],
+          "connection_retry_sleep" => kitchen[:connection_retry_sleep],
+          "max_wait_until_ready" => kitchen[:max_wait_until_ready],
+          "compression" => kitchen[:compression],
+          "compression_level" => kitchen[:compression_level]
         }
+        opts["key_files"] = kitchen[:keys] unless kitchen[:keys].nil?
+        opts["password"] = kitchen[:password] unless kitchen[:password].nil?
+
+        opts
       end
     end
   end

spec/kitchen/verifier/inspec_spec.rb

@@ -96,7 +96,15 @@
         :hostname => "boogie",
         :port => "I shouldn't be used",
         :username => "dance",
-        :ssh_key => "/backstage/pass"
+        :ssh_key => "/backstage/pass",
+        :keepalive => "keepalive",
+        :keepalive_interval => "forever",
+        :connection_timeout => "nope",
+        :connection_retries => "thousand",
+        :connection_retry_sleep => "sleepy",
+        :max_wait_until_ready => 42,
+        :compression => "maxyo",
+        :compression_level => "pico"
       }
     end
 
@@ -114,12 +122,24 @@
     end
 
     it "constructs a Inspec::Runner using transport config data and state" do
+      config[:sudo] = "jellybeans"
+
       expect(Inspec::Runner).to receive(:new).
         with(hash_including(
           "backend" => "ssh",
+          "logger" => logger,
+          "sudo" => "jellybeans",
           "host" => "boogie",
           "port" => 123,
           "user" => "dance",
+          "keepalive" => "keepalive",
+          "keepalive_interval" => "forever",
+          "connection_timeout" => "nope",
+          "connection_retries" => "thousand",
+          "connection_retry_sleep" => "sleepy",
+          "max_wait_until_ready" => 42,
+          "compression" => "maxyo",
+          "compression_level" => "pico",
           "key_files" => ["/backstage/pass"]
         )).
         and_return(runner)