Skip to content

Adds support for SSH ProxyCommand to be able to use "Bastion" servers #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vo-va wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Adds support for SSH ProxyCommand to be able to use "Bastion" servers #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49cf289
Adds support for SSH ProxyCommand to be able to use "Bastion" servers
vo-va Nov 25, 2024
9295661
Missed that Connector is not unique per SSH target and the proxy comm…
vo-va Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 20 additions & 17 deletions cmd/spot/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,12 @@ type options struct {
SSHTempDir string `long:"temp" env:"SPOT_TEMP" description:"temporary directory for ssh" default:""`

// overrides
Inventory string `short:"i" long:"inventory" description:"inventory file or url [$SPOT_INVENTORY]"`
SSHUser string `short:"u" long:"user" description:"ssh user"`
SSHKey string `short:"k" long:"key" description:"ssh key"`
Env map[string]string `short:"e" long:"env" description:"environment variables for all commands"`
EnvFile string `short:"E" long:"env-file" env:"SPOT_ENV_FILE" description:"environment variables from file" default:"env.yml"`
Inventory string `short:"i" long:"inventory" description:"inventory file or url [$SPOT_INVENTORY]"`
SSHUser string `short:"u" long:"user" description:"ssh user"`
SSHKey string `short:"k" long:"key" description:"ssh key"`
Env map[string]string `short:"e" long:"env" description:"environment variables for all commands"`
EnvFile string `short:"E" long:"env-file" env:"SPOT_ENV_FILE" description:"environment variables from file" default:"env.yml"`
ProxyCommand string `long:"proxy-command" description:"ssh ProxyCommand, valid only if Targets (-t) overriding hosts, i.e. passed as <hostname>[:port], in other cases ignored, in normal case that command should be in host Destination structure" default:""`

// commands filter
Skip []string `short:"s" long:"skip" description:"skip commands"`
Expand Down Expand Up @@ -363,6 +364,7 @@ func makeRunner(opts options, pbook *config.PlayBook) (*runner.Process, error) {
if err != nil {
return nil, fmt.Errorf("can't create connector: %w", err)
}

if opts.SSHAgent {
connector = connector.WithAgent()
}
Expand All @@ -372,18 +374,19 @@ func makeRunner(opts options, pbook *config.PlayBook) (*runner.Process, error) {
}

r := runner.Process{
Concurrency: opts.Concurrent,
Connector: connector,
Playbook: pbook,
Only: opts.Only,
Skip: opts.Skip,
Logs: logs,
Verbose: len(opts.Verbose) > 0,
Verbose2: len(opts.Verbose) > 1,
Dry: opts.Dry,
Local: opts.Local,
SSHShell: opts.SSHShell,
SSHTempDir: opts.SSHTempDir,
Concurrency: opts.Concurrent,
Connector: connector,
Playbook: pbook,
Only: opts.Only,
Skip: opts.Skip,
Logs: logs,
Verbose: len(opts.Verbose) > 0,
Verbose2: len(opts.Verbose) > 1,
Dry: opts.Dry,
Local: opts.Local,
SSHShell: opts.SSHShell,
SSHTempDir: opts.SSHTempDir,
AdhocProxyCommand: opts.ProxyCommand,
}
log.Printf("[DEBUG] runner created: concurrency:%d, connector: %s, ssh_shell:%q, verbose:%v, dry:%v, only:%v, skip:%v",
r.Concurrency, r.Connector, r.SSHShell, r.Verbose, r.Dry, r.Only, r.Skip)
Expand Down
Loading