Jul 26, 2023 · Apr 27, 2023 · May 1, 2023 · May 2, 2023 · May 3, 2023 · May 4, 2023
diff --git a/agent/agent_test.go b/agent/agent_test.go

 logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)

 derpMap := *tailnettest.RunDERPAndSTUN(t)
 metadata := agentsdk.Manifest{
 DERPMap: &derpMap,
 }
 originalDerpMap, _ := tailnettest.RunDERPAndSTUN(t)
 require.NotNil(t, originalDerpMap)

 coordinator := tailnet.NewCoordinator(logger)
 defer func() {
 _ = coordinator.Close()
 }()
 agentID := uuid.New()
 statsCh := make(chan *agentsdk.Stats, 50)
 fs := afero.NewMemMapFs()
 c := &client{
 t:           t,
 agentID:     agentID,
 manifest:    metadata,
 statsChan:   statsCh,
 coordinator: coordinator,
 }
 client := agenttest.NewClient(t,
 agentID,
 agentsdk.Manifest{
 DERPMap: originalDerpMap,
 // Force DERP.
 DisableDirectConnections: true,
 },
 statsCh,
 coordinator,
 )
 closer := agent.New(agent.Options{
 Client:c,
 Client:client,
 Filesystem:             fs,
 Logger:                 logger.Named("agent"),
 ReconnectingPTYTimeout: time.Minute,
 }()

 // Setup a client connection.
 newClientConn := func() *codersdk.WorkspaceAgentConn {
 newClientConn := func(derpMap *tailcfg.DERPMap) *codersdk.WorkspaceAgentConn {
 conn, err := tailnet.NewConn(&tailnet.Options{
 Addresses: []netip.Prefix{netip.PrefixFrom(tailnet.IP(), 128)},
 DERPMap:metadata.DERPMap,
 DERPMap:derpMap,
 Logger:    logger.Named("client"),
 })
 require.NoError(t, err)
 return conn.UpdateNodes(nodes, false)
 })
 conn.SetNodeCallback(sendNode)
 // Force DERP.
 conn.SetBlockEndpoints(true)

 sdkConn := &codersdk.WorkspaceAgentConn{
 Conn: conn,
 }
 sdkConn := codersdk.NewWorkspaceAgentConn(conn, codersdk.WorkspaceAgentConnOptions{
 AgentID:   agentID,
 CloseFunc: func() error { return codersdk.ErrSkipClose },
 })
 t.Cleanup(func() {
 _ = sdkConn.Close()
 })

 return sdkConn
 }
 conn1 := newClientConn()
 conn1 := newClientConn(originalDerpMap)

 // Change the DERP map.
 // TODO: fix this test
 derpMap = *tailnettest.RunDERPAndSTUN(t)
 newDerpMap, _ := tailnettest.RunDERPAndSTUN(t)
 require.NotNil(t, newDerpMap)

 // Change the region ID.
 derpMap.Regions[2] =derpMap.Regions[1]
 delete(derpMap.Regions, 1)
 derpMap.Regions[2].RegionID = 2
 for _, node := rangederpMap.Regions[2].Nodes {
 newDerpMap.Regions[2] =newDerpMap.Regions[1]
 delete(newDerpMap.Regions, 1)
 newDerpMap.Regions[2].RegionID = 2
 for _, node := rangenewDerpMap.Regions[2].Nodes {
 node.RegionID = 2
 }

 // Push a new DERP map to the agent.
 err := client.PushDERPMapUpdate(agentsdk.DERPMapUpdate{
 DERPMap: newDerpMap,
 })
 require.NoError(t, err)

 // Connect from a second client and make sure it uses the new DERP map.
 conn2 := newClientConn()
 conn2 := newClientConn(newDerpMap)
 require.Equal(t, []int{2}, conn2.DERPMap().RegionIDs())

 // Make sure the first client is still reachable (it received a a DERP map
 // update when the agent's nodes changed).
 // If the first client gets a DERP map update, it should be able to
 // reconnect just fine.
 conn1.SetDERPMap(newDerpMap)
 require.Equal(t, []int{2}, conn1.DERPMap().RegionIDs())
 ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 defer cancel()
 require.True(t, conn1.AwaitReachable(ctx))
 func testSessionOutput(t *testing.T, session *ssh.Session, expected, unexpected []string, expectedRe *regexp.Regexp) {
 t.Helper()

 mu              sync.Mutex // Protects following.
 lifecycleStates []codersdk.WorkspaceAgentLifecycle
 startup         agentsdk.PostStartupRequest
 logs            []agentsdk.StartupLog

 derpMapUpdates chan agentsdk.DERPMapUpdate
 }
 err := session.RequestPty("xterm", 128, 128, ssh.TerminalModes{})
 require.NoError(t, err)

 ptty := ptytest.New(t)
 var stdout bytes.Buffer
 err = session.Shell()
 require.NoError(t, err)

 type closer struct {
 closeFunc func() error
 }

 func (c *closer) Close() error {
 return c.closeFunc()
 }

 func (c *client) DERPMapUpdates(_ context.Context) (<-chan agentsdk.DERPMapUpdate, io.Closer, error) {
 updates := c.derpMapUpdates
 if updates == nil {
 updates = make(chan agentsdk.DERPMapUpdate)
 }

 closed := make(chan struct{})
 return updates, &closer{
 closeFunc: func() error {
 close(closed)
 return nil
 },
 }, nil
 }
 ptty.WriteLine("exit 0")
 err = session.Wait()
 require.NoError(t, err)

 func (c *client) Listen(_ context.Context) (net.Conn, error) {
 clientConn, serverConn := net.Pipe()
 closed := make(chan struct{})
 c.lastWorkspaceAgent = func() {
 _ = serverConn.Close()
 _ = clientConn.Close()
 <-closed
 for _, unexpected := range unexpected {
 require.NotContains(t, stdout.String(), unexpected, "should not show output")
 }
 for _, expect := range expected {
 require.Contains(t, stdout.String(), expect, "should show output")
diff --git a/agent/agenttest/client.go b/agent/agenttest/client.go

 "github.com/google/uuid"
 "golang.org/x/exp/maps"
 "golang.org/x/xerrors"

 "cdr.dev/slog"
 "github.com/coder/coder/codersdk"
 "github.com/coder/coder/codersdk/agentsdk"
 "github.com/coder/coder/tailnet"
 "github.com/coder/coder/testutil"
 )

 func NewClient(t testing.TB,
 manifest.AgentID = agentID
 }
 return &Client{
 t:           t,
 agentID:     agentID,
 manifest:    manifest,
 statsChan:   statsChan,
 coordinator: coordinator,
 t:              t,
 agentID:        agentID,
 manifest:       manifest,
 statsChan:      statsChan,
 coordinator:    coordinator,
 derpMapUpdates: make(chan agentsdk.DERPMapUpdate),
 }
 }

 lifecycleStates []codersdk.WorkspaceAgentLifecycle
 startup         agentsdk.PostStartupRequest
 logs            []agentsdk.StartupLog
 derpMapUpdates  chan agentsdk.DERPMapUpdate
 }

 func (c *Client) Manifest(_ context.Context) (agentsdk.Manifest, error) {
 return codersdk.ServiceBannerConfig{}, nil
 }

 func (c *Client) PushDERPMapUpdate(update agentsdk.DERPMapUpdate) error {
 timer := time.NewTimer(testutil.WaitShort)
 defer timer.Stop()
 select {
 case c.derpMapUpdates <- update:
 case <-timer.C:
 return xerrors.New("timeout waiting to push derp map update")
 }

 return nil
 }

 func (c *Client) DERPMapUpdates(_ context.Context) (<-chan agentsdk.DERPMapUpdate, io.Closer, error) {
 closed := make(chan struct{})
 return c.derpMapUpdates, closeFunc(func() error {
 close(closed)
 return nil
 }), nil
 }

 type closeFunc func() error

 func (c closeFunc) Close() error {
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/coderd.go b/coderd/coderd.go
 r.Get("/regions", api.regions)
 })
 r.Route("/derp-map", func(r chi.Router) {
 r.Use(apiKeyMiddleware)
 //r.Use(apiKeyMiddleware)
 r.Get("/", api.derpMapUpdates)
 })
 r.Route("/deployment", func(r chi.Router) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1721,26 +1721,28 @@ func TestAgent_UpdatedDERP(t *testing.T) {

		logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)

		derpMap := *tailnettest.RunDERPAndSTUN(t)
		metadata := agentsdk.Manifest{
		DERPMap: &derpMap,
		}
		originalDerpMap, _ := tailnettest.RunDERPAndSTUN(t)
		require.NotNil(t, originalDerpMap)

		coordinator := tailnet.NewCoordinator(logger)
		defer func() {
		_ = coordinator.Close()
		}()
		agentID := uuid.New()
		statsCh := make(chan *agentsdk.Stats, 50)
		fs := afero.NewMemMapFs()
		c := &client{
		t: t,
		agentID: agentID,
		manifest: metadata,
		statsChan: statsCh,
		coordinator: coordinator,
		}
		client := agenttest.NewClient(t,
		agentID,
		agentsdk.Manifest{
		DERPMap: originalDerpMap,
		// Force DERP.
		DisableDirectConnections: true,
		},
		statsCh,
		coordinator,
		)
		closer := agent.New(agent.Options{
		Client:c,
		Client:client,
		Filesystem: fs,
		Logger: logger.Named("agent"),
		ReconnectingPTYTimeout: time.Minute,
Expand All		@@ -1750,10 +1752,10 @@ func TestAgent_UpdatedDERP(t *testing.T) {
		}()

		// Setup a client connection.
		newClientConn := func() *codersdk.WorkspaceAgentConn {
		newClientConn := func(derpMap tailcfg.DERPMap) codersdk.WorkspaceAgentConn {
		conn, err := tailnet.NewConn(&tailnet.Options{
		Addresses: []netip.Prefix{netip.PrefixFrom(tailnet.IP(), 128)},
		DERPMap:metadata.DERPMap,
		DERPMap:derpMap,
		Logger: logger.Named("client"),
		})
		require.NoError(t, err)
Expand All		@@ -1774,10 +1776,13 @@ func TestAgent_UpdatedDERP(t *testing.T) {
		return conn.UpdateNodes(nodes, false)
		})
		conn.SetNodeCallback(sendNode)
		// Force DERP.
		conn.SetBlockEndpoints(true)

		sdkConn := &codersdk.WorkspaceAgentConn{
		Conn: conn,
		}
		sdkConn := codersdk.NewWorkspaceAgentConn(conn, codersdk.WorkspaceAgentConnOptions{
		AgentID: agentID,
		CloseFunc: func() error { return codersdk.ErrSkipClose },
		})
		t.Cleanup(func() {
		_ = sdkConn.Close()
		})
Expand All		@@ -1789,25 +1794,34 @@ func TestAgent_UpdatedDERP(t *testing.T) {

		return sdkConn
		}
		conn1 := newClientConn()
		conn1 := newClientConn(originalDerpMap)

		// Change the DERP map.
		// TODO: fix this test
		derpMap = *tailnettest.RunDERPAndSTUN(t)
		newDerpMap, _ := tailnettest.RunDERPAndSTUN(t)
		require.NotNil(t, newDerpMap)

		// Change the region ID.
		derpMap.Regions[2] =derpMap.Regions[1]
		delete(derpMap.Regions, 1)
		derpMap.Regions[2].RegionID = 2
		for _, node := rangederpMap.Regions[2].Nodes {
		newDerpMap.Regions[2] =newDerpMap.Regions[1]
		delete(newDerpMap.Regions, 1)
		newDerpMap.Regions[2].RegionID = 2
		for _, node := rangenewDerpMap.Regions[2].Nodes {
		node.RegionID = 2
		}

		// Push a new DERP map to the agent.
		err := client.PushDERPMapUpdate(agentsdk.DERPMapUpdate{
		DERPMap: newDerpMap,
		})
		require.NoError(t, err)

		// Connect from a second client and make sure it uses the new DERP map.
		conn2 := newClientConn()
		conn2 := newClientConn(newDerpMap)
		require.Equal(t, []int{2}, conn2.DERPMap().RegionIDs())

		// Make sure the first client is still reachable (it received a a DERP map
		// update when the agent's nodes changed).
		// If the first client gets a DERP map update, it should be able to
		// reconnect just fine.
		conn1.SetDERPMap(newDerpMap)
		require.Equal(t, []int{2}, conn1.DERPMap().RegionIDs())
		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
		defer cancel()
		require.True(t, conn1.AwaitReachable(ctx))
Expand DownExpand Up		@@ -2088,13 +2102,8 @@ func assertWritePayload(t *testing.T, w io.Writer, payload []byte) {
		func testSessionOutput(t testing.T, session ssh.Session, expected, unexpected []string, expectedRe *regexp.Regexp) {
		t.Helper()

		mu sync.Mutex // Protects following.
		lifecycleStates []codersdk.WorkspaceAgentLifecycle
		startup agentsdk.PostStartupRequest
		logs []agentsdk.StartupLog

		derpMapUpdates chan agentsdk.DERPMapUpdate
		}
		err := session.RequestPty("xterm", 128, 128, ssh.TerminalModes{})
		require.NoError(t, err)

		ptty := ptytest.New(t)
		var stdout bytes.Buffer
Expand All		@@ -2104,36 +2113,12 @@ func testSessionOutput(t testing.T, session ssh.Session, expected, unexpected
		err = session.Shell()
		require.NoError(t, err)

		type closer struct {
		closeFunc func() error
		}

		func (c *closer) Close() error {
		return c.closeFunc()
		}

		func (c *client) DERPMapUpdates(_ context.Context) (<-chan agentsdk.DERPMapUpdate, io.Closer, error) {
		updates := c.derpMapUpdates
		if updates == nil {
		updates = make(chan agentsdk.DERPMapUpdate)
		}

		closed := make(chan struct{})
		return updates, &closer{
		closeFunc: func() error {
		close(closed)
		return nil
		},
		}, nil
		}
		ptty.WriteLine("exit 0")
		err = session.Wait()
		require.NoError(t, err)

		func (c *client) Listen(_ context.Context) (net.Conn, error) {
		clientConn, serverConn := net.Pipe()
		closed := make(chan struct{})
		c.lastWorkspaceAgent = func() {
		_ = serverConn.Close()
		_ = clientConn.Close()
		<-closed
		for _, unexpected := range unexpected {
		require.NotContains(t, stdout.String(), unexpected, "should not show output")
		}
		for _, expect := range expected {
		require.Contains(t, stdout.String(), expect, "should show output")
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,11 +10,13 @@ import (

		"github.com/google/uuid"
		"golang.org/x/exp/maps"
		"golang.org/x/xerrors"

		"cdr.dev/slog"
		"github.com/coder/coder/codersdk"
		"github.com/coder/coder/codersdk/agentsdk"
		"github.com/coder/coder/tailnet"
		"github.com/coder/coder/testutil"
		)

		func NewClient(t testing.TB,
Expand All		@@ -27,11 +29,12 @@ func NewClient(t testing.TB,
		manifest.AgentID = agentID
		}
		return &Client{
		t: t,
		agentID: agentID,
		manifest: manifest,
		statsChan: statsChan,
		coordinator: coordinator,
		t: t,
		agentID: agentID,
		manifest: manifest,
		statsChan: statsChan,
		coordinator: coordinator,
		derpMapUpdates: make(chan agentsdk.DERPMapUpdate),
		}
		}

Expand All		@@ -50,6 +53,7 @@ type Client struct {
		lifecycleStates []codersdk.WorkspaceAgentLifecycle
		startup agentsdk.PostStartupRequest
		logs []agentsdk.StartupLog
		derpMapUpdates chan agentsdk.DERPMapUpdate
		}

		func (c *Client) Manifest(_ context.Context) (agentsdk.Manifest, error) {
Expand DownExpand Up		@@ -182,6 +186,26 @@ func (c *Client) GetServiceBanner(_ context.Context) (codersdk.ServiceBannerConf
		return codersdk.ServiceBannerConfig{}, nil
		}

		func (c *Client) PushDERPMapUpdate(update agentsdk.DERPMapUpdate) error {
		timer := time.NewTimer(testutil.WaitShort)
		defer timer.Stop()
		select {
		case c.derpMapUpdates <- update:
		case <-timer.C:
		return xerrors.New("timeout waiting to push derp map update")
		}

		return nil
		}

		func (c *Client) DERPMapUpdates(_ context.Context) (<-chan agentsdk.DERPMapUpdate, io.Closer, error) {
		closed := make(chan struct{})
		return c.derpMapUpdates, closeFunc(func() error {
		close(closed)
		return nil
		}), nil
		}

		type closeFunc func() error

		func (c closeFunc) Close() error {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -524,7 +524,7 @@ func New(options Options) API {
		r.Get("/regions", api.regions)
		})
		r.Route("/derp-map", func(r chi.Router) {
		r.Use(apiKeyMiddleware)
		//r.Use(apiKeyMiddleware)
		r.Get("/", api.derpMapUpdates)
		})
		r.Route("/deployment", func(r chi.Router) {
Expand Down