summaryrefslogtreecommitdiff
path: root/internal/clients
diff options
context:
space:
mode:
authorPaul Bütow <pbuetow@mimecast.com>2020-02-10 14:06:03 +0000
committerPaul Bütow <pbuetow@mimecast.com>2020-02-10 14:06:03 +0000
commit410ca88465f065f244f88c1d4089cb0fa4a45799 (patch)
tree5991a94cf29da0e6599e7263ba9c1cfd9e769a23 /internal/clients
parent75c530dcd9fbe3376f3a3c617663af0303a935e3 (diff)
initial scheduled jobs
Diffstat (limited to 'internal/clients')
-rw-r--r--internal/clients/args.go20
-rw-r--r--internal/clients/baseclient.go3
2 files changed, 14 insertions, 9 deletions
diff --git a/internal/clients/args.go b/internal/clients/args.go
index dea5a9e..f55ce90 100644
--- a/internal/clients/args.go
+++ b/internal/clients/args.go
@@ -2,16 +2,20 @@ package clients
import (
"github.com/mimecast/dtail/internal/omode"
+
+ gossh "golang.org/x/crypto/ssh"
)
// Args is a helper struct to summarize common client arguments.
type Args struct {
- Mode omode.Mode
- ServersStr string
- UserName string
- What string
- Regex string
- TrustAllHosts bool
- Discovery string
- ConnectionsPerCPU int
+ Mode omode.Mode
+ ServersStr string
+ UserName string
+ What string
+ Regex string
+ TrustAllHosts bool
+ Discovery string
+ ConnectionsPerCPU int
+ SSHAuthMethods []gossh.AuthMethod
+ SSHHostKeyCallback gossh.HostKeyCallback
}
diff --git a/internal/clients/baseclient.go b/internal/clients/baseclient.go
index b1540ea..725910a 100644
--- a/internal/clients/baseclient.go
+++ b/internal/clients/baseclient.go
@@ -40,7 +40,8 @@ func (c *baseClient) init(maker maker) {
logger.Info("Initiating base client")
c.maker = maker
- c.sshAuthMethods, c.hostKeyCallback = client.InitSSHAuthMethods(c.TrustAllHosts, c.throttleCh)
+ c.sshAuthMethods, c.hostKeyCallback = client.InitSSHAuthMethods(c.Args, c.throttleCh)
+
discoveryService := discovery.New(c.Discovery, c.ServersStr, discovery.Shuffle)
for _, server := range discoveryService.ServerList() {