fix: Use stdin/out defined in command (#3199)

mafredri · web-flow · commit 159137dc100f · 2022-07-26T17:23:32.000+03:00
diff --git a/cli/server.go b/cli/server.go
@@ -106,7 +106,7 @@ func server() *cobra.Command {
 		Short: "Start a Coder server",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			printLogo(cmd, spooky)
-			logger := slog.Make(sloghuman.Sink(os.Stderr))
+			logger := slog.Make(sloghuman.Sink(cmd.ErrOrStderr()))
 			if verbose {
 				logger = logger.Leveled(slog.LevelDebug)
 			}
@@ -348,7 +348,7 @@ func server() *cobra.Command {
 			}
 
 			// This prevents the pprof import from being accidentally deleted.
-			var _ = pprof.Handler
+			_ = pprof.Handler
 			if pprofEnabled {
 				//nolint:revive
 				defer serveHandler(cmd.Context(), logger, nil, pprofAddress, "pprof")()
@@ -516,7 +516,7 @@ func server() *cobra.Command {
 		Short: "Run the built-in PostgreSQL deployment.",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cfg := createConfig(cmd)
-			logger := slog.Make(sloghuman.Sink(os.Stderr))
+			logger := slog.Make(sloghuman.Sink(cmd.ErrOrStderr()))
 			if verbose {
 				logger = logger.Leveled(slog.LevelDebug)
 			}
diff --git a/cli/ssh.go b/cli/ssh.go
@@ -127,7 +127,7 @@ func ssh() *cobra.Command {
 
 				ipv6 := peerwg.UUIDToNetaddr(uuid.New())
 				wgn, err := peerwg.New(
-					slog.Make(sloghuman.Sink(os.Stderr)),
+					slog.Make(sloghuman.Sink(cmd.ErrOrStderr())),
 					[]netaddr.IPPrefix{netaddr.IPPrefixFrom(ipv6, 128)},
 				)
 				if err != nil {
@@ -192,14 +192,15 @@ func ssh() *cobra.Command {
 				}
 			}
 
-			stdoutFile, valid := cmd.OutOrStdout().(*os.File)
-			if valid && isatty.IsTerminal(stdoutFile.Fd()) {
-				state, err := term.MakeRaw(int(os.Stdin.Fd()))
+			stdoutFile, validOut := cmd.OutOrStdout().(*os.File)
+			stdinFile, validIn := cmd.InOrStdin().(*os.File)
+			if validOut && validIn && isatty.IsTerminal(stdoutFile.Fd()) {
+				state, err := term.MakeRaw(int(stdinFile.Fd()))
 				if err != nil {
 					return err
 				}
 				defer func() {
-					_ = term.Restore(int(os.Stdin.Fd()), state)
+					_ = term.Restore(int(stdinFile.Fd()), state)
 				}()
 
 				windowChange := listenWindowSize(cmd.Context())
diff --git a/cli/state_test.go b/cli/state_test.go
@@ -2,7 +2,6 @@ package cli_test
 
 import (
 	"bytes"
-	"io"
 	"os"
 	"path/filepath"
 	"strings"
@@ -97,8 +96,6 @@ func TestStatePush(t *testing.T) {
 		err = stateFile.Close()
 		require.NoError(t, err)
 		cmd, root := clitest.New(t, "state", "push", workspace.Name, stateFile.Name())
-		cmd.SetErr(io.Discard)
-		cmd.SetOut(io.Discard)
 		clitest.SetupConfig(t, client, root)
 		err = cmd.Execute()
 		require.NoError(t, err)
diff --git a/cli/templatecreate_test.go b/cli/templatecreate_test.go
@@ -1,7 +1,6 @@
 package cli_test
 
 import (
-	"io"
 	"os"
 	"testing"
 
@@ -219,8 +218,6 @@ func TestTemplateCreate(t *testing.T) {
 			}
 			cmd, root := clitest.New(t, args...)
 			clitest.SetupConfig(t, client, root)
-			cmd.SetOut(io.Discard)
-			cmd.SetErr(io.Discard)
 
 			return cmd.Execute()
 		}
@@ -233,8 +230,6 @@ func TestTemplateCreate(t *testing.T) {
 			}
 			cmd, root := clitest.New(t, args...)
 			clitest.SetupConfig(t, client, root)
-			cmd.SetOut(io.Discard)
-			cmd.SetErr(io.Discard)
 
 			return cmd.Execute()
 		}
diff --git a/cli/templateedit.go b/cli/templateedit.go
@@ -47,7 +47,7 @@ func templateEdit() *cobra.Command {
 			if err != nil {
 				return xerrors.Errorf("update template metadata: %w", err)
 			}
-			_, _ = fmt.Printf("Updated template metadata at %s!\n", cliui.Styles.DateTimeStamp.Render(time.Now().Format(time.Stamp)))
+			_, _ = fmt.Fprintf(cmd.OutOrStdout(), "Updated template metadata at %s!\n", cliui.Styles.DateTimeStamp.Render(time.Now().Format(time.Stamp)))
 			return nil
 		},
 	}
diff --git a/cli/templateupdate.go b/cli/templateupdate.go
@@ -98,7 +98,7 @@ func templateUpdate() *cobra.Command {
 				return err
 			}
 
-			_, _ = fmt.Printf("Updated version at %s!\n", cliui.Styles.DateTimeStamp.Render(time.Now().Format(time.Stamp)))
+			_, _ = fmt.Fprintf(cmd.OutOrStdout(), "Updated version at %s!\n", cliui.Styles.DateTimeStamp.Render(time.Now().Format(time.Stamp)))
 			return nil
 		},
 	}
diff --git a/cli/update.go b/cli/update.go
@@ -30,7 +30,7 @@ func update() *cobra.Command {
 				return err
 			}
 			if !workspace.Outdated && !alwaysPrompt {
-				_, _ = fmt.Printf("Workspace isn't outdated!\n")
+				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "Workspace isn't outdated!\n")
 				return nil
 			}
 			template, err := client.Template(cmd.Context(), workspace.TemplateID)
@@ -74,7 +74,7 @@ func update() *cobra.Command {
 				if !ok {
 					break
 				}
-				_, _ = fmt.Printf("Output: %s\n", log.Output)
+				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "Output: %s\n", log.Output)
 			}
 			return nil
 		},
diff --git a/cli/wireguardtunnel.go b/cli/wireguardtunnel.go
@@ -95,7 +95,7 @@ func wireguardPortForward() *cobra.Command {
 
 			ipv6 := peerwg.UUIDToNetaddr(uuid.New())
 			wgn, err := peerwg.New(
-				slog.Make(sloghuman.Sink(os.Stderr)),
+				slog.Make(sloghuman.Sink(cmd.ErrOrStderr())),
 				[]netaddr.IPPrefix{netaddr.IPPrefixFrom(ipv6, 128)},
 			)
 			if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`package cli_test`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "io"`
`5`	`4`	`"os"`
`6`	`5`	`"testing"`
`7`	`6`
`@@ -219,8 +218,6 @@ func TestTemplateCreate(t *testing.T) {`
`219`	`218`	`}`
`220`	`219`	`cmd, root := clitest.New(t, args...)`
`221`	`220`	`clitest.SetupConfig(t, client, root)`
`222`		`- cmd.SetOut(io.Discard)`
`223`		`- cmd.SetErr(io.Discard)`
`224`	`221`
`225`	`222`	`return cmd.Execute()`
`226`	`223`	`}`
`@@ -233,8 +230,6 @@ func TestTemplateCreate(t *testing.T) {`
`233`	`230`	`}`
`234`	`231`	`cmd, root := clitest.New(t, args...)`
`235`	`232`	`clitest.SetupConfig(t, client, root)`
`236`		`- cmd.SetOut(io.Discard)`
`237`		`- cmd.SetErr(io.Discard)`
`238`	`233`
`239`	`234`	`return cmd.Execute()`
`240`	`235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func templateEdit() *cobra.Command {`
`47`	`47`	`if err != nil {`
`48`	`48`	`return xerrors.Errorf("update template metadata: %w", err)`
`49`	`49`	`}`
`50`		`- _, _ = fmt.Printf("Updated template metadata at %s!\n", cliui.Styles.DateTimeStamp.Render(time.Now().Format(time.Stamp)))`
	`50`	`+ _, _ = fmt.Fprintf(cmd.OutOrStdout(), "Updated template metadata at %s!\n", cliui.Styles.DateTimeStamp.Render(time.Now().Format(time.Stamp)))`
`51`	`51`	`return nil`
`52`	`52`	`},`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ func templateUpdate() *cobra.Command {`
`98`	`98`	`return err`
`99`	`99`	`}`
`100`	`100`
`101`		`- _, _ = fmt.Printf("Updated version at %s!\n", cliui.Styles.DateTimeStamp.Render(time.Now().Format(time.Stamp)))`
	`101`	`+ _, _ = fmt.Fprintf(cmd.OutOrStdout(), "Updated version at %s!\n", cliui.Styles.DateTimeStamp.Render(time.Now().Format(time.Stamp)))`
`102`	`102`	`return nil`
`103`	`103`	`},`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ func update() *cobra.Command {`
`30`	`30`	`return err`
`31`	`31`	`}`
`32`	`32`	`if !workspace.Outdated && !alwaysPrompt {`
`33`		`- _, _ = fmt.Printf("Workspace isn't outdated!\n")`
	`33`	`+ _, _ = fmt.Fprintf(cmd.OutOrStdout(), "Workspace isn't outdated!\n")`
`34`	`34`	`return nil`
`35`	`35`	`}`
`36`	`36`	`template, err := client.Template(cmd.Context(), workspace.TemplateID)`
`@@ -74,7 +74,7 @@ func update() *cobra.Command {`
`74`	`74`	`if !ok {`
`75`	`75`	`break`
`76`	`76`	`}`
`77`		`- _, _ = fmt.Printf("Output: %s\n", log.Output)`
	`77`	`+ _, _ = fmt.Fprintf(cmd.OutOrStdout(), "Output: %s\n", log.Output)`
`78`	`78`	`}`
`79`	`79`	`return nil`
`80`	`80`	`},`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ func wireguardPortForward() *cobra.Command {`
`95`	`95`
`96`	`96`	`ipv6 := peerwg.UUIDToNetaddr(uuid.New())`
`97`	`97`	`wgn, err := peerwg.New(`
`98`		`- slog.Make(sloghuman.Sink(os.Stderr)),`
	`98`	`+ slog.Make(sloghuman.Sink(cmd.ErrOrStderr())),`
`99`	`99`	`[]netaddr.IPPrefix{netaddr.IPPrefixFrom(ipv6, 128)},`
`100`	`100`	`)`
`101`	`101`	`if err != nil {`