test-kitchen 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42bf489a9ab86a4c1c88cc74e8a257ce2b6241a199fcd337b59a1b7ee32f321f
-  data.tar.gz: 1c89f445f99ceec9e677ba75cdbbd662b150b36ebbecaadccbf1378d57edca0d
+  metadata.gz: 9edd0eb56ff04d6f333344674cbc81289a4d5e02e4fc824d80f38c05fc08dde5
+  data.tar.gz: 500f102fd47c3708bc14e35e7e48069f012286b30bab206231b0841d4a50d8e4
 SHA512:
-  metadata.gz: f81c55631f7f772e3f0a3a1d6ef25116632b5500ad3e782f8f2e97dfcb691c6c397f2a5589248dac7a90a95459558cde767398e052c322b48525dd896f389388
-  data.tar.gz: 57e8f9a2ea674ee43f2e589a52b5e259c749840f122a9094a997c6968bf4e35143c4fc20d8e4accf44454c1d03d252429c8b4272c205328a01f56be6d16dcce5
+  metadata.gz: b471175533c12991c1053b0007d63007b6c2d246ad0bacba89badc7038f0bbe404f2c375db5d50f71d1e9ca93ca3e909dff63bb5f0bd93756b03600538ec6231
+  data.tar.gz: e1ecc75fb49ff9742bb349a97e3e0f6ea7745562c7d576ad096419be697fe3f5eb66ec2e41c24b26f62adfb49ea0676bfc3dff9720d4a16237606d6f2bb1d9f7

data/lib/kitchen/instance.rb

@@ -253,7 +253,7 @@ module Kitchen
     def diagnose
       result = {}
       %i{
-        platform state_file driver provisioner transport verifier
+        platform state_file driver provisioner transport verifier lifecycle_hooks
       }.each do |sym|
         obj = send(sym)
         result[sym] = obj.respond_to?(:diagnose) ? obj.diagnose : :unknown

data/lib/kitchen/lifecycle_hooks.rb

@@ -85,8 +85,10 @@ module Kitchen
     # @param hook [Hash] Hook configration to use.
     # @return [void]
     def run_local_hook(instance, state_file, hook)
-      cmd = hook.delete(:local)
+      cmd = hook.fetch(:local)
       state = state_file.read
+      # set up empty user variable
+      user = {}
       # Set up some environment variables with instance info.
       environment = {
         "KITCHEN_INSTANCE_NAME" => instance.name,
@@ -101,6 +103,12 @@ module Kitchen
           environment[k.to_s] = v.to_s
         end
       end
+
+      # add user to user hash for later merging
+      if hook[:user]
+        user[:user] = hook[:user]
+      end
+
       # Default the cwd to the kitchen root and resolve a relative input cwd against that.
       cwd = if hook[:cwd]
               File.expand_path(hook[:cwd], config[:kitchen_root])
@@ -108,7 +116,7 @@ module Kitchen
               config[:kitchen_root]
             end
       # Build the options for mixlib-shellout.
-      opts = {}.merge(hook).merge(cwd: cwd, environment: environment)
+      opts = {}.merge(user).merge(cwd: cwd, environment: environment)
       run_command(cmd, opts)
     end
 
@@ -128,7 +136,8 @@ module Kitchen
           raise UserError, "Cannot use remote lifecycle hooks during phases when the instance is not available"
         end
       end
-      cmd = hook.delete(:remote)
+
+      cmd = hook.fetch(:remote)
       conn = instance.transport.connection(state_file.read)
       conn.execute(cmd)
     end

data/lib/kitchen/transport/ssh.rb

@@ -46,6 +46,7 @@ module Kitchen
       default_config :username, "root"
       default_config :keepalive, true
       default_config :keepalive_interval, 60
+      default_config :keepalive_maxcount, 3
       # needs to be one less than the configured sshd_config MaxSessions
       default_config :max_ssh_sessions, 9
       default_config :connection_timeout, 15
@@ -468,6 +469,7 @@ module Kitchen
           compression_level: data[:compression_level],
           keepalive: data[:keepalive],
           keepalive_interval: data[:keepalive_interval],
+          keepalive_maxcount: data[:keepalive_maxcount],
           timeout: data[:connection_timeout],
           connection_retries: data[:connection_retries],
           connection_retry_sleep: data[:connection_retry_sleep],

data/lib/kitchen/version.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "2.3.0".freeze
+  VERSION = "2.3.1".freeze
 end

metadata

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