coder
diff --git a/‎agent/proto/agent.pb.go
+15-34 b/‎agent/proto/agent.pb.go
+15-34
diff --git a/‎agent/proto/agent.proto
-3 b/‎agent/proto/agent.proto
-3
diff --git a/‎agent/proto/agent_drpc.pb.go
+1-149 b/‎agent/proto/agent_drpc.pb.go
+1-149
diff --git a/‎coderd/agentapi/api.go
-7 b/‎coderd/agentapi/api.go
-7
diff --git a/‎coderd/agentapi/tailnet.go
-53 b/‎coderd/agentapi/tailnet.go
-53
diff --git a/‎tailnet/client.go
+2-2 b/‎tailnet/client.go
+2-2
@@ -256,7 +256,4 @@ service Agent {
 	rpc UpdateStartup(UpdateStartupRequest) returns (Startup);
 	rpc BatchUpdateMetadata(BatchUpdateMetadataRequest) returns (BatchUpdateMetadataResponse);
 	rpc BatchCreateLogs(BatchCreateLogsRequest) returns (BatchCreateLogsResponse);
-
-	rpc StreamDERPMaps(tailnet.v2.StreamDERPMapsRequest) returns (stream tailnet.v2.DERPMap);
-	rpc CoordinateTailnet(stream tailnet.v2.CoordinateRequest) returns (stream tailnet.v2.CoordinateResponse);
 }
@@ -42,7 +42,6 @@ type API struct {
 	*AppsAPI
 	*MetadataAPI
 	*LogsAPI
-	*TailnetAPI
 
 	mu                sync.Mutex
 	cachedWorkspaceID uuid.UUID
@@ -146,12 +145,6 @@ func New(opts Options) *API {
 		PublishWorkspaceAgentLogsUpdateFn: opts.PublishWorkspaceAgentLogsUpdateFn,
 	}
 
-	api.TailnetAPI = &TailnetAPI{
-		Ctx:                    opts.Ctx,
-		DerpMapFn:              opts.DerpMapFn,
-		DerpMapUpdateFrequency: opts.DerpMapUpdateFrequency,
-	}
-
 	return api
 }
 
 
@@ -11,12 +11,12 @@ import (
 	"github.com/coder/coder/v2/tailnet/proto"
 )
 
-func NewDRPCClient(conn net.Conn) (proto.DRPCClientClient, error) {
+func NewDRPCClient(conn net.Conn) (proto.DRPCTailnetClient, error) {
 	config := yamux.DefaultConfig()
 	config.LogOutput = io.Discard
 	session, err := yamux.Client(conn, config)
 	if err != nil {
 		return nil, xerrors.Errorf("multiplex client: %w", err)
 	}
-	return proto.NewDRPCClientClient(drpc.MultiplexedConn(session)), nil
+	return proto.NewDRPCTailnetClient(drpc.MultiplexedConn(session)), nil
 }
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,4 @@ service Agent {`
`256`	`256`	`rpc UpdateStartup(UpdateStartupRequest) returns (Startup);`
`257`	`257`	`rpc BatchUpdateMetadata(BatchUpdateMetadataRequest) returns (BatchUpdateMetadataResponse);`
`258`	`258`	`rpc BatchCreateLogs(BatchCreateLogsRequest) returns (BatchCreateLogsResponse);`
`259`		`-`
`260`		`- rpc StreamDERPMaps(tailnet.v2.StreamDERPMapsRequest) returns (stream tailnet.v2.DERPMap);`
`261`		`- rpc CoordinateTailnet(stream tailnet.v2.CoordinateRequest) returns (stream tailnet.v2.CoordinateResponse);`
`262`	`259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,12 @@ import (`
`11`	`11`	`"github.com/coder/coder/v2/tailnet/proto"`
`12`	`12`	`)`
`13`	`13`
`14`		`-func NewDRPCClient(conn net.Conn) (proto.DRPCClientClient, error) {`
	`14`	`+func NewDRPCClient(conn net.Conn) (proto.DRPCTailnetClient, error) {`
`15`	`15`	`config := yamux.DefaultConfig()`
`16`	`16`	`config.LogOutput = io.Discard`
`17`	`17`	`session, err := yamux.Client(conn, config)`
`18`	`18`	`if err != nil {`
`19`	`19`	`return nil, xerrors.Errorf("multiplex client: %w", err)`
`20`	`20`	`}`
`21`		`- return proto.NewDRPCClientClient(drpc.MultiplexedConn(session)), nil`
	`21`	`+ return proto.NewDRPCTailnetClient(drpc.MultiplexedConn(session)), nil`
`22`	`22`	`}`