Revert "Revert default session timeout value"

This reverts commit f652cbfd532042620565c6464c2a9cef947f3b0d.

Timeouts are the right way to go, but we need to update the tests
to account for the defaulted values.

Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb
index 0ba0e72f66..3f8f3642b5 100644
--- a/lib/chef/knife/bootstrap.rb
+++ b/lib/chef/knife/bootstrap.rb
@@ -69,7 +69,8 @@ class Chef
       option :session_timeout,
         long: "--session-timeout SECONDS",
         description: "The number of seconds to wait for each connection operation to be acknowledged while running bootstrap.",
-        proc: Proc.new { |protocol| Chef::Config[:knife][:session_timeout] = protocol }
+        proc: Proc.new { |protocol| Chef::Config[:knife][:session_timeout] = protocol },
+        default: 60
 
       # WinRM Authentication
       option :winrm_ssl_peer_fingerprint,
@@ -838,7 +839,7 @@ class Chef
         return opts if connection_protocol == "winrm"
         opts[:non_interactive] = true # Prevent password prompts from underlying net/ssh
         opts[:forward_agent] = (config_value(:ssh_forward_agent) === true)
-        opts[:connection_timeout] = config_value(:session_timeout)&.to_i || 60
+        opts[:connection_timeout] = config_value(:session_timeout).to_i
         opts
       end
 
@@ -937,7 +938,7 @@ class Chef
           opts[:ca_trust_file] = config_value(:ca_trust_file)
         end
 
-        opts[:operation_timeout] = config_value(:session_timeout)&.to_i || 60
+        opts[:operation_timeout] = config_value(:session_timeout).to_i
 
         opts
       end