Let users pass arbitrary flags to psql ssh etc (#159)

* Allow passing along args

* Add to docs

* Use `ArgsLenAtDash` func

* Exit exec model after closing

* Fix panic

cmd/pgcli.go

@@ -15,10 +15,10 @@ import (
 
 // pgcliCmd represents the pgcli command
 var pgcliCmd = &cobra.Command{
-	Use:     "pgcli [postgresID]",
-	Args:    cobra.MaximumNArgs(1),
-	Short:   "Open a pgcli session to a PostgreSQL database",
-	Long:    `Open a pgcli session to a PostgreSQL database. Optionally pass the database id as an argument.`,
+	Use:   "pgcli [postgresID]",
+	Short: "Open a pgcli session to a PostgreSQL database",
+	Long: `Open a pgcli session to a PostgreSQL database. Optionally pass the database id as an argument.
+To pass arguments to pgcli, use the following syntax: render pgcli [postgresID] -- [pgcli args]`,
 	GroupID: GroupSession.ID,
 }
 
@@ -57,6 +57,14 @@ func init() {
 			return err
 		}
 
+		if cmd.ArgsLenAtDash() == 0 {
+			input.PostgresID = ""
+		}
+
+		if cmd.ArgsLenAtDash() >= 0 {
+			input.Args = args[cmd.ArgsLenAtDash():]
+		}
+
 		InteractivePGCLIView(ctx, &input)
 		return nil
 	}

cmd/psql.go

@@ -15,10 +15,10 @@ import (
 
 // psqlCmd represents the psql command
 var psqlCmd = &cobra.Command{
-	Use:     "psql [postgresID]",
-	Args:    cobra.MaximumNArgs(1),
-	Short:   "Open a psql session to a PostgreSQL database",
-	Long:    `Open a psql session to a PostgreSQL database. Optionally pass the database id as an argument.`,
+	Use:   "psql [postgresID]",
+	Short: "Open a psql session to a PostgreSQL database",
+	Long: `Open a psql session to a PostgreSQL database. Optionally pass the database id as an argument.
+To pass arguments to psql, use the following syntax: render psql [postgresID] -- [psql args]`,
 	GroupID: GroupSession.ID,
 }
 
@@ -57,6 +57,14 @@ func init() {
 			return err
 		}
 
+		if cmd.ArgsLenAtDash() == 0 {
+			input.PostgresID = ""
+		}
+
+		if cmd.ArgsLenAtDash() >= 0 {
+			input.Args = args[cmd.ArgsLenAtDash():]
+		}
+
 		InteractivePSQLView(ctx, &input)
 		return nil
 	}

cmd/rediscli.go

@@ -15,10 +15,10 @@ import (
 
 // redisCLICmd represents the redisCLI command
 var redisCLICmd = &cobra.Command{
-	Use:     "redis-cli [redisID]",
-	Args:    cobra.MaximumNArgs(1),
-	Short:   "Open a redis-cli session to a Redis instance",
-	Long:    `Open a redis-cli session to a Redis instance. Optionally pass the redis id as an argument.`,
+	Use:   "redis-cli [redisID]",
+	Short: "Open a redis-cli session to a Redis instance",
+	Long: `Open a redis-cli session to a Redis instance. Optionally pass the redis id as an argument.
+To pass arguments to redis-cli, use the following syntax: render redis-cli [redisID] -- [redis-cli args]`,
 	GroupID: GroupSession.ID,
 }
 
@@ -56,6 +56,14 @@ func init() {
 			return err
 		}
 
+		if cmd.ArgsLenAtDash() == 0 {
+			input.RedisID = ""
+		}
+
+		if cmd.ArgsLenAtDash() >= 0 {
+			input.Args = args[cmd.ArgsLenAtDash():]
+		}
+
 		InteractiveRedisView(ctx, &input)
 		return nil
 	}

cmd/ssh.go

@@ -16,10 +16,10 @@ import (
 
 // sshCmd represents the ssh command
 var sshCmd = &cobra.Command{
-	Use:     "ssh [serviceID]",
-	Args:    cobra.MaximumNArgs(1),
-	Short:   "SSH into a service instance",
-	Long:    `SSH into a service instance. Optionally pass the service id as an argument.`,
+	Use:   "ssh [serviceID]",
+	Short: "SSH into a service instance",
+	Long: `SSH into a service instance. Optionally pass the service id as an argument.
+To pass arguments to ssh, use the following syntax: render ssh [serviceID] -- [ssh args]`,
 	GroupID: GroupSession.ID,
 }
 
@@ -59,6 +59,14 @@ func init() {
 			return err
 		}
 
+		if cmd.ArgsLenAtDash() == 0 {
+			input.ServiceID = ""
+		}
+
+		if cmd.ArgsLenAtDash() >= 0 {
+			input.Args = args[cmd.ArgsLenAtDash():]
+		}
+
 		InteractiveSSHView(ctx, &input, "SSH")
 		return nil
 	}

pkg/tui/exec.go

@@ -48,7 +48,7 @@ func (m *ExecModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				}
 			}
 
-			return nil
+			return ExecDone{}
 		})
 	case ExecDone:
 		return m, func() tea.Msg {

pkg/tui/views/psql.go

@@ -26,6 +26,8 @@ type PSQLInput struct {
 	Project        *client.Project
 	EnvironmentIDs []string
 	Tool           PSQLTool
+
+	Args []string
 }
 
 type PSQLView struct {
@@ -104,7 +106,12 @@ func loadDataPSQL(ctx context.Context, in *PSQLInput) (*exec.Cmd, error) {
 		return nil, err
 	}
 
-	return exec.Command(string(in.Tool), connectionInfo.ExternalConnectionString), nil
+	args := []string{connectionInfo.ExternalConnectionString}
+	for _, arg := range in.Args {
+		args = append(args, arg)
+	}
+
+	return exec.Command(string(in.Tool), args...), nil
 }
 
 func hasAccessToPostgres(pg *client.PostgresDetail, userIP net.IP) (bool, error) {

pkg/tui/views/rediscli.go

@@ -18,6 +18,8 @@ type RedisCLIInput struct {
 	RedisID        string `cli:"arg:0"`
 	Project        *client.Project
 	EnvironmentIDs []string
+
+	Args []string
 }
 
 type RedisCLIView struct {
@@ -94,6 +96,10 @@ func loadDataRedisCLI(ctx context.Context, in *RedisCLIInput) (*exec.Cmd, error)
 		}
 	}
 
+	for _, arg := range in.Args {
+		cmdArgs = append(cmdArgs, arg)
+	}
+
 	cmd := exec.Command("redis-cli", cmdArgs...)
 	cmd.Env = env
 	return cmd, nil

pkg/tui/views/ssh.go

@@ -19,6 +19,8 @@ type SSHInput struct {
 	ServiceID      string `cli:"arg:0"`
 	Project        *client.Project
 	EnvironmentIDs []string
+
+	Args []string
 }
 
 type SSHView struct {
@@ -123,7 +125,12 @@ func loadDataSSH(ctx context.Context, in *SSHInput) (*exec.Cmd, error) {
 		return nil, fmt.Errorf("service does not support ssh")
 	}
 
-	return exec.Command("ssh", *sshAddress), nil
+	args := []string{*sshAddress}
+	for _, arg := range in.Args {
+		args = append(args, arg)
+	}
+
+	return exec.Command("ssh", args...), nil
 }
 
 func (v *SSHView) Init() tea.Cmd {