Move CloseStdin into clibase

ammario · ammario · commit 65cdbcc6da7e · 2023-06-09T19:51:33.000Z
diff --git a/cli/clibase/cmd.go b/cli/clibase/cmd.go
@@ -381,6 +381,16 @@ func (inv *Invocation) run(state *runState) error {
 	return nil
 }
 
+// CloseStdin closes the invocation's Stdin if it is an io.Closer.
+func (inv *Invocation) CloseStdin() error {
+	// If we don't close Stdin, the io.Copy below may
+	// block indefinitely on Stdin Read.
+	if rc, ok := inv.Stdin.(io.Closer); ok {
+		return rc.Close()
+	}
+	return nil
+}
+
 type RunCommandError struct {
 	Cmd *Cmd
 	Err error
diff --git a/cli/ssh.go b/cli/ssh.go
@@ -193,9 +193,7 @@ func (r *RootCmd) ssh() *clibase.Cmd {
 						rawSSH.Close()
 						// If we don't close Stdin, the io.Copy below may
 						// block indefinitely on Stdin Read.
-						if rc, ok := inv.Stdin.(io.Closer); ok {
-							rc.Close()
-						}
+						_ = inv.CloseStdin()
 						return nil
 					}, logger, client, workspace)
 				}()
