Jul 26, 2023 · Apr 27, 2023 · May 1, 2023 · May 2, 2023 · May 3, 2023 · May 4, 2023
diff --git a/agent/agent.go b/agent/agent.go
 }
 defer coordinator.Close()
 a.logger.Info(ctx, "connected to coordination endpoint")
 sendNodes, errChan := tailnet.ServeCoordinator(coordinator, func(update tailnet.CoordinatorNodeUpdate) error {
 // Check if we need to update our DERP map.
 if !tailnet.CompareDERPMaps(network.DERPMap(), update.DERPMap) {
 a.logger.Info(ctx, "updating DERP map on connection request due to changes", slog.F("old", network.DERPMap()), slog.F("new", update.DERPMap))
 network.SetDERPMap(update.DERPMap)
 }

 return network.UpdateNodes(update.Nodes, false)
 sendNodes, errChan := tailnet.ServeCoordinator(coordinator, func(nodes []*tailnet.Node) error {
 return network.UpdateNodes(nodes, false)
 })
 network.SetNodeCallback(sendNodes)
 select {
diff --git a/agent/agent_test.go b/agent/agent_test.go
 DERPMap:       &tailcfg.DERPMap{},
 },
 statsChan:   make(chan *agentsdk.Stats),
 coordinator: tailnet.NewCoordinator(logger, emptyDerpMapFn),
 coordinator: tailnet.NewCoordinator(logger),
 }
 closer := agent.New(agent.Options{
 Client:                 client,
 return codersdk.ReadBodyAsError(res)
 },
 statsChan:   make(chan *agentsdk.Stats),
 coordinator: tailnet.NewCoordinator(logger, emptyDerpMapFn),
 coordinator: tailnet.NewCoordinator(logger),
 }
 closer := agent.New(agent.Options{
 Client:                 client,
 ShutdownScript: "echo " + expected,
 },
 statsChan:   make(chan *agentsdk.Stats),
 coordinator: tailnet.NewCoordinator(logger, emptyDerpMapFn),
 coordinator: tailnet.NewCoordinator(logger),
 }

 fs := afero.NewMemMapFs()
 metadata := agentsdk.Manifest{
 DERPMap: &derpMap,
 }
 coordinator := tailnet.NewCoordinator(logger, func() *tailcfg.DERPMap {
 return &derpMap
 })
 coordinator := tailnet.NewCoordinator(logger)
 defer func() {
 _ = coordinator.Close()
 }()
 err := coordinator.ServeClient(serverConn, uuid.New(), agentID)
 assert.NoError(t, err)
 }()
 sendNode, _ := tailnet.ServeCoordinator(clientConn, func(update tailnet.CoordinatorNodeUpdate) error {
 if tailnet.CompareDERPMaps(conn.DERPMap(), update.DERPMap) {
 conn.SetDERPMap(update.DERPMap)
 }
 return conn.UpdateNodes(update.Nodes, false)
 sendNode, _ := tailnet.ServeCoordinator(clientConn, func(nodes []*tailnet.Node) error {
 return conn.UpdateNodes(nodes, false)
 })
 conn.SetNodeCallback(sendNode)

 conn1 := newClientConn()

 // Change the DERP map.
 // TODO: fix this test
 derpMap = *tailnettest.RunDERPAndSTUN(t)
 // Change the region ID.
 derpMap.Regions[2] = derpMap.Regions[1]
 logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
 // After the agent is disconnected from a coordinator, it's supposed
 // to reconnect!
 coordinator := tailnet.NewCoordinator(logger, emptyDerpMapFn)
 coordinator := tailnet.NewCoordinator(logger)
 defer coordinator.Close()

 agentID := uuid.New()
 func TestAgent_WriteVSCodeConfigs(t *testing.T) {
 t.Parallel()
 logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
 coordinator := tailnet.NewCoordinator(logger, emptyDerpMapFn)
 coordinator := tailnet.NewCoordinator(logger)
 defer coordinator.Close()

 client := &client{
 if metadata.DERPMap == nil {
 metadata.DERPMap = tailnettest.RunDERPAndSTUN(t)
 }
 coordinator := tailnet.NewCoordinator(logger, func() *tailcfg.DERPMap {
 return metadata.DERPMap
 })
 coordinator := tailnet.NewCoordinator(logger)
 t.Cleanup(func() {
 _ = coordinator.Close()
 })
 defer close(serveClientDone)
 coordinator.ServeClient(serverConn, uuid.New(), agentID)
 }()
 sendNode, _ := tailnet.ServeCoordinator(clientConn, func(update tailnet.CoordinatorNodeUpdate) error {
 // Don't need to worry about updating the DERP map since it'll never
 // change in this test (as we aren't dealing with proxies etc.)
 return conn.UpdateNodes(update.Nodes, false)
 sendNode, _ := tailnet.ServeCoordinator(clientConn, func(nodes []*tailnet.Node) error {
 return conn.UpdateNodes(nodes, false)
 })
 conn.SetNodeCallback(sendNode)
 agentConn := &codersdk.WorkspaceAgentConn{
 }
 return true
 }

 func emptyDerpMapFn() *tailcfg.DERPMap {
 return &tailcfg.DERPMap{}
 }
diff --git a/cli/netcheck.go b/cli/netcheck.go
 ctx, cancel := context.WithTimeout(inv.Context(), 30*time.Second)
 defer cancel()

 connInfo, err := client.WorkspaceAgentConnectionInfo(ctx)
 connInfo, err := client.WorkspaceAgentConnectionInfoGeneric(ctx)
 if err != nil {
 return err
 }
diff --git a/coderd/coderd.go b/coderd/coderd.go
 if options.DERPServer == nil {
 options.DERPServer = derp.NewServer(key.NewNode(), tailnet.Logger(options.Logger.Named("derp")))
 }
 if options.TailnetCoordinator == nil {
 options.TailnetCoordinator = tailnet.NewCoordinator(options.Logger)
 }
 if options.Auditor == nil {
 options.Auditor = audit.NewNop()
 }
 Experiments:           experiments,
 healthCheckGroup:      &singleflight.Group[string, *healthcheck.Report]{},
 }
 if options.TailnetCoordinator == nil {
 options.TailnetCoordinator = tailnet.NewCoordinator(options.Logger, api.DERPMap)
 }
 if options.HealthcheckFunc == nil {
 options.HealthcheckFunc = func(ctx context.Context, apiKey string) *healthcheck.Report {
 return healthcheck.Run(ctx, &healthcheck.ReportOptions{
diff --git a/...igrations/000126_replica_primary.down.sql → ...igrations/000131_replica_primary.down.sql b/...igrations/000126_replica_primary.down.sql → ...igrations/000131_replica_primary.down.sql
diff --git a/.../migrations/000126_replica_primary.up.sql → .../migrations/000131_replica_primary.up.sql b/.../migrations/000126_replica_primary.up.sql → .../migrations/000131_replica_primary.up.sql
diff --git a/...000127_workspace_proxy_region_id.down.sql → ...000132_workspace_proxy_region_id.down.sql b/...000127_workspace_proxy_region_id.down.sql → ...000132_workspace_proxy_region_id.down.sql
diff --git a/...s/000127_workspace_proxy_region_id.up.sql → ...s/000132_workspace_proxy_region_id.up.sql b/...s/000127_workspace_proxy_region_id.up.sql → ...s/000132_workspace_proxy_region_id.up.sql
diff --git a/coderd/prometheusmetrics/prometheusmetrics_test.go b/coderd/prometheusmetrics/prometheusmetrics_test.go
 derpMapFn := func() *tailcfg.DERPMap {
 return derpMap
 }
 coordinator := tailnet.NewCoordinator(slogtest.Make(t, nil).Leveled(slog.LevelDebug), derpMapFn)
 coordinator := tailnet.NewCoordinator(slogtest.Make(t, nil).Leveled(slog.LevelDebug))
 coordinatorPtr := atomic.Pointer[tailnet.Coordinator]{}
 coordinatorPtr.Store(&coordinator)
 agentInactiveDisconnectTimeout := 1 * time.Hour // don't need to focus on this value in tests
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
 return left
 })

 sendNodes, _ := tailnet.ServeCoordinator(clientConn, func(update tailnet.CoordinatorNodeUpdate) error {
 // Check if we need to update the DERP map used by the connection.
 if !tailnet.CompareDERPMaps(conn.DERPMap(), update.DERPMap) {
 conn.SetDERPMap(update.DERPMap)
 }

 err = conn.UpdateNodes(update.Nodes, true)
 if err != nil {
 return xerrors.Errorf("update nodes: %w", err)
 }
 return nil
 sendNodes, _ := tailnet.ServeCoordinator(clientConn, func(nodes []*tailnet.Node) error {
 return conn.UpdateNodes(nodes, true)
 })
 conn.SetNodeCallback(sendNodes)
 agentConn := &codersdk.WorkspaceAgentConn{
diff --git a/coderd/wsconncache/wsconncache_test.go b/coderd/wsconncache/wsconncache_test.go
 "github.com/stretchr/testify/require"
 "go.uber.org/atomic"
 "go.uber.org/goleak"
 "tailscale.com/tailcfg"

 "cdr.dev/slog"
 "cdr.dev/slog/sloggers/slogtest"
 logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
 manifest.DERPMap = tailnettest.RunDERPAndSTUN(t)

 coordinator := tailnet.NewCoordinator(logger, func() *tailcfg.DERPMap {
 return manifest.DERPMap
 })
 coordinator := tailnet.NewCoordinator(logger)
 t.Cleanup(func() {
 _ = coordinator.Close()
 })
 _ = conn.Close()
 })
 go coordinator.ServeClient(serverConn, uuid.New(), agentID)
 sendNode, _ := tailnet.ServeCoordinator(clientConn, func(update tailnet.CoordinatorNodeUpdate) error {
 // Don't need to worry about updating the DERP map since it'll never
 // change in this test (as we aren't dealing with proxies etc.)
 return conn.UpdateNodes(update.Nodes, false)
 sendNode, _ := tailnet.ServeCoordinator(clientConn, func(nodes []*tailnet.Node) error {
 return conn.UpdateNodes(nodes, false)
 })
 conn.SetNodeCallback(sendNode)
 agentConn := &codersdk.WorkspaceAgentConn{
diff --git a/codersdk/workspaceagents.go b/codersdk/workspaceagents.go
 DisableDirectConnections bool             `json:"disable_direct_connections"`
 }

 func (c *Client) WorkspaceAgentConnectionInfoGeneric(ctx context.Context) (*WorkspaceAgentConnectionInfo, error) {
 func (c *Client) WorkspaceAgentConnectionInfoGeneric(ctx context.Context) (WorkspaceAgentConnectionInfo, error) {
 res, err := c.Request(ctx, http.MethodGet, "/api/v2/workspaceagents/connection", nil)
 if err != nil {
 returnnil, err
 returnWorkspaceAgentConnectionInfo{}, err
 }
 defer res.Body.Close()

 if res.StatusCode != http.StatusOK {
 return nil, ReadBodyAsError(res)
 }

 var info WorkspaceAgentConnectionInfo
 err = json.NewDecoder(res.Body).Decode(&info)
 if err != nil {
 return nil, xerrors.Errorf("decode connection info: %w", err)
 return WorkspaceAgentConnectionInfo{}, ReadBodyAsError(res)
 }

 return &info, nil
 var connInfo WorkspaceAgentConnectionInfo
 return connInfo, json.NewDecoder(res.Body).Decode(&connInfo)
 }

 func (c *Client) WorkspaceAgentConnectionInfo(ctx context.Context, agentID uuid.UUID) (WorkspaceAgentConnectionInfo, error) {
 options.Logger.Debug(ctx, "failed to dial", slog.Error(err))
 continue
 }
 sendNode, errChan := tailnet.ServeCoordinator(websocket.NetConn(ctx, ws, websocket.MessageBinary), func(update tailnet.CoordinatorNodeUpdate) error {
 // Check if we need to update the DERP map used by the connection.
 if !tailnet.CompareDERPMaps(conn.DERPMap(), update.DERPMap) {
 options.Logger.Debug(ctx, "updating DERP map on connection request due to changes", slog.F("old", conn.DERPMap()), slog.F("new", update.DERPMap))
 conn.SetDERPMap(update.DERPMap)
 }
 return conn.UpdateNodes(update.Nodes, false)
 sendNode, errChan := tailnet.ServeCoordinator(websocket.NetConn(ctx, ws, websocket.MessageBinary), func(nodes []*tailnet.Node) error {
 return conn.UpdateNodes(nodes, false)
 })
 conn.SetNodeCallback(sendNode)
 options.Logger.Debug(ctx, "serving coordinator")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -817,14 +817,8 @@ func (a agent) runCoordinator(ctx context.Context, network tailnet.Conn) error
		}
		defer coordinator.Close()
		a.logger.Info(ctx, "connected to coordination endpoint")
		sendNodes, errChan := tailnet.ServeCoordinator(coordinator, func(update tailnet.CoordinatorNodeUpdate) error {
		// Check if we need to update our DERP map.
		if !tailnet.CompareDERPMaps(network.DERPMap(), update.DERPMap) {
		a.logger.Info(ctx, "updating DERP map on connection request due to changes", slog.F("old", network.DERPMap()), slog.F("new", update.DERPMap))
		network.SetDERPMap(update.DERPMap)
		}

		return network.UpdateNodes(update.Nodes, false)
		sendNodes, errChan := tailnet.ServeCoordinator(coordinator, func(nodes []*tailnet.Node) error {
		return network.UpdateNodes(nodes, false)
		})
		network.SetNodeCallback(sendNodes)
		select {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -889,7 +889,7 @@ func TestAgent_StartupScript(t *testing.T) {
		DERPMap: &tailcfg.DERPMap{},
		},
		statsChan: make(chan *agentsdk.Stats),
		coordinator: tailnet.NewCoordinator(logger, emptyDerpMapFn),
		coordinator: tailnet.NewCoordinator(logger),
		}
		closer := agent.New(agent.Options{
		Client: client,
Expand DownExpand Up		@@ -930,7 +930,7 @@ func TestAgent_StartupScript(t *testing.T) {
		return codersdk.ReadBodyAsError(res)
		},
		statsChan: make(chan *agentsdk.Stats),
		coordinator: tailnet.NewCoordinator(logger, emptyDerpMapFn),
		coordinator: tailnet.NewCoordinator(logger),
		}
		closer := agent.New(agent.Options{
		Client: client,
Expand DownExpand Up		@@ -1290,7 +1290,7 @@ func TestAgent_Lifecycle(t *testing.T) {
		ShutdownScript: "echo " + expected,
		},
		statsChan: make(chan *agentsdk.Stats),
		coordinator: tailnet.NewCoordinator(logger, emptyDerpMapFn),
		coordinator: tailnet.NewCoordinator(logger),
		}

		fs := afero.NewMemMapFs()
Expand DownExpand Up		@@ -1538,9 +1538,7 @@ func TestAgent_UpdatedDERP(t *testing.T) {
		metadata := agentsdk.Manifest{
		DERPMap: &derpMap,
		}
		coordinator := tailnet.NewCoordinator(logger, func() *tailcfg.DERPMap {
		return &derpMap
		})
		coordinator := tailnet.NewCoordinator(logger)
		defer func() {
		_ = coordinator.Close()
		}()
Expand DownExpand Up		@@ -1585,11 +1583,8 @@ func TestAgent_UpdatedDERP(t *testing.T) {
		err := coordinator.ServeClient(serverConn, uuid.New(), agentID)
		assert.NoError(t, err)
		}()
		sendNode, _ := tailnet.ServeCoordinator(clientConn, func(update tailnet.CoordinatorNodeUpdate) error {
		if tailnet.CompareDERPMaps(conn.DERPMap(), update.DERPMap) {
		conn.SetDERPMap(update.DERPMap)
		}
		return conn.UpdateNodes(update.Nodes, false)
		sendNode, _ := tailnet.ServeCoordinator(clientConn, func(nodes []*tailnet.Node) error {
		return conn.UpdateNodes(nodes, false)
		})
		conn.SetNodeCallback(sendNode)

Expand All		@@ -1610,6 +1605,7 @@ func TestAgent_UpdatedDERP(t *testing.T) {
		conn1 := newClientConn()

		// Change the DERP map.
		// TODO: fix this test
		derpMap = *tailnettest.RunDERPAndSTUN(t)
		// Change the region ID.
		derpMap.Regions[2] = derpMap.Regions[1]
Expand DownExpand Up		@@ -1651,7 +1647,7 @@ func TestAgent_Reconnect(t *testing.T) {
		logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
		// After the agent is disconnected from a coordinator, it's supposed
		// to reconnect!
		coordinator := tailnet.NewCoordinator(logger, emptyDerpMapFn)
		coordinator := tailnet.NewCoordinator(logger)
		defer coordinator.Close()

		agentID := uuid.New()
Expand DownExpand Up		@@ -1689,7 +1685,7 @@ func TestAgent_Reconnect(t *testing.T) {
		func TestAgent_WriteVSCodeConfigs(t *testing.T) {
		t.Parallel()
		logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
		coordinator := tailnet.NewCoordinator(logger, emptyDerpMapFn)
		coordinator := tailnet.NewCoordinator(logger)
		defer coordinator.Close()

		client := &client{
Expand DownExpand Up		@@ -1803,9 +1799,7 @@ func setupAgent(t *testing.T, metadata agentsdk.Manifest, ptyTimeout time.Durati
		if metadata.DERPMap == nil {
		metadata.DERPMap = tailnettest.RunDERPAndSTUN(t)
		}
		coordinator := tailnet.NewCoordinator(logger, func() *tailcfg.DERPMap {
		return metadata.DERPMap
		})
		coordinator := tailnet.NewCoordinator(logger)
		t.Cleanup(func() {
		_ = coordinator.Close()
		})
Expand DownExpand Up		@@ -1853,10 +1847,8 @@ func setupAgent(t *testing.T, metadata agentsdk.Manifest, ptyTimeout time.Durati
		defer close(serveClientDone)
		coordinator.ServeClient(serverConn, uuid.New(), agentID)
		}()
		sendNode, _ := tailnet.ServeCoordinator(clientConn, func(update tailnet.CoordinatorNodeUpdate) error {
		// Don't need to worry about updating the DERP map since it'll never
		// change in this test (as we aren't dealing with proxies etc.)
		return conn.UpdateNodes(update.Nodes, false)
		sendNode, _ := tailnet.ServeCoordinator(clientConn, func(nodes []*tailnet.Node) error {
		return conn.UpdateNodes(nodes, false)
		})
		conn.SetNodeCallback(sendNode)
		agentConn := &codersdk.WorkspaceAgentConn{
Expand DownExpand Up		@@ -2165,7 +2157,3 @@ func verifyCollectedMetrics(t *testing.T, expected []agentsdk.AgentMetric, actua
		}
		return true
		}

		func emptyDerpMapFn() *tailcfg.DERPMap {
		return &tailcfg.DERPMap{}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,7 +27,7 @@ func (r RootCmd) netcheck() clibase.Cmd {
		ctx, cancel := context.WithTimeout(inv.Context(), 30*time.Second)
		defer cancel()

		connInfo, err := client.WorkspaceAgentConnectionInfo(ctx)
		connInfo, err := client.WorkspaceAgentConnectionInfoGeneric(ctx)
		if err != nil {
		return err
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -232,6 +232,9 @@ func New(options Options) API {
		if options.DERPServer == nil {
		options.DERPServer = derp.NewServer(key.NewNode(), tailnet.Logger(options.Logger.Named("derp")))
		}
		if options.TailnetCoordinator == nil {
		options.TailnetCoordinator = tailnet.NewCoordinator(options.Logger)
		}
		if options.Auditor == nil {
		options.Auditor = audit.NewNop()
		}
Expand DownExpand Up		@@ -318,9 +321,6 @@ func New(options Options) API {
		Experiments: experiments,
		healthCheckGroup: &singleflight.Group[string, *healthcheck.Report]{},
		}
		if options.TailnetCoordinator == nil {
		options.TailnetCoordinator = tailnet.NewCoordinator(options.Logger, api.DERPMap)
		}
		if options.HealthcheckFunc == nil {
		options.HealthcheckFunc = func(ctx context.Context, apiKey string) *healthcheck.Report {
		return healthcheck.Run(ctx, &healthcheck.ReportOptions{
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -304,7 +304,7 @@ func TestAgents(t *testing.T) {
		derpMapFn := func() *tailcfg.DERPMap {
		return derpMap
		}
		coordinator := tailnet.NewCoordinator(slogtest.Make(t, nil).Leveled(slog.LevelDebug), derpMapFn)
		coordinator := tailnet.NewCoordinator(slogtest.Make(t, nil).Leveled(slog.LevelDebug))
		coordinatorPtr := atomic.Pointer[tailnet.Coordinator]{}
		coordinatorPtr.Store(&coordinator)
		agentInactiveDisconnectTimeout := 1 * time.Hour // don't need to focus on this value in tests
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -757,17 +757,8 @@ func (api API) dialWorkspaceAgentTailnet(agentID uuid.UUID) (codersdk.Workspac
		return left
		})

		sendNodes, _ := tailnet.ServeCoordinator(clientConn, func(update tailnet.CoordinatorNodeUpdate) error {
		// Check if we need to update the DERP map used by the connection.
		if !tailnet.CompareDERPMaps(conn.DERPMap(), update.DERPMap) {
		conn.SetDERPMap(update.DERPMap)
		}

		err = conn.UpdateNodes(update.Nodes, true)
		if err != nil {
		return xerrors.Errorf("update nodes: %w", err)
		}
		return nil
		sendNodes, _ := tailnet.ServeCoordinator(clientConn, func(nodes []*tailnet.Node) error {
		return conn.UpdateNodes(nodes, true)
		})
		conn.SetNodeCallback(sendNodes)
		agentConn := &codersdk.WorkspaceAgentConn{
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,7 +20,6 @@ import (
		"github.com/stretchr/testify/require"
		"go.uber.org/atomic"
		"go.uber.org/goleak"
		"tailscale.com/tailcfg"

		"cdr.dev/slog"
		"cdr.dev/slog/sloggers/slogtest"
Expand DownExpand Up		@@ -160,9 +159,7 @@ func setupAgent(t *testing.T, manifest agentsdk.Manifest, ptyTimeout time.Durati
		logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
		manifest.DERPMap = tailnettest.RunDERPAndSTUN(t)

		coordinator := tailnet.NewCoordinator(logger, func() *tailcfg.DERPMap {
		return manifest.DERPMap
		})
		coordinator := tailnet.NewCoordinator(logger)
		t.Cleanup(func() {
		_ = coordinator.Close()
		})
Expand DownExpand Up		@@ -193,10 +190,8 @@ func setupAgent(t *testing.T, manifest agentsdk.Manifest, ptyTimeout time.Durati
		_ = conn.Close()
		})
		go coordinator.ServeClient(serverConn, uuid.New(), agentID)
		sendNode, _ := tailnet.ServeCoordinator(clientConn, func(update tailnet.CoordinatorNodeUpdate) error {
		// Don't need to worry about updating the DERP map since it'll never
		// change in this test (as we aren't dealing with proxies etc.)
		return conn.UpdateNodes(update.Nodes, false)
		sendNode, _ := tailnet.ServeCoordinator(clientConn, func(nodes []*tailnet.Node) error {
		return conn.UpdateNodes(nodes, false)
		})
		conn.SetNodeCallback(sendNode)
		agentConn := &codersdk.WorkspaceAgentConn{
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -171,24 +171,18 @@ type WorkspaceAgentConnectionInfo struct {
		DisableDirectConnections bool `json:"disable_direct_connections"`
		}

		func (c Client) WorkspaceAgentConnectionInfoGeneric(ctx context.Context) (WorkspaceAgentConnectionInfo, error) {
		func (c *Client) WorkspaceAgentConnectionInfoGeneric(ctx context.Context) (WorkspaceAgentConnectionInfo, error) {
		res, err := c.Request(ctx, http.MethodGet, "/api/v2/workspaceagents/connection", nil)
		if err != nil {
		returnnil, err
		returnWorkspaceAgentConnectionInfo{}, err
		}
		defer res.Body.Close()

		if res.StatusCode != http.StatusOK {
		return nil, ReadBodyAsError(res)
		}

		var info WorkspaceAgentConnectionInfo
		err = json.NewDecoder(res.Body).Decode(&info)
		if err != nil {
		return nil, xerrors.Errorf("decode connection info: %w", err)
		return WorkspaceAgentConnectionInfo{}, ReadBodyAsError(res)
		}

		return &info, nil
		var connInfo WorkspaceAgentConnectionInfo
		return connInfo, json.NewDecoder(res.Body).Decode(&connInfo)
		}

		func (c *Client) WorkspaceAgentConnectionInfo(ctx context.Context, agentID uuid.UUID) (WorkspaceAgentConnectionInfo, error) {
Expand DownExpand Up		@@ -295,13 +289,8 @@ func (c *Client) DialWorkspaceAgent(ctx context.Context, agentID uuid.UUID, opti
		options.Logger.Debug(ctx, "failed to dial", slog.Error(err))
		continue
		}
		sendNode, errChan := tailnet.ServeCoordinator(websocket.NetConn(ctx, ws, websocket.MessageBinary), func(update tailnet.CoordinatorNodeUpdate) error {
		// Check if we need to update the DERP map used by the connection.
		if !tailnet.CompareDERPMaps(conn.DERPMap(), update.DERPMap) {
		options.Logger.Debug(ctx, "updating DERP map on connection request due to changes", slog.F("old", conn.DERPMap()), slog.F("new", update.DERPMap))
		conn.SetDERPMap(update.DERPMap)
		}
		return conn.UpdateNodes(update.Nodes, false)
		sendNode, errChan := tailnet.ServeCoordinator(websocket.NetConn(ctx, ws, websocket.MessageBinary), func(nodes []*tailnet.Node) error {
		return conn.UpdateNodes(nodes, false)
		})
		conn.SetNodeCallback(sendNode)
		options.Logger.Debug(ctx, "serving coordinator")
Expand Down