May 29, 2025 · May 13, 2025 · May 14, 2025 · May 14, 2025 · May 14, 2025 · May 14, 2025
diff --git a/agent/agent.go b/agent/agent.go
 }

 type Client interface {
 ConnectRPC25(ctx context.Context) (
 proto.DRPCAgentClient25, tailnetproto.DRPCTailnetClient25, error,
 ConnectRPC26(ctx context.Context) (
 proto.DRPCAgentClient26, tailnetproto.DRPCTailnetClient26, error,
 )
 RewriteDERPMap(derpMap *tailcfg.DERPMap)
 }
 a.sessionToken.Store(&sessionToken)

 // ConnectRPC returns the dRPC connection we use for the Agent and Tailnet v2+ APIs
 aAPI, tAPI, err := a.client.ConnectRPC25(a.hardCtx)
 aAPI, tAPI, err := a.client.ConnectRPC26(a.hardCtx)
 if err != nil {
 return err
 }
diff --git a/agent/agenttest/client.go b/agent/agenttest/client.go
 c.derpMapOnce.Do(func() { close(c.derpMapUpdates) })
 }

 func (c *Client)ConnectRPC25(ctx context.Context) (
 agentproto.DRPCAgentClient25, proto.DRPCTailnetClient25, error,
 func (c *Client)ConnectRPC26(ctx context.Context) (
 agentproto.DRPCAgentClient26, proto.DRPCTailnetClient26, error,
 ) {
 conn, lis := drpcsdk.MemTransportPipe()
 c.LastWorkspaceAgent = func() {
 return slices.Clone(f.connectionReports)
 }

 func (*FakeAgentAPI) CreateSubAgent(_ context.Context, _ *agentproto.CreateSubAgentRequest) (*agentproto.CreateSubAgentResponse, error) {
 panic("unimplemented")
 }

 func (*FakeAgentAPI) DeleteSubAgent(_ context.Context, _ *agentproto.DeleteSubAgentRequest) (*agentproto.DeleteSubAgentResponse, error) {
 panic("unimplemented")
 }

 func (*FakeAgentAPI) ListSubAgents(_ context.Context, _ *agentproto.ListSubAgentsRequest) (*agentproto.ListSubAgentsResponse, error) {
 panic("unimplemented")
 }

 func NewFakeAgentAPI(t testing.TB, logger slog.Logger, manifest *agentproto.Manifest, statsCh chan *agentproto.Stats) *FakeAgentAPI {
 return &FakeAgentAPI{
 t:           t,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -95,8 +95,8 @@ type Options struct {
		}

		type Client interface {
		ConnectRPC25(ctx context.Context) (
		proto.DRPCAgentClient25, tailnetproto.DRPCTailnetClient25, error,
		ConnectRPC26(ctx context.Context) (
		proto.DRPCAgentClient26, tailnetproto.DRPCTailnetClient26, error,
		)
		RewriteDERPMap(derpMap *tailcfg.DERPMap)
		}
Expand DownExpand Up		@@ -908,7 +908,7 @@ func (a *agent) run() (retErr error) {
		a.sessionToken.Store(&sessionToken)

		// ConnectRPC returns the dRPC connection we use for the Agent and Tailnet v2+ APIs
		aAPI, tAPI, err := a.client.ConnectRPC25(a.hardCtx)
		aAPI, tAPI, err := a.client.ConnectRPC26(a.hardCtx)
		if err != nil {
		return err
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -98,8 +98,8 @@ func (c *Client) Close() {
		c.derpMapOnce.Do(func() { close(c.derpMapUpdates) })
		}

		func (c *Client)ConnectRPC25(ctx context.Context) (
		agentproto.DRPCAgentClient25, proto.DRPCTailnetClient25, error,
		func (c *Client)ConnectRPC26(ctx context.Context) (
		agentproto.DRPCAgentClient26, proto.DRPCTailnetClient26, error,
		) {
		conn, lis := drpcsdk.MemTransportPipe()
		c.LastWorkspaceAgent = func() {
Expand DownExpand Up		@@ -365,6 +365,18 @@ func (f FakeAgentAPI) GetConnectionReports() []agentproto.ReportConnectionRequ
		return slices.Clone(f.connectionReports)
		}

		func (FakeAgentAPI) CreateSubAgent(_ context.Context, _ agentproto.CreateSubAgentRequest) (*agentproto.CreateSubAgentResponse, error) {
		panic("unimplemented")
		}

		func (FakeAgentAPI) DeleteSubAgent(_ context.Context, _ agentproto.DeleteSubAgentRequest) (*agentproto.DeleteSubAgentResponse, error) {
		panic("unimplemented")
		}

		func (FakeAgentAPI) ListSubAgents(_ context.Context, _ agentproto.ListSubAgentsRequest) (*agentproto.ListSubAgentsResponse, error) {
		panic("unimplemented")
		}

		func NewFakeAgentAPI(t testing.TB, logger slog.Logger, manifest agentproto.Manifest, statsCh chan agentproto.Stats) *FakeAgentAPI {
		return &FakeAgentAPI{
		t: t,
Expand Down