Merge branch 'port-forwarding-auth-method' into 'master'

agneum · agneum · commit 18ee555bb9d4 · 2020-08-06T11:35:40.000Z
fix: warn about missing auth method

See merge request postgres-ai/database-lab!132
diff --git a/cmd/cli/commands/port_forwarding.go b/cmd/cli/commands/port_forwarding.go
@@ -6,6 +6,7 @@
 package commands
 
 import (
+	"errors"
 	"fmt"
 	"net"
 	"net/url"
@@ -64,7 +65,11 @@ func getAuthMethod(cliCtx *cli.Context) (ssh.AuthMethod, error) {
 		return authMethod, nil
 	}
 
-	return portfwd.SSHAgent(), nil
+	if sshAgent := portfwd.SSHAgent(); sshAgent != nil {
+		return sshAgent, nil
+	}
+
+	return nil, errors.New("no auth method found. Either define `--identity-file` flag or add your certificate to the SSH agent")
 }
 
 // BuildHostname builds a hostname string.
