chore(deps): replace coral with latest cobra

Author: jsiebens

go.mod

@@ -20,11 +20,11 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/mitchellh/pointerstructure v1.2.1
 	github.com/mr-tron/base58 v1.2.0
-	github.com/muesli/coral v1.0.0
 	github.com/nknorg/encrypted-stream v1.0.1
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/sirupsen/logrus v1.9.0
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
+	github.com/spf13/cobra v1.6.1
 	github.com/stretchr/testify v1.8.1
 	golang.org/x/crypto v0.7.0
 	golang.org/x/oauth2 v0.6.0
@@ -67,12 +67,10 @@ require (
 	github.com/vmihailenco/go-tinylfu v0.2.2 // indirect
 	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	golang.org/x/exp v0.0.0-20230304125523-9ff063c70017 // indirect
 	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/term v0.6.0 // indirect
 	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
-	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 )

go.sum

@@ -4,13 +4,13 @@ import (
 	"fmt"
 	"github.com/jsiebens/brink/internal/client"
 	"github.com/jsiebens/brink/internal/util"
-	"github.com/muesli/coral"
 	"github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
 	"io/ioutil"
 )
 
-func authCommand() *coral.Command {
-	command := &coral.Command{
+func authCommand() *cobra.Command {
+	command := &cobra.Command{
 		Use:   "auth",
 		Short: "Manage credentials for the Brink Client.",
 	}
@@ -21,16 +21,16 @@ func authCommand() *coral.Command {
 	return command
 }
 
-func loginCommand() *coral.Command {
-	command := &coral.Command{
+func loginCommand() *cobra.Command {
+	command := &cobra.Command{
 		Use:          "login",
 		Short:        "Authenticate the Brink Client for a specific Proxy.",
 		SilenceUsage: true,
 	}
 
 	registerProxyFlags(command)
 
-	command.RunE = func(cmd *coral.Command, args []string) error {
+	command.RunE = func(cmd *cobra.Command, args []string) error {
 		logrus.SetOutput(ioutil.Discard)
 
 		proxyAddr := getString(BrinkProxyAddr, proxyAddrFlag)
@@ -44,16 +44,16 @@ func loginCommand() *coral.Command {
 	return command
 }
 
-func revokeCommand() *coral.Command {
-	command := &coral.Command{
+func revokeCommand() *cobra.Command {
+	command := &cobra.Command{
 		Use:          "revoke",
 		Short:        "Delete the current token from the local store.",
 		SilenceUsage: true,
 	}
 
 	registerProxyFlags(command)
 
-	command.RunE = func(cmd *coral.Command, args []string) error {
+	command.RunE = func(cmd *cobra.Command, args []string) error {
 		proxyAddr := getString(BrinkProxyAddr, proxyAddrFlag)
 		if proxyAddr == "" {
 			return fmt.Errorf("required flag --proxy-addr is missing")

internal/cmd/authenticate.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"github.com/jsiebens/brink/internal/client"
 	"github.com/jsiebens/brink/internal/util"
-	"github.com/muesli/coral"
 	"github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
 	"golang.org/x/sys/execabs"
 	"io/ioutil"
 	"net"
@@ -22,16 +22,16 @@ var (
 	showQR        bool
 )
 
-func registerProxyFlags(command *coral.Command) {
+func registerProxyFlags(command *cobra.Command) {
 	command.Flags().StringVarP(&proxyAddrFlag, "proxy-addr", "r", "", fmt.Sprintf("Addr of the Brink proxy. This can also be specified via the environment variable %s.", BrinkProxyAddr))
 	command.Flags().BoolVar(&tlsSkipVerify, "tls-skip-verify", false, "Disable verification of TLS certificates, highly discouraged as it decreases the security of data transmissions.")
 	command.Flags().StringVar(&caFile, "ca-file", "", "Path on the local disk to a single PEM-encoded CA certificate to verify the proxy or server SSL certificate.")
 	command.Flags().BoolVar(&noBrowser, "no-browser", false, "Disable the usage of a browser, just print the login URL")
 	command.Flags().BoolVar(&showQR, "qr", false, "Show QR code for login URLs")
 }
 
-func connectCommand() *coral.Command {
-	command := &coral.Command{
+func connectCommand() *cobra.Command {
+	command := &cobra.Command{
 		Use:          "connect",
 		Short:        "Start a tunnel to a proxy for TCP forwarding through which another process can create a connection (eg. SSH, PostgreSQL) to a remote target.",
 		SilenceUsage: true,
@@ -48,7 +48,7 @@ func connectCommand() *coral.Command {
 	command.Flags().Uint64VarP(&listenPort, "listen-port", "p", 0, "Port on which the client should bind and listen for connections that should be tunneled.")
 	command.Flags().BoolVarP(&listenOnStdin, "listen-on-stdin", "W", false, "If true, the standard input and standard output on the client is forward to the target over the tunnel.")
 
-	command.RunE = func(cmd *coral.Command, args []string) error {
+	command.RunE = func(cmd *cobra.Command, args []string) error {
 		cancelCtx, cancelFunc := context.WithCancel(cmd.Context())
 		defer cancelFunc()
 
@@ -93,8 +93,8 @@ func connectCommand() *coral.Command {
 	return command
 }
 
-func sshCommand() *coral.Command {
-	command := &coral.Command{
+func sshCommand() *cobra.Command {
+	command := &cobra.Command{
 		Use:          "ssh",
 		Short:        "Start a tunnel to a proxy and launches a proxied ssh connection.",
 		SilenceUsage: true,
@@ -107,7 +107,7 @@ func sshCommand() *coral.Command {
 	command.Flags().StringVarP(&targetAddrFlag, "target-addr", "t", "", "Addr of the remote target the connections should be tunneled to.")
 	command.Flags().StringVarP(&username, "username", "u", "", "Specifies the username to pass through to the client")
 
-	command.RunE = func(cmd *coral.Command, args []string) error {
+	command.RunE = func(cmd *cobra.Command, args []string) error {
 		cancelCtx, cancelFunc := context.WithCancel(cmd.Context())
 		defer cancelFunc()
 

internal/cmd/client.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/muesli/coral"
+	"github.com/spf13/cobra"
 	"os"
 )
 
@@ -11,7 +11,7 @@ const (
 )
 
 func Execute() error {
-	rootCmd := &coral.Command{
+	rootCmd := &cobra.Command{
 		Use: "brink",
 	}
 

internal/cmd/cmd.go

@@ -3,17 +3,17 @@ package cmd
 import (
 	"fmt"
 	"github.com/jsiebens/brink/internal/key"
-	"github.com/muesli/coral"
+	"github.com/spf13/cobra"
 )
 
-func keygenCommand() *coral.Command {
-	command := &coral.Command{
+func keygenCommand() *cobra.Command {
+	command := &cobra.Command{
 		Use:          "keygen",
 		Short:        "",
 		SilenceUsage: true,
 	}
 
-	command.RunE = func(cmd *coral.Command, args []string) error {
+	command.RunE = func(cmd *cobra.Command, args []string) error {
 		privateKey, err := key.GeneratePrivateKey()
 		if err != nil {
 			return err

internal/cmd/keygen.go

@@ -5,11 +5,11 @@ import (
 	"github.com/jsiebens/brink/internal/auth"
 	"github.com/jsiebens/brink/internal/config"
 	"github.com/jsiebens/brink/internal/proxy"
-	"github.com/muesli/coral"
+	"github.com/spf13/cobra"
 )
 
-func serverCommand() *coral.Command {
-	command := &coral.Command{
+func serverCommand() *cobra.Command {
+	command := &cobra.Command{
 		Use:          "server",
 		SilenceUsage: true,
 	}
@@ -20,16 +20,16 @@ func serverCommand() *coral.Command {
 	return command
 }
 
-func serverAuthCommand() *coral.Command {
+func serverAuthCommand() *cobra.Command {
 	return createServerCommand("auth", "Start an auth server with a configuration file.", auth.StartServer)
 }
 
-func serverProxyCommand() *coral.Command {
+func serverProxyCommand() *cobra.Command {
 	return createServerCommand("proxy", "Start a proxy server with a configuration file.", proxy.StartServer)
 }
 
-func createServerCommand(use, short string, start func(context.Context, *config.Config) error) *coral.Command {
-	command := &coral.Command{
+func createServerCommand(use, short string, start func(context.Context, *config.Config) error) *cobra.Command {
+	command := &cobra.Command{
 		Use:          use,
 		Short:        short,
 		SilenceUsage: true,
@@ -39,7 +39,7 @@ func createServerCommand(use, short string, start func(context.Context, *config.
 
 	command.Flags().StringVarP(&configFile, "config", "c", "", "Path to the configuration file.")
 
-	command.RunE = func(command *coral.Command, args []string) error {
+	command.RunE = func(command *cobra.Command, args []string) error {
 		c, err := config.LoadConfig(configFile)
 		if err != nil {
 			return err

internal/cmd/server.go

@@ -3,17 +3,17 @@ package cmd
 import (
 	"fmt"
 	"github.com/jsiebens/brink/internal/version"
-	"github.com/muesli/coral"
+	"github.com/spf13/cobra"
 )
 
-func versionCommand() *coral.Command {
-	var command = &coral.Command{
+func versionCommand() *cobra.Command {
+	var command = &cobra.Command{
 		Use:          "version",
 		Short:        "Display version information",
 		SilenceUsage: true,
 	}
 
-	command.Run = func(cmd *coral.Command, args []string) {
+	command.Run = func(cmd *cobra.Command, args []string) {
 		clientVersion, clientRevision := version.GetReleaseInfo()
 		fmt.Printf(`
  Version:       %s 

internal/cmd/version.go

@@ -3,51 +3,8 @@ package util
 import (
 	"io"
 	"net"
-	"sync"
 )
 
-func NewOneConnListener(c net.Conn, addr net.Addr) net.Listener {
-	if addr == nil {
-		addr = dummyAddr("one-conn-listener")
-	}
-	return &oneConnListener{
-		addr: addr,
-		conn: c,
-	}
-}
-
-type oneConnListener struct {
-	addr net.Addr
-
-	mu   sync.Mutex
-	conn net.Conn
-}
-
-func (ln *oneConnListener) Accept() (c net.Conn, err error) {
-	ln.mu.Lock()
-	defer ln.mu.Unlock()
-	c = ln.conn
-	if c == nil {
-		err = io.EOF
-		return
-	}
-	err = nil
-	ln.conn = nil
-	return
-}
-
-func (ln *oneConnListener) Addr() net.Addr { return ln.addr }
-
-func (ln *oneConnListener) Close() error {
-	ln.Accept() // guarantee future call returns io.EOF
-	return nil
-}
-
-type dummyAddr string
-
-func (a dummyAddr) Network() string { return string(a) }
-func (a dummyAddr) String() string  { return string(a) }
-
 func NewAltReadWriteCloserConn(rwc io.ReadWriteCloser, c net.Conn) net.Conn {
 	return wrappedConn{c, rwc}
 }