Cleanup readwriter

coder · kylecarbs · Mar 22, 2022 · Mar 10, 2022 · Mar 10, 2022 · Mar 11, 2022
commit fc8c9505291ce85ecd9599dde13dbf01ecd96770
diff --git a/cli/login_test.go b/cli/login_test.go
@@ -13,7 +13,6 @@ import (
 
 func TestLogin(t *testing.T) {
 	t.Parallel()
-
 	t.Run("InitialUserNoTTY", func(t *testing.T) {
 		t.Parallel()
 		client := coderdtest.New(t, nil)
@@ -29,7 +28,7 @@ func TestLogin(t *testing.T) {
 		// accurately detect Windows ptys when they are not attached to a process:
 		// https://github.com/mattn/go-isatty/issues/59
 		doneChan := make(chan struct{})
-		root, _ := clitest.New(t, "login", client.URL.String())
+		root, _ := clitest.New(t, "login", "--force-tty", client.URL.String())
 		pty := ptytest.New(t)
 		root.SetIn(pty.Input())
 		root.SetOut(pty.Output())
@@ -61,7 +60,7 @@ func TestLogin(t *testing.T) {
 		coderdtest.CreateFirstUser(t, client)
 
 		doneChan := make(chan struct{})
-		root, _ := clitest.New(t, "login", client.URL.String(), "--no-open")
+		root, _ := clitest.New(t, "login", "--force-tty", client.URL.String(), "--no-open")
 		pty := ptytest.New(t)
 		root.SetIn(pty.Input())
 		root.SetOut(pty.Output())

diff --git a/cli/projectcreate.go b/cli/projectcreate.go
@@ -30,7 +30,7 @@ func projectCreate() *cobra.Command {
 		provisioner string
 	)
 	cmd := &cobra.Command{
-		Use:   "create",
+		Use:   "create <name>",
 		Short: "Create a project from the current directory",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			client, err := createClient(cmd)

diff --git a/cli/root.go b/cli/root.go
@@ -13,7 +13,6 @@ import (
 	"github.com/coder/coder/cli/cliui"
 	"github.com/coder/coder/cli/config"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/pty"
 )
 
 var (
@@ -142,10 +141,6 @@ func isTTY(cmd *cobra.Command) bool {
 	if forceTty && err == nil {
 		return true
 	}
-	_, ok := cmd.InOrStdin().(pty.ReadWriter)
-	if ok {
-		return true
-	}
 	file, ok := cmd.InOrStdin().(*os.File)
 	if !ok {
 		return false

diff --git a/pty/pty.go b/pty/pty.go
@@ -14,15 +14,15 @@ type PTY interface {
 	// uses the output stream for writing.
 	//
 	// The same stream could be read to validate output.
-	Output() ReadWriter
+	Output() io.ReadWriter
 
 	// Input handles TTY input.
 	//
 	// cmd.SetInput(pty.Input()) would be used to specify a command
 	// uses the PTY input for reading.
 	//
 	// The same stream would be used to provide user input: pty.Input().Write(...)
-	Input() ReadWriter
+	Input() io.ReadWriter
 
 	// Resize sets the size of the PTY.
 	Resize(cols uint16, rows uint16) error
@@ -33,10 +33,7 @@ func New() (PTY, error) {
 	return newPty()
 }
 
-// ReadWriter implements io.ReadWriter, but is intentionally avoids
-// using the interface to allow for direct access to the reader or
-// writer. This is to enable a caller to grab file descriptors.
-type ReadWriter struct {
+type readWriter struct {
 	io.Reader
 	io.Writer
 }
diff --git a/pty/pty_other.go b/pty/pty_other.go
@@ -4,11 +4,11 @@
 package pty
 
 import (
+	"io"
 	"os"
 	"sync"
 
 	"github.com/creack/pty"
-	"github.com/muesli/cancelreader"
 )
 
 func newPty() (PTY, error) {
@@ -28,15 +28,15 @@ type otherPty struct {
 	pty, tty *os.File
 }
 
-func (p *otherPty) Input() ReadWriter {
-	return ReadWriter{
+func (p *otherPty) Input() io.ReadWriter {
+	return readWriter{
 		Reader: p.tty,
 		Writer: p.pty,
 	}
 }
 
-func (p *otherPty) Output() ReadWriter {
-	return ReadWriter{
+func (p *otherPty) Output() io.ReadWriter {
+	return readWriter{
 		Reader: p.pty,
 		Writer: p.tty,
 	}
@@ -66,7 +66,3 @@ func (p *otherPty) Close() error {
 	}
 	return nil
 }
-
-func (rw ReadWriter) CancelReader() (cancelreader.CancelReader, error) {
-	return cancelreader.NewReader(rw.Reader)
-}
diff --git a/pty/pty_windows.go b/pty/pty_windows.go
@@ -67,15 +67,15 @@ type ptyWindows struct {
 	closed     bool
 }
 
-func (p *ptyWindows) Output() ReadWriter {
-	return ReadWriter{
+func (p *ptyWindows) Output() io.ReadWriter {
+	return readWriter{
 		Reader: p.outputRead,
 		Writer: p.outputWrite,
 	}
 }
 
-func (p *ptyWindows) Input() ReadWriter {
-	return ReadWriter{
+func (p *ptyWindows) Input() io.ReadWriter {
+	return readWriter{
 		Reader: p.inputRead,
 		Writer: p.inputWrite,
 	}
@@ -108,7 +108,3 @@ func (p *ptyWindows) Close() error {
 
 	return nil
 }
-
-func (rw ReadWriter) CancelReader() (cancelreader.CancelReader, error) {
-	return nil, xerrors.New("not implemented")
-}