diff --git a/cli/ping.go b/cli/ping.go
index d20cab81f72c0..82becb016bde7 100644
--- 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
index 2c027a217c5ba..4c0b1d772eecc 100644
--- 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
index db68556a00533..9f8090ef99731 100644
--- 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.")
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy