fix: prevent stdlib logging from messing up ssh (#13161)

coadler · web-flow · commit 13dd526f11f9 · 2024-05-03T22:12:06.000Z
Fixes #13144
diff --git a/cli/server.go b/cli/server.go
@@ -1441,7 +1441,7 @@ func newProvisionerDaemon(
 
 			connector[string(database.ProvisionerTypeTerraform)] = sdkproto.NewDRPCProvisionerClient(terraformClient)
 		default:
-			return nil, fmt.Errorf("unknown provisioner type %q", provisionerType)
+			return nil, xerrors.Errorf("unknown provisioner type %q", provisionerType)
 		}
 	}
 
diff --git a/cli/ssh.go b/cli/ssh.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"log"
 	"net/http"
 	"net/url"
 	"os"
@@ -79,6 +80,10 @@ func (r *RootCmd) ssh() *serpent.Command {
 			ctx, cancel := context.WithCancel(ctx)
 			defer cancel()
 
+			// Prevent unnecessary logs from the stdlib from messing up the TTY.
+			// See: https://github.com/coder/coder/issues/13144
+			log.SetOutput(io.Discard)
+
 			logger := inv.Logger
 			defer func() {
 				if retErr != nil {

Original file line number	Diff line number	Diff line change
`@@ -1441,7 +1441,7 @@ func newProvisionerDaemon(`
`1441`	`1441`
`1442`	`1442`	`connector[string(database.ProvisionerTypeTerraform)] = sdkproto.NewDRPCProvisionerClient(terraformClient)`
`1443`	`1443`	`default:`
`1444`		`- return nil, fmt.Errorf("unknown provisioner type %q", provisionerType)`
	`1444`	`+ return nil, xerrors.Errorf("unknown provisioner type %q", provisionerType)`
`1445`	`1445`	`}`
`1446`	`1446`	`}`
`1447`	`1447`