Merge branch 'main' into allow-bastion-server

2023-02-04 15:33:25 +01:00
parent dfca9d8c48 45207f0c4f
commit 9ec6f9d74f
10 changed files with 125 additions and 70 deletions
--- a/lib/mrsk/commands/base.rb
+++ b/lib/mrsk/commands/base.rb
@@ -8,14 +8,11 @@ module Mrsk::Commands
      @config = config
    end

-    def run_over_ssh(command, host:)
-      ssh_command = "ssh"
-
-      if config.ssh_proxy
-        ssh_command << " -J #{config.ssh_proxy.jump_proxies}"
+    def run_over_ssh(*command, host:)
+      "ssh".tap do |cmd|
+        cmd << " -J #{config.ssh_proxy.jump_proxies}" if config.ssh_proxy
+        cmd << " -t #{config.ssh_user}@#{host} '#{command.join(" ")}'"
      end
-
-      ssh_command << " -t #{config.ssh_user}@#{host} '#{command}'"
    end

    private