Commitd9b0988

committed

chore: refactor ServerTailnet to use tailnet.Controllers

1 parentc79d83d commitd9b0988Copy full SHA for d9b0988

File tree

+463

-1226

lines changed

+463

-1226

lines changed

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,6 @@ gen: \`
`507`	`507`	`examples/examples.gen.json\`
`508`	`508`	`tailnet/tailnettest/coordinatormock.go\`
`509`	`509`	`tailnet/tailnettest/coordinateemock.go\`
`510`		`-tailnet/tailnettest/multiagentmock.go\`
`511`	`510`	`coderd/database/pubsub/psmock/psmock.go`
`512`	`511`	`.PHONY: gen`
`513`	`512`
`@@ -537,7 +536,6 @@ gen/mark-fresh:`
`537`	`536`	`examples/examples.gen.json\`
`538`	`537`	`tailnet/tailnettest/coordinatormock.go\`
`539`	`538`	`tailnet/tailnettest/coordinateemock.go\`
`540`		`-tailnet/tailnettest/multiagentmock.go\`
`541`	`539`	`coderd/database/pubsub/psmock/psmock.go\`
`542`	`540`	`"`
`543`	`541`
`@@ -570,7 +568,7 @@ coderd/database/dbmock/dbmock.go: coderd/database/db.go coderd/database/querier.`
`570`	`568`	`coderd/database/pubsub/psmock/psmock.go: coderd/database/pubsub/pubsub.go`
`571`	`569`	`go generate ./coderd/database/pubsub/psmock`
`572`	`570`
`573`		`-tailnet/tailnettest/coordinatormock.gotailnet/tailnettest/multiagentmock.gotailnet/tailnettest/coordinateemock.go: tailnet/coordinator.go tailnet/multiagent.go`
	`571`	`+tailnet/tailnettest/coordinatormock.gotailnet/tailnettest/coordinateemock.go: tailnet/coordinator.go`
`574`	`572`	`go generate ./tailnet/tailnettest/`
`575`	`573`
`576`	`574`	`tailnet/proto/tailnet.pb.go: tailnet/proto/tailnet.proto`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1919,7 +1919,8 @@ func TestAgent_UpdatedDERP(t *testing.T) {`
`1919`	`1919`	`t.Cleanup(testCtxCancel)`
`1920`	`1920`	`clientID:=uuid.New()`
`1921`	`1921`	`ctrl:=tailnet.NewSingleDestController(logger,conn,agentID)`
`1922`		`-coordination:=ctrl.New(tailnet.NewInMemoryCoordinatorClient(logger,clientID,agentID,coordinator))`
	`1922`	`+auth:= tailnet.ClientCoordinateeAuth{AgentID:agentID}`
	`1923`	`+coordination:=ctrl.New(tailnet.NewInMemoryCoordinatorClient(logger,clientID,auth,coordinator))`
`1923`	`1924`	`t.Cleanup(func() {`
`1924`	`1925`	`t.Logf("closing coordination %s",name)`
`1925`	`1926`	`cctx,ccancel:=context.WithTimeout(testCtx,testutil.WaitShort)`
`@@ -2408,8 +2409,9 @@ func setupAgent(t *testing.T, metadata agentsdk.Manifest, ptyTimeout time.Durati`
`2408`	`2409`	`t.Cleanup(testCtxCancel)`
`2409`	`2410`	`clientID:=uuid.New()`
`2410`	`2411`	`ctrl:=tailnet.NewSingleDestController(logger,conn,metadata.AgentID)`
	`2412`	`+auth:= tailnet.ClientCoordinateeAuth{AgentID:metadata.AgentID}`
`2411`	`2413`	`coordination:=ctrl.New(tailnet.NewInMemoryCoordinatorClient(`
`2412`		`-logger,clientID,metadata.AgentID,coordinator))`
	`2414`	`+logger,clientID,auth,coordinator))`
`2413`	`2415`	`t.Cleanup(func() {`
`2414`	`2416`	`cctx,ccancel:=context.WithTimeout(testCtx,testutil.WaitShort)`
`2415`	`2417`	`deferccancel()`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -627,14 +627,17 @@ func New(options Options) API {`
`627`	`627`
`628`	`628`	`api.Auditor.Store(&options.Auditor)`
`629`	`629`	`api.TailnetCoordinator.Store(&options.TailnetCoordinator)`
	`630`	`+dialer:=&InmemTailnetDialer{`
	`631`	`+CoordPtr:&api.TailnetCoordinator,`
	`632`	`+DERPFn:api.DERPMap,`
	`633`	`+Logger:options.Logger,`
	`634`	`+ClientID:uuid.New(),`
	`635`	`+}`
`630`	`636`	`stn,err:=NewServerTailnet(api.ctx,`
`631`	`637`	`options.Logger,`
`632`	`638`	`options.DERPServer,`
`633`		`-api.DERPMap,`
	`639`	`+dialer,`
`634`	`640`	`options.DeploymentValues.DERP.Config.ForceWebSockets.Value(),`
`635`		`-func(context.Context) (tailnet.MultiAgentConn,error) {`
`636`		`-return (*api.TailnetCoordinator.Load()).ServeMultiAgent(uuid.New()),nil`
`637`		`-},`
`638`	`641`	`options.DeploymentValues.DERP.Config.BlockDirect.Value(),`
`639`	`642`	`api.TracerProvider,`
`640`	`643`	`)`

Comments

(0)