Commite2973ba

committed

fixup! feat: add endpoint to get listening ports in agent

1 parentea2027e commite2973baCopy full SHA for e2973ba

File tree

+15

-8

lines changed

+15

-8

lines changed

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`package agent`
`5`	`5`
`6`	`6`	`import (`
`7`		`-"runtime"`
`8`	`7`	`"time"`
`9`	`8`
`10`	`9`	`"github.com/cakturk/go-netstat/netstat"`
`@@ -17,13 +16,6 @@ func (lp *listeningPortsHandler) getListeningPorts() ([]codersdk.ListeningPort,`
`17`	`16`	`lp.mut.Lock()`
`18`	`17`	`deferlp.mut.Unlock()`
`19`	`18`
`20`		`-ifruntime.GOOS!="linux"&&runtime.GOOS!="windows" {`
`21`		`-// Can't scan for ports on non-linux or non-windows systems at the`
`22`		`-// moment. The UI will not show any "no ports found" message to the`
`23`		`-// user, so the user won't suspect a thing.`
`24`		`-return []codersdk.ListeningPort{},nil`
`25`		`-}`
`26`		`-`
`27`	`19`	`iftime.Since(lp.mtime)<time.Second {`
`28`	`20`	`// copy`
`29`	`21`	`ports:=make([]codersdk.ListeningPort,len(lp.ports))`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -227,6 +227,21 @@ func (api API) workspaceAgentListeningPorts(rw http.ResponseWriter, r http.Req`
`227`	`227`	`return`
`228`	`228`	`}`
`229`	`229`
	`230`	`+apiAgent,err:=convertWorkspaceAgent(api.DERPMap,api.TailnetCoordinator,workspaceAgent,nil,api.AgentInactiveDisconnectTimeout)`
	`231`	`+iferr!=nil {`
	`232`	`+httpapi.Write(ctx,rw,http.StatusInternalServerError, codersdk.Response{`
	`233`	`+Message:"Internal error reading workspace agent.",`
	`234`	`+Detail:err.Error(),`
	`235`	`+})`
	`236`	`+return`
	`237`	`+}`
	`238`	`+ifapiAgent.Status!=codersdk.WorkspaceAgentConnected {`
	`239`	`+httpapi.Write(ctx,rw,http.StatusPreconditionRequired, codersdk.Response{`
	`240`	`+Message:fmt.Sprintf("Agent state is %q, it must be in the %q state.",apiAgent.Status,codersdk.WorkspaceAgentConnected),`
	`241`	`+})`
	`242`	`+return`
	`243`	`+}`
	`244`	`+`
`230`	`245`	`agentConn,release,err:=api.workspaceAgentCache.Acquire(r,workspaceAgent.ID)`
`231`	`246`	`iferr!=nil {`
`232`	`247`	`httpapi.Write(ctx,rw,http.StatusInternalServerError, codersdk.Response{`

Comments

(0)