connecters with new config

cmd/config_connect.go

@@ -2,15 +2,14 @@ package cmd
 
 import (
 	"crypto/tls"
-	"fmt"
 	"net"
 
 	"context"
 	"github.com/jinzhu/copier"
-	"github.com/mitchellh/mapstructure"
 	"github.com/pkg/errors"
 	"github.com/problame/go-netssh"
 	"github.com/problame/go-streamrpc"
+	"github.com/zrepl/zrepl/cmd/config"
 	"github.com/zrepl/zrepl/cmd/tlsconf"
 	"time"
 )
@@ -19,34 +18,26 @@ type SSHStdinserverConnecter struct {
 	Host                 string
 	User                 string
 	Port                 uint16
-	IdentityFile         string   `mapstructure:"identity_file"`
+	IdentityFile         string
-	TransportOpenCommand []string `mapstructure:"transport_open_command"`
+	TransportOpenCommand []string
-	SSHCommand           string   `mapstructure:"ssh_command"`
+	SSHCommand           string
 	Options              []string
-	DialTimeout          string `mapstructure:"dial_timeout"`
 	dialTimeout          time.Duration
 }
 
 var _ streamrpc.Connecter = &SSHStdinserverConnecter{}
 
-func parseSSHStdinserverConnecter(i map[string]interface{}) (c *SSHStdinserverConnecter, err error) {
+func parseSSHStdinserverConnecter(in config.SSHStdinserverConnect) (c *SSHStdinserverConnecter, err error) {
 
-	c = &SSHStdinserverConnecter{}
+	c = &SSHStdinserverConnecter{
-	if err = mapstructure.Decode(i, c); err != nil {
+		Host:         in.Host,
-		err = errors.New(fmt.Sprintf("could not parse ssh transport: %s", err))
+		User:         in.User,
-		return nil, err
+		Port:         in.Port,
+		IdentityFile: in.IdentityFile,
+		SSHCommand:   in.SSHCommand,
+		Options:      in.Options,
+		dialTimeout:  in.DialTimeout,
 	}
-
-	if c.DialTimeout != "" {
-		c.dialTimeout, err = time.ParseDuration(c.DialTimeout)
-		if err != nil {
-			return nil, errors.Wrap(err, "cannot parse dial_timeout")
-		}
-	} else {
-		c.dialTimeout = 10 * time.Second
-	}
-
-	// TODO assert fields are filled
 	return
 
 }
@@ -78,54 +69,34 @@ func (c *SSHStdinserverConnecter) Connect(dialCtx context.Context) (net.Conn, er
 }
 
 type TCPConnecter struct {
-	Host      string
+	Address string
-	Port      uint16
+	dialer  net.Dialer
+}
+
+func parseTCPConnecter(in config.TCPConnect) (*TCPConnecter, error) {
+	dialer := net.Dialer{
+		Timeout: in.DialTimeout,
+	}
+
+	return &TCPConnecter{in.Address, dialer}, nil
+}
+
+func (c *TCPConnecter) Connect(dialCtx context.Context) (conn net.Conn, err error) {
+	return c.dialer.DialContext(dialCtx, "tcp", c.Address)
+}
+
+type TLSConnecter struct {
+	Address   string
 	dialer    net.Dialer
 	tlsConfig *tls.Config
 }
 
-func parseTCPConnecter(i map[string]interface{}) (*TCPConnecter, error) {
+func parseTLSConnecter(in config.TLSConnect) (*TLSConnecter, error) {
-	var in struct {
-		Host        string
-		Port        uint16
-		DialTimeout string `mapstructure:"dial_timeout"`
-		TLS         map[string]interface{}
-	}
-	if err := mapstructure.Decode(i, &in); err != nil {
-		return nil, errors.Wrap(err, "mapstructure error")
-	}
-
-	if in.Host == "" || in.Port == 0 {
-		return nil, errors.New("fields 'host' and 'port' must not be empty")
-	}
-	dialTimeout, err := parsePostitiveDuration(in.DialTimeout)
-	if err != nil {
-		if in.DialTimeout != "" {
-			return nil, errors.Wrap(err, "cannot parse field 'dial_timeout'")
-		}
-		dialTimeout = 10 * time.Second
-	}
 	dialer := net.Dialer{
-		Timeout: dialTimeout,
+		Timeout: in.DialTimeout,
 	}
 
-	var tlsConfig *tls.Config
+	ca, err := tlsconf.ParseCAFile(in.Ca)
-	if in.TLS != nil {
-		tlsConfig, err = func(i map[string]interface{}) (config *tls.Config, err error) {
-			var in struct {
-				CA       string
-				Cert     string
-				Key      string
-				ServerCN string `mapstructure:"server_cn"`
-			}
-			if err := mapstructure.Decode(i, &in); err != nil {
-				return nil, errors.Wrap(err, "mapstructure error")
-			}
-			if in.CA == "" || in.Cert == "" || in.Key == "" || in.ServerCN == "" {
-				return nil, errors.New("fields 'ca', 'cert', 'key' and 'server_cn' must be specified")
-			}
-
-			ca, err := tlsconf.ParseCAFile(in.CA)
 	if err != nil {
 		return nil, errors.Wrap(err, "cannot parse ca file")
 	}
@@ -135,20 +106,14 @@ func parseTCPConnecter(i map[string]interface{}) (*TCPConnecter, error) {
 		return nil, errors.Wrap(err, "cannot parse cert/key pair")
 	}
 
-			return tlsconf.ClientAuthClient(in.ServerCN, ca, cert)
+	tlsConfig, err := tlsconf.ClientAuthClient(in.ServerCN, ca, cert)
-		}(in.TLS)
 	if err != nil {
-			return nil, errors.Wrap(err, "cannot parse TLS config in field 'tls'")
+		return nil, errors.Wrap(err, "cannot build tls config")
-		}
 	}
 
-	return &TCPConnecter{in.Host, in.Port, dialer, tlsConfig}, nil
+	return &TLSConnecter{in.Address, dialer, tlsConfig}, nil
 }
 
-func (c *TCPConnecter) Connect(dialCtx context.Context) (conn net.Conn, err error) {
+func (c *TLSConnecter) Connect(dialCtx context.Context) (conn net.Conn, err error) {
-	addr := fmt.Sprintf("%s:%d", c.Host, c.Port)
+	return tls.DialWithDialer(&c.dialer, "tcp", c.Address, c.tlsConfig)
-	if c.tlsConfig != nil {
-		return tls.DialWithDialer(&c.dialer, "tcp", addr, c.tlsConfig)
-	}
-	return c.dialer.DialContext(dialCtx, "tcp", addr)
 }