Commit36636bb

authored

feat: add tailnet to agent RPC service (#11304)

Adds tailnet.DRPCService to the agent APISupports#10531 but we still need to add version negotiation to the websocket endpoint

1 parent25f2abf commit36636bbCopy full SHA for 36636bb

File tree

+23

-0

lines changed

+23

-0

lines changed

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ import (`
`26`	`26`	`"github.com/coder/coder/v2/coderd/tracing"`
`27`	`27`	`"github.com/coder/coder/v2/codersdk/agentsdk"`
`28`	`28`	`"github.com/coder/coder/v2/tailnet"`
	`29`	`+tailnetproto"github.com/coder/coder/v2/tailnet/proto"`
`29`	`30`	`)`
`30`	`31`
`31`	`32`	`constAgentAPIVersionDRPC="2.0"`
`@@ -42,6 +43,7 @@ type API struct {`
`42`	`43`	`*AppsAPI`
`43`	`44`	`*MetadataAPI`
`44`	`45`	`*LogsAPI`
	`46`	`+*tailnet.DRPCService`
`45`	`47`
`46`	`48`	`mu sync.Mutex`
`47`	`49`	`cachedWorkspaceID uuid.UUID`
`@@ -145,6 +147,13 @@ func New(opts Options) *API {`
`145`	`147`	`PublishWorkspaceAgentLogsUpdateFn:opts.PublishWorkspaceAgentLogsUpdateFn,`
`146`	`148`	`}`
`147`	`149`
	`150`	`+api.DRPCService=&tailnet.DRPCService{`
	`151`	`+CoordPtr:opts.TailnetCoordinator,`
	`152`	`+Logger:opts.Log,`
	`153`	`+DerpMapUpdateFrequency:opts.DerpMapUpdateFrequency,`
	`154`	`+DerpMapFn:opts.DerpMapFn,`
	`155`	`+}`
	`156`	`+`
`148`	`157`	`returnapi`
`149`	`158`	`}`
`150`	`159`
`@@ -155,6 +164,11 @@ func (a API) Server(ctx context.Context) (drpcserver.Server, error) {`
`155`	`164`	`returnnil,xerrors.Errorf("register agent API protocol in DRPC mux: %w",err)`
`156`	`165`	`}`
`157`	`166`
	`167`	`+err=tailnetproto.DRPCRegisterTailnet(mux,a)`
	`168`	`+iferr!=nil {`
	`169`	`+returnnil,xerrors.Errorf("register tailnet API protocol in DRPC mux: %w",err)`
	`170`	`+}`
	`171`	`+`
`158`	`172`	`returndrpcserver.NewWithOptions(&tracing.DRPCHandler{Handler:mux},`
`159`	`173`	`drpcserver.Options{`
`160`	`174`	`Log:func(errerror) {`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package coderd`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`	`"database/sql"`
	`6`	`+"fmt"`
`6`	`7`	`"net/http"`
`7`	`8`	`"runtime/pprof"`
`8`	`9`	`"sync/atomic"`
`@@ -22,6 +23,7 @@ import (`
`22`	`23`	`"github.com/coder/coder/v2/coderd/httpmw"`
`23`	`24`	`"github.com/coder/coder/v2/coderd/util/ptr"`
`24`	`25`	`"github.com/coder/coder/v2/codersdk"`
	`26`	`+"github.com/coder/coder/v2/tailnet"`
`25`	`27`	`)`
`26`	`28`
`27`	`29`	`// @Summary Workspace agent RPC API`
`@@ -128,6 +130,13 @@ func (api API) workspaceAgentRPC(rw http.ResponseWriter, r http.Request) {`
`128`	`130`	`UpdateAgentMetricsFn:api.UpdateAgentMetrics,`
`129`	`131`	`})`
`130`	`132`
	`133`	`+streamID:= tailnet.StreamID{`
	`134`	`+Name:fmt.Sprintf("%s-%s-%s",owner.Username,workspace.Name,workspaceAgent.Name),`
	`135`	`+ID:workspaceAgent.ID,`
	`136`	`+Auth: tailnet.AgentTunnelAuth{},`
	`137`	`+}`
	`138`	`+ctx=tailnet.WithStreamID(ctx,streamID)`
	`139`	`+`
`131`	`140`	`closeCtx,closeCtxCancel:=context.WithCancel(ctx)`
`132`	`141`	`gofunc() {`
`133`	`142`	`defercloseCtxCancel()`

Comments

(0)