Merge pull request #554 from inspec/zenspider/ssh/fix

Refactor with_sudo_pty to BaseConnection (no-op) and SshConnection.
inspec · Jan 15, 2020 · ab85356 · ab85356
2 parents 50bf636 + 8867db9
commit ab85356
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/lib/train/extras/command_wrapper.rb b/lib/train/extras/command_wrapper.rb
@@ -53,15 +53,6 @@ def initialize(backend, options)
       @user          = options[:user]
     end
 
-    def with_sudo_pty
-      old_pty = backend.transport_options[:pty]
-      backend.transport_options[:pty] = true if @sudo
-
-      yield
-    ensure
-      backend.transport_options[:pty] = old_pty
-    end
-
     # (see CommandWrapperBase::verify)
     def verify
       cmd = if @sudo
@@ -72,7 +63,7 @@ def verify
             end
 
       # rubocop:disable Style/BlockDelimiters
-      res = with_sudo_pty {
+      res = @backend.with_sudo_pty {
         @backend.run_command(cmd)
       }
       return nil if res.exit_status == 0

diff --git a/lib/train/plugins/base_connection.rb b/lib/train/plugins/base_connection.rb
@@ -38,6 +38,10 @@ def initialize(options = nil)
       end
     end
 
+    def with_sudo_pty
+      yield
+    end
+
     # Returns cached client if caching enabled. Otherwise returns whatever is
     # given in the block.
     #

diff --git a/lib/train/transports/ssh_connection.rb b/lib/train/transports/ssh_connection.rb
@@ -164,6 +164,15 @@ def obscured_options
       options_to_print
     end
 
+    def with_sudo_pty
+      old_pty = backend.transport_options[:pty]
+      backend.transport_options[:pty] = true if @sudo
+
+      yield
+    ensure
+      backend.transport_options[:pty] = old_pty
+    end
+
     private
 
     PING_COMMAND = "echo '[SSH] Established'".freeze