tiltfile: add stdin_mode='pty' to local_resouce() (#6382)

Allows users to attach a pty,
for interactive commands that try
to grab the "main" tty

fixes #6378

Signed-off-by: Nick Santos <[email protected]>

Author: nicks

internal/tiltfile/api/__init__.py

@@ -1132,7 +1132,9 @@ def local_resource(name: str,
                    readiness_probe: Probe = None,
                    dir: str = "",
                    serve_dir: str = "",
-                   labels: List[str] = []) -> None:
+                   labels: List[str] = [],
+                   stdin_mode: str = "",
+                   serve_stdin_mode: str = "") -> None:
   """Configures one or more commands to run on the *host* machine (not in a remote cluster).
 
   By default, Tilt performs an update on local resources on ``tilt up`` and whenever any of their ``deps`` change.
@@ -1175,6 +1177,8 @@ def local_resource(name: str,
     dir: Working directory for ``cmd``. Defaults to the Tiltfile directory.
     serve_dir: Working directory for ``serve_cmd``. Defaults to the Tiltfile directory.
     labels: used to group resources in the Web UI, (e.g. you want all frontend services displayed together, while test and backend services are displayed separately). A label must start and end with an alphanumeric character, can include ``_``, ``-``, and ``.``, and must be 63 characters or less. For an example, see `Resource Grouping <tiltfile_concepts.html#resource-groups>`_.
+    stdin_mode: Stdin mode for ``cmd``. Set to 'pty' to attach a pseudo terminal.
+    serve_stdin_mode: Stdin mode for ``serve_cmd``. Set to 'pty' to attach a pseudo terminal.
   """
   pass
 

internal/tiltfile/docker.go

@@ -198,7 +198,7 @@ func (s *tiltfileState) dockerBuild(thread *starlark.Thread, fn *starlark.Builti
 		return nil, err
 	}
 
-	entrypointCmd, err := value.ValueToUnixCmd(thread, entrypoint, nil, nil)
+	entrypointCmd, err := value.ValueToUnixCmd(thread, entrypoint, nil, nil, value.StdinMode{})
 	if err != nil {
 		return nil, err
 	}
@@ -342,7 +342,7 @@ func (s *tiltfileState) customBuild(thread *starlark.Thread, fn *starlark.Builti
 		return nil, err
 	}
 
-	entrypointCmd, err := value.ValueToUnixCmd(thread, entrypoint, nil, nil)
+	entrypointCmd, err := value.ValueToUnixCmd(thread, entrypoint, nil, nil, value.StdinMode{})
 	if err != nil {
 		return nil, err
 	}
@@ -360,7 +360,8 @@ func (s *tiltfileState) customBuild(thread *starlark.Thread, fn *starlark.Builti
 		commandBat = commandBatVal
 	}
 
-	command, err := value.ValueGroupToCmdHelper(thread, commandVal, commandBat, dir, env)
+	command, err := value.ValueGroupToCmdHelper(thread,
+		commandVal, commandBat, dir, env, value.StdinMode{})
 	if err != nil {
 		return nil, fmt.Errorf("Argument 2 (command): %v", err)
 	} else if command.Empty() {

internal/tiltfile/files.go

@@ -55,7 +55,9 @@ func (s *tiltfileState) local(thread *starlark.Thread, fn *starlark.Builtin, arg
 		return nil, err
 	}
 
-	cmd, err := value.ValueGroupToCmdHelper(thread, commandValue, commandBatValue, commandDirValue, commandEnv)
+	cmd, err := value.ValueGroupToCmdHelper(thread,
+		commandValue, commandBatValue, commandDirValue,
+		commandEnv, value.StdinMode{})
 	if err != nil {
 		return nil, err
 	}

internal/tiltfile/k8s_custom_deploy.go

@@ -52,14 +52,14 @@ func (s *tiltfileState) k8sCustomDeploy(thread *starlark.Thread, fn *starlark.Bu
 		return nil, err
 	}
 
-	applyCmd, err := value.ValueGroupToCmdHelper(thread, applyCmdVal, applyCmdBatVal, applyCmdDirVal, applyCmdEnv)
+	applyCmd, err := value.ValueGroupToCmdHelper(thread, applyCmdVal, applyCmdBatVal, applyCmdDirVal, applyCmdEnv, value.StdinMode{})
 	if err != nil {
 		return nil, errors.Wrap(err, "apply_cmd")
 	} else if applyCmd.Empty() {
 		return nil, fmt.Errorf("k8s_custom_deploy: apply_cmd cannot be empty")
 	}
 
-	deleteCmd, err := value.ValueGroupToCmdHelper(thread, deleteCmdVal, deleteCmdBatVal, deleteCmdDirVal, deleteCmdEnv)
+	deleteCmd, err := value.ValueGroupToCmdHelper(thread, deleteCmdVal, deleteCmdBatVal, deleteCmdDirVal, deleteCmdEnv, value.StdinMode{})
 	if err != nil {
 		return nil, errors.Wrap(err, "delete_cmd")
 	} else if deleteCmd.Empty() {

internal/tiltfile/live_update.go

@@ -173,7 +173,7 @@ func (s *tiltfileState) liveUpdateRun(thread *starlark.Thread, fn *starlark.Buil
 		return nil, err
 	}
 
-	command, err := value.ValueToUnixCmd(thread, commandVal, nil, nil)
+	command, err := value.ValueToUnixCmd(thread, commandVal, nil, nil, value.StdinMode{})
 	if err != nil {
 		return nil, err
 	}

internal/tiltfile/local_resource.go

@@ -52,6 +52,7 @@ func (s *tiltfileState) localResource(thread *starlark.Thread, fn *starlark.Buil
 	var allowParallel bool
 	var links links.LinkList
 	var labels value.LabelSet
+	var updateStdinMode, serveStdinMode value.StdinMode
 	autoInit := true
 	if fn.Name() == testN {
 		// If we're initializing a test, by default parallelism is on
@@ -78,6 +79,8 @@ func (s *tiltfileState) localResource(thread *starlark.Thread, fn *starlark.Buil
 		"readiness_probe?", &readinessProbe,
 		"dir?", &updateCmdDirVal,
 		"serve_dir?", &serveCmdDirVal,
+		"stdin_mode??", &updateStdinMode,
+		"serve_stdin_mode??", &serveStdinMode,
 	); err != nil {
 		return nil, err
 	}
@@ -92,11 +95,15 @@ func (s *tiltfileState) localResource(thread *starlark.Thread, fn *starlark.Buil
 		return nil, err
 	}
 
-	updateCmd, err := value.ValueGroupToCmdHelper(thread, updateCmdVal, updateCmdBatVal, updateCmdDirVal, updateEnv)
+	updateCmd, err := value.ValueGroupToCmdHelper(thread,
+		updateCmdVal, updateCmdBatVal, updateCmdDirVal, updateEnv,
+		updateStdinMode)
 	if err != nil {
 		return nil, err
 	}
-	serveCmd, err := value.ValueGroupToCmdHelper(thread, serveCmdVal, serveCmdBatVal, serveCmdDirVal, serveEnv)
+	serveCmd, err := value.ValueGroupToCmdHelper(thread,
+		serveCmdVal, serveCmdBatVal, serveCmdDirVal, serveEnv,
+		serveStdinMode)
 	if err != nil {
 		return nil, err
 	}