From 724b6c82f591ec696f14dfb7d6e8e133eff1072f Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Wed, 20 May 2020 14:10:56 +0100 Subject: can specify a private ssh key via command line, no password support yet though --- cmd/dcat/main.go | 15 +++++++++------ cmd/dgrep/main.go | 17 ++++++++++------- cmd/dmap/main.go | 19 +++++++++++-------- cmd/drun/main.go | 19 +++++++++++-------- cmd/dtail/main.go | 21 ++++++++++++--------- 5 files changed, 53 insertions(+), 38 deletions(-) (limited to 'cmd') diff --git a/cmd/dcat/main.go b/cmd/dcat/main.go index 42b29bf..1ab67c2 100644 --- a/cmd/dcat/main.go +++ b/cmd/dcat/main.go @@ -26,6 +26,7 @@ func main() { var quietEnable bool var sshPort int var trustAllHosts bool + var privateKeyPathFile string userName := user.Name() @@ -41,6 +42,7 @@ func main() { flag.StringVar(&files, "files", "", "File(s) to read") flag.StringVar(&serversStr, "servers", "", "Remote servers to connect") flag.StringVar(&userName, "user", userName, "Your system user name") + flag.StringVar(&privateKeyPathFile, "key", "", "Path to private key") flag.Parse() @@ -55,12 +57,13 @@ func main() { logger.Start(ctx, logger.Modes{Debug: debugEnable || config.Common.DebugEnable, Quiet: quietEnable}) args := clients.Args{ - ConnectionsPerCPU: connectionsPerCPU, - ServersStr: serversStr, - Discovery: discovery, - UserName: userName, - What: files, - TrustAllHosts: trustAllHosts, + ConnectionsPerCPU: connectionsPerCPU, + ServersStr: serversStr, + Discovery: discovery, + UserName: userName, + What: files, + TrustAllHosts: trustAllHosts, + PrivateKeyPathFile: privateKeyPathFile, } client, err := clients.NewCatClient(args) diff --git a/cmd/dgrep/main.go b/cmd/dgrep/main.go index c136b43..faffe76 100644 --- a/cmd/dgrep/main.go +++ b/cmd/dgrep/main.go @@ -27,6 +27,7 @@ func main() { var quietEnable bool var sshPort int var trustAllHosts bool + var privateKeyPathFile string userName := user.Name() @@ -43,6 +44,7 @@ func main() { flag.StringVar(®ex, "regex", ".", "Regular expression") flag.StringVar(&serversStr, "servers", "", "Remote servers to connect") flag.StringVar(&userName, "user", userName, "Your system user name") + flag.StringVar(&privateKeyPathFile, "key", "", "Path to private key") flag.Parse() @@ -57,13 +59,14 @@ func main() { logger.Start(ctx, logger.Modes{Debug: debugEnable || config.Common.DebugEnable, Quiet: quietEnable}) args := clients.Args{ - ConnectionsPerCPU: connectionsPerCPU, - ServersStr: serversStr, - Discovery: discovery, - UserName: userName, - What: files, - TrustAllHosts: trustAllHosts, - Regex: regex, + ConnectionsPerCPU: connectionsPerCPU, + ServersStr: serversStr, + Discovery: discovery, + UserName: userName, + What: files, + TrustAllHosts: trustAllHosts, + Regex: regex, + PrivateKeyPathFile: privateKeyPathFile, } client, err := clients.NewGrepClient(args) diff --git a/cmd/dmap/main.go b/cmd/dmap/main.go index cae1552..d7b5fae 100644 --- a/cmd/dmap/main.go +++ b/cmd/dmap/main.go @@ -29,6 +29,7 @@ func main() { var sshPort int var timeout int var trustAllHosts bool + var privateKeyPathFile string userName := user.Name() @@ -46,6 +47,7 @@ func main() { flag.StringVar(&queryStr, "query", "", "Map reduce query") flag.StringVar(&serversStr, "servers", "", "Remote servers to connect") flag.StringVar(&userName, "user", userName, "Your system user name") + flag.StringVar(&privateKeyPathFile, "key", "", "Path to private key") flag.Parse() @@ -60,14 +62,15 @@ func main() { logger.Start(ctx, logger.Modes{Debug: debugEnable || config.Common.DebugEnable, Quiet: quietEnable}) args := clients.Args{ - ConnectionsPerCPU: connectionsPerCPU, - ServersStr: serversStr, - Discovery: discovery, - UserName: userName, - What: files, - TrustAllHosts: trustAllHosts, - Mode: omode.MapClient, - Timeout: timeout, + ConnectionsPerCPU: connectionsPerCPU, + ServersStr: serversStr, + Discovery: discovery, + UserName: userName, + What: files, + TrustAllHosts: trustAllHosts, + Mode: omode.MapClient, + Timeout: timeout, + PrivateKeyPathFile: privateKeyPathFile, } client, err := clients.NewMaprClient(args, queryStr) diff --git a/cmd/drun/main.go b/cmd/drun/main.go index 039c104..8c78e8f 100644 --- a/cmd/drun/main.go +++ b/cmd/drun/main.go @@ -31,6 +31,7 @@ func main() { var sshPort int var timeout int var trustAllHosts bool + var privateKeyPathFile string userName := user.Name() @@ -49,6 +50,7 @@ func main() { flag.StringVar(&jobName, "name", "", "The job name (if run in background)") flag.StringVar(&serversStr, "servers", "", "Remote servers to connect") flag.StringVar(&userName, "user", userName, "Your system user name") + flag.StringVar(&privateKeyPathFile, "key", "", "Path to private key") flag.Parse() @@ -64,14 +66,15 @@ func main() { command, commandArgs := readCommand(command) args := clients.Args{ - ConnectionsPerCPU: connectionsPerCPU, - ServersStr: serversStr, - Discovery: discovery, - UserName: userName, - What: command, - Arguments: commandArgs, - TrustAllHosts: trustAllHosts, - Timeout: timeout, + ConnectionsPerCPU: connectionsPerCPU, + ServersStr: serversStr, + Discovery: discovery, + UserName: userName, + What: command, + Arguments: commandArgs, + TrustAllHosts: trustAllHosts, + Timeout: timeout, + PrivateKeyPathFile: privateKeyPathFile, } client, err := clients.NewRunClient(args, background, jobName) diff --git a/cmd/dtail/main.go b/cmd/dtail/main.go index e69e85a..699784b 100644 --- a/cmd/dtail/main.go +++ b/cmd/dtail/main.go @@ -36,6 +36,7 @@ func main() { var sshPort int var timeout int var trustAllHosts bool + var privateKeyPathFile string userName := user.Name() @@ -56,6 +57,7 @@ func main() { flag.StringVar(®ex, "regex", ".", "Regular expression") flag.StringVar(&serversStr, "servers", "", "Remote servers to connect") flag.StringVar(&userName, "user", userName, "Your system user name") + flag.StringVar(&privateKeyPathFile, "key", "", "Path to private key") flag.Parse() @@ -83,15 +85,16 @@ func main() { } args := clients.Args{ - ConnectionsPerCPU: connectionsPerCPU, - ServersStr: serversStr, - Discovery: discovery, - UserName: userName, - What: files, - TrustAllHosts: trustAllHosts, - Regex: regex, - Mode: omode.TailClient, - Timeout: timeout, + ConnectionsPerCPU: connectionsPerCPU, + ServersStr: serversStr, + Discovery: discovery, + UserName: userName, + What: files, + TrustAllHosts: trustAllHosts, + Regex: regex, + Mode: omode.TailClient, + Timeout: timeout, + PrivateKeyPathFile: privateKeyPathFile, } var client clients.Client -- cgit v1.2.3