From a551aa51ab2d4055d17d4e1abde788ad1bf0e5b5 Mon Sep 17 00:00:00 2001 From: Spike Curtis Date: Wed, 29 May 2024 08:07:48 +0400 Subject: [PATCH] fix: respect --disable-direct-connections on coder speedtest (#13377) --- cli/speedtest.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cli/speedtest.go b/cli/speedtest.go index e88872019e..db68556a00 100644 --- a/cli/speedtest.go +++ b/cli/speedtest.go @@ -39,6 +39,10 @@ func (r *RootCmd) speedtest() *serpent.Command { ctx, cancel := context.WithCancel(inv.Context()) defer cancel() + if direct && r.disableDirect { + return xerrors.Errorf("--direct (-d) is incompatible with --%s", varDisableDirect) + } + _, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, false, inv.Args[0]) if err != nil { return err @@ -57,12 +61,13 @@ func (r *RootCmd) speedtest() *serpent.Command { logger = logger.Leveled(slog.LevelDebug) } - if r.disableDirect { - _, _ = fmt.Fprintln(inv.Stderr, "Direct connections disabled.") - } opts := &workspacesdk.DialAgentOptions{ Logger: logger, } + if r.disableDirect { + _, _ = fmt.Fprintln(inv.Stderr, "Direct connections disabled.") + opts.BlockEndpoints = true + } if pcapFile != "" { s := capture.New() opts.CaptureHook = s.LogPacket