[fix] Same executable, cli opts, and env to exec (#117)

cmd/exec.go

@@ -33,7 +33,9 @@ var (
 
 func execEntrypoint(cmd *cobra.Command, args []string) {
 	task := cmd.Flags().Lookup("task").Value.String()
-	client, err := getConfig(cmd, "").Client()
+	// can ignore storing rootOpts here as exec just needs a client
+	config := getConfig(cmd, []string{}, "")
+	client, err := config.Client()
 	if err != nil {
 		fmt.Println(fmt.Errorf("could not get client: %v", err))
 		os.Exit(1)

cmd/root.go

@@ -341,10 +341,11 @@ func bindFlags(cmd *cobra.Command, nameToArg map[string]arg) {
 }
 
 func mainEntrypoint(cmd *cobra.Command, args []string) {
-	initialModel, options := setup(cmd, "")
+	dev.Debug("~STARTING UP~")
+	rootOpts := getRootOpts(cmd)
+	initialModel, options := setup(cmd, rootOpts, "")
 	program := tea.NewProgram(initialModel, options...)
 
-	dev.Debug("~STARTING UP~")
 	if _, err := program.Run(); err != nil {
 		fmt.Printf("Error on wander startup: %v", err)
 		os.Exit(1)

cmd/serve.go

@@ -105,12 +105,13 @@ func serveEntrypoint(cmd *cobra.Command, args []string) {
 }
 
 func generateTeaHandler(cmd *cobra.Command) func(ssh.Session) (tea.Model, []tea.ProgramOption) {
+	changedOpts := getRootOpts(cmd.Parent())
 	return func(s ssh.Session) (tea.Model, []tea.ProgramOption) {
 		// optionally override token - MUST run with `-t` flag to force pty, e.g. ssh -p 20000 localhost -t <token>
 		var overrideToken string
 		if sshCommands := s.Command(); len(sshCommands) == 1 {
 			overrideToken = strings.TrimSpace(sshCommands[0])
 		}
-		return setup(cmd, overrideToken)
+		return setup(cmd, changedOpts, overrideToken)
 	}
 }

cmd/util.go

@@ -12,6 +12,7 @@ import (
 	"github.com/robinovitch61/wander/internal/tui/components/app"
 	"github.com/robinovitch61/wander/internal/tui/nomad"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 	"log"
 	"os"
@@ -286,7 +287,7 @@ func customLoggingMiddleware() wish.Middleware {
 	}
 }
 
-func getConfig(cmd *cobra.Command, overrideToken string) app.Config {
+func getConfig(cmd *cobra.Command, rootOpts []string, overrideToken string) app.Config {
 	nomadAddr := retrieveAddress(cmd)
 	nomadToken := retrieveToken(cmd)
 	if overrideToken != "" {
@@ -323,6 +324,7 @@ func getConfig(cmd *cobra.Command, overrideToken string) app.Config {
 	filterWithContext := retrieveFilterWithContext(cmd)
 
 	return app.Config{
+		RootOpts:  rootOpts,
 		Version:   getVersion(),
 		URL:       nomadAddr,
 		Token:     nomadToken,
@@ -361,7 +363,24 @@ func getConfig(cmd *cobra.Command, overrideToken string) app.Config {
 	}
 }
 
-func setup(cmd *cobra.Command, overrideToken string) (app.Model, []tea.ProgramOption) {
-	initialModel := app.InitialModel(getConfig(cmd, overrideToken))
+func getRootOpts(cmd *cobra.Command) []string {
+	if cmd.Name() != "wander" {
+		panic("getRootOpts should only be called on the root wander command, for which both serve and exec are subcommands")
+	}
+	var opts []string
+	cmd.Flags().VisitAll(func(f *pflag.Flag) {
+		if f.Changed {
+			if f.Name != "" {
+				opts = append(opts, fmt.Sprintf("--%s=%s", f.Name, f.Value))
+			} else if f.Shorthand != "" {
+				opts = append(opts, fmt.Sprintf("-%s=%s", f.Shorthand, f.Value))
+			}
+		}
+	})
+	return opts
+}
+
+func setup(cmd *cobra.Command, rootOpts []string, overrideToken string) (app.Model, []tea.ProgramOption) {
+	initialModel := app.InitialModel(getConfig(cmd, rootOpts, overrideToken))
 	return initialModel, []tea.ProgramOption{tea.WithAltScreen()}
 }

internal/tui/components/app/app.go

@@ -15,7 +15,9 @@ import (
 	"github.com/robinovitch61/wander/internal/tui/message"
 	"github.com/robinovitch61/wander/internal/tui/nomad"
 	"github.com/robinovitch61/wander/internal/tui/style"
+	"os"
 	"os/exec"
+	"path"
 	"strings"
 	"time"
 )
@@ -38,6 +40,7 @@ type LogConfig struct {
 }
 
 type Config struct {
+	RootOpts                      []string
 	Version                       string
 	URL, Token, Region, Namespace string
 	HTTPAuth                      string
@@ -266,7 +269,26 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 	case message.PageInputReceivedMsg:
 		if m.currentPage == nomad.ExecPage {
-			c := exec.Command("wander", "exec", m.alloc.ID, "--task", m.taskName, msg.Input)
+			// run the same wander executable even if there is a different one in the path
+			ex, err := os.Executable()
+			if err != nil {
+				m.err = err
+				return m, nil
+			}
+			dir := path.Dir(ex)
+
+			args := []string{"exec"}
+			// pass the same cli opts to wander exec as passed into the current wander root command
+			args = append(args, m.config.RootOpts...)
+			args = append(args, []string{
+				m.alloc.ID,
+				"--task",
+				m.taskName,
+				msg.Input,
+			}...)
+			c := exec.Command(fmt.Sprintf("%s/wander", dir), args...)
+			c.Env = os.Environ()
+
 			stdoutProxy := &nomad.StdoutProxy{}
 			c.Stdout = stdoutProxy
 			m.getCurrentPageModel().SetDoesNeedNewInput()

internal/tui/nomad/exec.go

@@ -13,6 +13,7 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
+	"time"
 )
 
 type ExecCompleteMsg struct {
@@ -111,7 +112,9 @@ func execImpl(client *api.Client, alloc *api.Allocation, task string,
 	command []string, escapeChar string, stdin io.Reader, stdout, stderr io.WriteCloser) (int, error) {
 
 	// attempt to clear screen
+	time.Sleep(10 * time.Millisecond)
 	os.Stdout.Write([]byte("\033c"))
+
 	fmt.Println(fmt.Sprintf("Exec session for %s (%s), task %s", alloc.Name, formatter.ShortAllocID(alloc.ID), task))
 
 	sizeCh := make(chan api.TerminalSize, 1)