From 0ae05191a93a7369dfce84fa0860d063ed97f875 Mon Sep 17 00:00:00 2001
From: Colin Adler <colin1adler@gmail.com>
Date: Fri, 3 May 2024 21:59:40 +0000
Subject: [PATCH] fix: prevent stdlib logging from messing up ssh

Fixes https://github.com/coder/coder/issues/13144
---
 cli/server.go | 2 +-
 cli/ssh.go    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cli/server.go b/cli/server.go
index e96c8cacdc744..3706b2ee1bc92 100644
--- 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
index 1aa832fcda27e..aa8bdadb9d0dd 100644
--- 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 {