diff options
| author | Paul Buetow <paul@buetow.org> | 2021-11-07 11:54:16 +0200 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2021-11-07 11:54:16 +0200 |
| commit | c5679ae69d0ffd17d6675d2b275b62daa1522ced (patch) | |
| tree | 91fb0774cfba3b90218a040fc93dace638e320c1 /internal | |
| parent | 4121a7fc9c24384566760708e2ee7a03de0bd484 (diff) | |
can set ssh private key path file via env var
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/clients/baseclient.go | 2 | ||||
| -rw-r--r-- | internal/config/args.go | 6 | ||||
| -rw-r--r-- | internal/config/initializer.go | 8 |
3 files changed, 10 insertions, 6 deletions
diff --git a/internal/clients/baseclient.go b/internal/clients/baseclient.go index 3cd85fe..764d53e 100644 --- a/internal/clients/baseclient.go +++ b/internal/clients/baseclient.go @@ -56,7 +56,7 @@ func (c *baseClient) init() { } c.sshAuthMethods, c.hostKeyCallback = client.InitSSHAuthMethods( c.Args.SSHAuthMethods, c.Args.SSHHostKeyCallback, c.Args.TrustAllHosts, - c.throttleCh, c.Args.SSHPrivateKeyPathFile) + c.throttleCh, c.Args.SSHPrivateKeyFilePath) } func (c *baseClient) makeConnections(maker maker) { diff --git a/internal/config/args.go b/internal/config/args.go index 5b1fc1e..8df6555 100644 --- a/internal/config/args.go +++ b/internal/config/args.go @@ -32,10 +32,10 @@ type Args struct { SSHBindAddress string SSHHostKeyCallback gossh.HostKeyCallback SSHPort int - SSHPrivateKeyPathFile string + SSHPrivateKeyFilePath string Serverless bool ServersStr string - Plain bool + Plain bool Timeout int TrustAllHosts bool UserName string @@ -63,7 +63,7 @@ func (a *Args) String() string { sb.WriteString(fmt.Sprintf("%s:%v,", "SSHAuthMethods", a.SSHAuthMethods)) sb.WriteString(fmt.Sprintf("%s:%v,", "SSHBindAddress", a.SSHBindAddress)) sb.WriteString(fmt.Sprintf("%s:%v,", "SSHHostKeyCallback", a.SSHHostKeyCallback)) - sb.WriteString(fmt.Sprintf("%s:%v,", "SSHPrivateKeyPathFile", a.SSHPrivateKeyPathFile)) + sb.WriteString(fmt.Sprintf("%s:%v,", "SSHPrivateKeyFilePath", a.SSHPrivateKeyFilePath)) sb.WriteString(fmt.Sprintf("%s:%v,", "SSHPort", a.SSHPort)) sb.WriteString(fmt.Sprintf("%s:%v,", "Serverless", a.Serverless)) sb.WriteString(fmt.Sprintf("%s:%v,", "ServersStr", a.ServersStr)) diff --git a/internal/config/initializer.go b/internal/config/initializer.go index 1a7822c..0a8d411 100644 --- a/internal/config/initializer.go +++ b/internal/config/initializer.go @@ -65,7 +65,7 @@ func (in *initializer) parseSpecificConfig(configFile string) error { func (in *initializer) transformConfig(sourceProcess source.Source, args *Args, additionalArgs []string) error { - in.processEnvVars() + in.processEnvVars(args) switch sourceProcess { case source.Server: @@ -80,11 +80,15 @@ func (in *initializer) transformConfig(sourceProcess source.Source, args *Args, } } -func (in *initializer) processEnvVars() { +func (in *initializer) processEnvVars(args *Args) { if Env("DTAIL_INTEGRATION_TEST_RUN_MODE") { os.Setenv("DTAIL_HOSTNAME_OVERRIDE", "integrationtest") in.Server.MaxLineLength = 1024 } + sshPrivateKeyPathFile := os.Getenv("DTAIL_SSH_PRIVATE_KEYFILE_PATH") + if len(sshPrivateKeyPathFile) > 0 && args.SSHPrivateKeyFilePath == "" { + args.SSHPrivateKeyFilePath = sshPrivateKeyPathFile + } } func (in *initializer) optimusPrime(sourceCb transformCb, args *Args, |