@@ -23,20 +23,18 @@ import (
2323 "github.com/coder/coder/tailnet"
2424)
2525
26- var (
27- // WorkspaceAgentIP is a static IPv6 address with the Tailscale prefix that is used to route
28- // connections from clients to this node. A dynamic address is not required because a Tailnet
29- // client only dials a single agent at a time.
30- WorkspaceAgentIP = netip .MustParseAddr ("fd7a:115c:a1e0:49d6:b259:b7ac:b1b2:48f4" )
31- )
26+ // WorkspaceAgentIP is a static IPv6 address with the Tailscale prefix that is used to route
27+ // connections from clients to this node. A dynamic address is not required because a Tailnet
28+ // client only dials a single agent at a time.
29+ var WorkspaceAgentIP = netip .MustParseAddr ("fd7a:115c:a1e0:49d6:b259:b7ac:b1b2:48f4" )
3230
3331const (
3432 WorkspaceAgentSSHPort = 1
3533 WorkspaceAgentReconnectingPTYPort = 2
3634 WorkspaceAgentSpeedtestPort = 3
37- // WorkspaceAgentStatisticsPort serves a HTTP server with endpoints for gathering
38- // agent statistics.
39- WorkspaceAgentStatisticsPort = 4
35+ // WorkspaceAgentHTTPAPIServerPort serves a HTTP server with endpoints for e.g.
36+ // gathering agent statistics.
37+ WorkspaceAgentHTTPAPIServerPort = 4
4038
4139 // WorkspaceAgentMinimumListeningPort is the minimum port that the listening-ports
4240 // endpoint will return to the client, and the minimum port that is accepted
@@ -282,7 +280,7 @@ type WorkspaceAgentListeningPort struct {
282280func (c * WorkspaceAgentConn ) ListeningPorts (ctx context.Context ) (WorkspaceAgentListeningPortsResponse , error ) {
283281 ctx , span := tracing .StartSpan (ctx )
284282 defer span .End ()
285- res , err := c .requestStatisticsServer (ctx , http .MethodGet , "/api/v0/listening-ports" , nil )
283+ res , err := c .apiRequest (ctx , http .MethodGet , "/api/v0/listening-ports" , nil )
286284 if err != nil {
287285 return WorkspaceAgentListeningPortsResponse {}, xerrors .Errorf ("do request: %w" , err )
288286 }
@@ -295,30 +293,30 @@ func (c *WorkspaceAgentConn) ListeningPorts(ctx context.Context) (WorkspaceAgent
295293 return resp , json .NewDecoder (res .Body ).Decode (& resp )
296294}
297295
298- // requestStatisticsServer makes a request to the workspace agent's statistics server.
299- func (c * WorkspaceAgentConn ) requestStatisticsServer (ctx context.Context , method , path string , body io.Reader ) (* http.Response , error ) {
296+ // apiRequest makes a request to the workspace agent's HTTP API server.
297+ func (c * WorkspaceAgentConn ) apiRequest (ctx context.Context , method , path string , body io.Reader ) (* http.Response , error ) {
300298 ctx , span := tracing .StartSpan (ctx )
301299 defer span .End ()
302- host := net .JoinHostPort (WorkspaceAgentIP .String (), strconv .Itoa (WorkspaceAgentStatisticsPort ))
300+ host := net .JoinHostPort (WorkspaceAgentIP .String (), strconv .Itoa (WorkspaceAgentHTTPAPIServerPort ))
303301 url := fmt .Sprintf ("http://%s%s" , host , path )
304302
305303 req , err := http .NewRequestWithContext (ctx , method , url , body )
306304 if err != nil {
307- return nil , xerrors .Errorf ("new statistics server request to %q: %w" , url , err )
305+ return nil , xerrors .Errorf ("new http api request to %q: %w" , url , err )
308306 }
309307
310- return c .statisticsServerClient ().Do (req )
308+ return c .apiClient ().Do (req )
311309}
312310
313- // statisticsServerClient returns an HTTP client that can be used to make
314- // requests to the workspace agent's statistics server.
315- func (c * WorkspaceAgentConn ) statisticsServerClient () * http.Client {
311+ // apiClient returns an HTTP client that can be used to make
312+ // requests to the workspace agent's HTTP API server.
313+ func (c * WorkspaceAgentConn ) apiClient () * http.Client {
316314 return & http.Client {
317315 Transport : & http.Transport {
318316 // Disable keep alives as we're usually only making a single
319317 // request, and this triggers goleak in tests
320318 DisableKeepAlives : true ,
321- DialContext : func (ctx context.Context , network , addr string ) (net.Conn , error ) {
319+ DialContext : func (_ context.Context , network , addr string ) (net.Conn , error ) {
322320 if network != "tcp" {
323321 return nil , xerrors .Errorf ("network must be tcp" )
324322 }
@@ -328,13 +326,13 @@ func (c *WorkspaceAgentConn) statisticsServerClient() *http.Client {
328326 }
329327 // Verify that host is TailnetIP and port is
330328 // TailnetStatisticsPort.
331- if host != WorkspaceAgentIP .String () || port != strconv .Itoa (WorkspaceAgentStatisticsPort ) {
332- return nil , xerrors .Errorf ("request %q does not appear to be for statistics server " , addr )
329+ if host != WorkspaceAgentIP .String () || port != strconv .Itoa (WorkspaceAgentHTTPAPIServerPort ) {
330+ return nil , xerrors .Errorf ("request %q does not appear to be for http api " , addr )
333331 }
334332
335- conn , err := c .DialContextTCP (context .Background (), netip .AddrPortFrom (WorkspaceAgentIP , WorkspaceAgentStatisticsPort ))
333+ conn , err := c .DialContextTCP (context .Background (), netip .AddrPortFrom (WorkspaceAgentIP , WorkspaceAgentHTTPAPIServerPort ))
336334 if err != nil {
337- return nil , xerrors .Errorf ("dial statistics : %w" , err )
335+ return nil , xerrors .Errorf ("dial http api : %w" , err )
338336 }
339337
340338 return conn , nil
0 commit comments