Jan 2, 2024 · Dec 21, 2023
diff --git a/agent/proto/agent.pb.go b/agent/proto/agent.pb.go
diff --git a/agent/proto/agent.proto b/agent/proto/agent.proto
 rpcUpdateStartup(UpdateStartupRequest)returns (Startup);
 rpcBatchUpdateMetadata(BatchUpdateMetadataRequest)returns (BatchUpdateMetadataResponse);
 rpcBatchCreateLogs(BatchCreateLogsRequest)returns (BatchCreateLogsResponse);

 rpcStreamDERPMaps(tailnet.v2.StreamDERPMapsRequest)returns (streamtailnet.v2.DERPMap);
 rpcCoordinateTailnet(streamtailnet.v2.CoordinateRequest)returns (streamtailnet.v2.CoordinateResponse);
 }
diff --git a/agent/proto/agent_drpc.pb.go b/agent/proto/agent_drpc.pb.go
diff --git a/coderd/agentapi/api.go b/coderd/agentapi/api.go
 *AppsAPI
 *MetadataAPI
 *LogsAPI
 *TailnetAPI

 mu                sync.Mutex
 cachedWorkspaceID uuid.UUID
 PublishWorkspaceAgentLogsUpdateFn:opts.PublishWorkspaceAgentLogsUpdateFn,
 }

 api.TailnetAPI=&TailnetAPI{
 Ctx:opts.Ctx,
 DerpMapFn:opts.DerpMapFn,
 DerpMapUpdateFrequency:opts.DerpMapUpdateFrequency,
 }

 returnapi
 }

diff --git a/coderd/agentapi/tailnet.go b/coderd/agentapi/tailnet.go
diff --git a/tailnet/client.go b/tailnet/client.go
 "github.com/coder/coder/v2/tailnet/proto"
 )

 funcNewDRPCClient(conn net.Conn) (proto.DRPCClientClient,error) {
 funcNewDRPCClient(conn net.Conn) (proto.DRPCTailnetClient,error) {
 config:=yamux.DefaultConfig()
 config.LogOutput=io.Discard
 session,err:=yamux.Client(conn,config)
 iferr!=nil {
 returnnil,xerrors.Errorf("multiplex client: %w",err)
 }
 returnproto.NewDRPCClientClient(drpc.MultiplexedConn(session)),nil
 returnproto.NewDRPCTailnetClient(drpc.MultiplexedConn(session)),nil
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -256,7 +256,4 @@ service Agent {
		rpcUpdateStartup(UpdateStartupRequest)returns (Startup);
		rpcBatchUpdateMetadata(BatchUpdateMetadataRequest)returns (BatchUpdateMetadataResponse);
		rpcBatchCreateLogs(BatchCreateLogsRequest)returns (BatchCreateLogsResponse);

		rpcStreamDERPMaps(tailnet.v2.StreamDERPMapsRequest)returns (streamtailnet.v2.DERPMap);
		rpcCoordinateTailnet(streamtailnet.v2.CoordinateRequest)returns (streamtailnet.v2.CoordinateResponse);
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,7 +42,6 @@ type API struct {
		*AppsAPI
		*MetadataAPI
		*LogsAPI
		*TailnetAPI

		mu sync.Mutex
		cachedWorkspaceID uuid.UUID
Expand DownExpand Up		@@ -146,12 +145,6 @@ func New(opts Options) *API {
		PublishWorkspaceAgentLogsUpdateFn:opts.PublishWorkspaceAgentLogsUpdateFn,
		}

		api.TailnetAPI=&TailnetAPI{
		Ctx:opts.Ctx,
		DerpMapFn:opts.DerpMapFn,
		DerpMapUpdateFrequency:opts.DerpMapUpdateFrequency,
		}

		returnapi
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,12 +11,12 @@ import (
		"github.com/coder/coder/v2/tailnet/proto"
		)

		funcNewDRPCClient(conn net.Conn) (proto.DRPCClientClient,error) {
		funcNewDRPCClient(conn net.Conn) (proto.DRPCTailnetClient,error) {
		config:=yamux.DefaultConfig()
		config.LogOutput=io.Discard
		session,err:=yamux.Client(conn,config)
		iferr!=nil {
		returnnil,xerrors.Errorf("multiplex client: %w",err)
		}
		returnproto.NewDRPCClientClient(drpc.MultiplexedConn(session)),nil
		returnproto.NewDRPCTailnetClient(drpc.MultiplexedConn(session)),nil
		}