fix: stop logging workspace agent unless verbose (coder#13378)

spikecurtis · web-flow · commit 84b3121777ca · 2024-05-29T08:17:35.000+04:00
diff --git a/cli/ping.go b/cli/ping.go
@@ -48,19 +48,17 @@ func (r *RootCmd) ping() *serpent.Command {
 				return err
 			}
 
-			logger := inv.Logger
+			opts := &workspacesdk.DialAgentOptions{}
+
 			if r.verbose {
-				logger = logger.AppendSinks(sloghuman.Sink(inv.Stdout)).Leveled(slog.LevelDebug)
+				opts.Logger = inv.Logger.AppendSinks(sloghuman.Sink(inv.Stdout)).Leveled(slog.LevelDebug)
 			}
 
 			if r.disableDirect {
 				_, _ = fmt.Fprintln(inv.Stderr, "Direct connections disabled.")
+				opts.BlockEndpoints = true
 			}
-			conn, err := workspacesdk.New(client).
-				DialAgent(ctx, workspaceAgent.ID, &workspacesdk.DialAgentOptions{
-					Logger:         logger,
-					BlockEndpoints: r.disableDirect,
-				})
+			conn, err := workspacesdk.New(client).DialAgent(ctx, workspaceAgent.ID, opts)
 			if err != nil {
 				return err
 			}
diff --git a/cli/portforward.go b/cli/portforward.go
@@ -95,19 +95,18 @@ func (r *RootCmd) portForward() *serpent.Command {
 				return xerrors.Errorf("await agent: %w", err)
 			}
 
+			opts := &workspacesdk.DialAgentOptions{}
+
 			logger := inv.Logger
 			if r.verbose {
-				logger = logger.AppendSinks(sloghuman.Sink(inv.Stdout)).Leveled(slog.LevelDebug)
+				opts.Logger = logger.AppendSinks(sloghuman.Sink(inv.Stdout)).Leveled(slog.LevelDebug)
 			}
 
 			if r.disableDirect {
 				_, _ = fmt.Fprintln(inv.Stderr, "Direct connections disabled.")
+				opts.BlockEndpoints = true
 			}
-			conn, err := workspacesdk.New(client).
-				DialAgent(ctx, workspaceAgent.ID, &workspacesdk.DialAgentOptions{
-					Logger:         logger,
-					BlockEndpoints: r.disableDirect,
-				})
+			conn, err := workspacesdk.New(client).DialAgent(ctx, workspaceAgent.ID, opts)
 			if err != nil {
 				return err
 			}
diff --git a/cli/speedtest.go b/cli/speedtest.go
@@ -56,13 +56,9 @@ func (r *RootCmd) speedtest() *serpent.Command {
 				return xerrors.Errorf("await agent: %w", err)
 			}
 
-			logger := inv.Logger.AppendSinks(sloghuman.Sink(inv.Stderr))
+			opts := &workspacesdk.DialAgentOptions{}
 			if r.verbose {
-				logger = logger.Leveled(slog.LevelDebug)
-			}
-
-			opts := &workspacesdk.DialAgentOptions{
-				Logger: logger,
+				opts.Logger = inv.Logger.AppendSinks(sloghuman.Sink(inv.Stderr)).Leveled(slog.LevelDebug)
 			}
 			if r.disableDirect {
 				_, _ = fmt.Fprintln(inv.Stderr, "Direct connections disabled.")

Original file line number	Diff line number	Diff line change
`@@ -48,19 +48,17 @@ func (r RootCmd) ping() serpent.Command {`
`48`	`48`	`return err`
`49`	`49`	`}`
`50`	`50`
`51`		`- logger := inv.Logger`
	`51`	`+ opts := &workspacesdk.DialAgentOptions{}`
	`52`	`+`
`52`	`53`	`if r.verbose {`
`53`		`- logger = logger.AppendSinks(sloghuman.Sink(inv.Stdout)).Leveled(slog.LevelDebug)`
	`54`	`+ opts.Logger = inv.Logger.AppendSinks(sloghuman.Sink(inv.Stdout)).Leveled(slog.LevelDebug)`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`if r.disableDirect {`
`57`	`58`	`_, _ = fmt.Fprintln(inv.Stderr, "Direct connections disabled.")`
	`59`	`+ opts.BlockEndpoints = true`
`58`	`60`	`}`
`59`		`- conn, err := workspacesdk.New(client).`
`60`		`- DialAgent(ctx, workspaceAgent.ID, &workspacesdk.DialAgentOptions{`
`61`		`- Logger: logger,`
`62`		`- BlockEndpoints: r.disableDirect,`
`63`		`- })`
	`61`	`+ conn, err := workspacesdk.New(client).DialAgent(ctx, workspaceAgent.ID, opts)`
`64`	`62`	`if err != nil {`
`65`	`63`	`return err`
`66`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,19 +95,18 @@ func (r RootCmd) portForward() serpent.Command {`
`95`	`95`	`return xerrors.Errorf("await agent: %w", err)`
`96`	`96`	`}`
`97`	`97`
	`98`	`+ opts := &workspacesdk.DialAgentOptions{}`
	`99`	`+`
`98`	`100`	`logger := inv.Logger`
`99`	`101`	`if r.verbose {`
`100`		`- logger = logger.AppendSinks(sloghuman.Sink(inv.Stdout)).Leveled(slog.LevelDebug)`
	`102`	`+ opts.Logger = logger.AppendSinks(sloghuman.Sink(inv.Stdout)).Leveled(slog.LevelDebug)`
`101`	`103`	`}`
`102`	`104`
`103`	`105`	`if r.disableDirect {`
`104`	`106`	`_, _ = fmt.Fprintln(inv.Stderr, "Direct connections disabled.")`
	`107`	`+ opts.BlockEndpoints = true`
`105`	`108`	`}`
`106`		`- conn, err := workspacesdk.New(client).`
`107`		`- DialAgent(ctx, workspaceAgent.ID, &workspacesdk.DialAgentOptions{`
`108`		`- Logger: logger,`
`109`		`- BlockEndpoints: r.disableDirect,`
`110`		`- })`
	`109`	`+ conn, err := workspacesdk.New(client).DialAgent(ctx, workspaceAgent.ID, opts)`
`111`	`110`	`if err != nil {`
`112`	`111`	`return err`
`113`	`112`	`}`