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

deansheather · deansheather · commit e2973bad6b26 · 2022-10-04T17:51:02.000Z
diff --git a/agent/ports_supported.go b/agent/ports_supported.go
@@ -4,7 +4,6 @@
 package agent
 
 import (
-	"runtime"
 	"time"
 
 	"github.com/cakturk/go-netstat/netstat"
@@ -17,13 +16,6 @@ func (lp *listeningPortsHandler) getListeningPorts() ([]codersdk.ListeningPort,
 	lp.mut.Lock()
 	defer lp.mut.Unlock()
 
-	if runtime.GOOS != "linux" && runtime.GOOS != "windows" {
-		// Can't scan for ports on non-linux or non-windows systems at the
-		// moment. The UI will not show any "no ports found" message to the
-		// user, so the user won't suspect a thing.
-		return []codersdk.ListeningPort{}, nil
-	}
-
 	if time.Since(lp.mtime) < time.Second {
 		// copy
 		ports := make([]codersdk.ListeningPort, len(lp.ports))
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -227,6 +227,21 @@ func (api *API) workspaceAgentListeningPorts(rw http.ResponseWriter, r *http.Req
 		return
 	}
 
+	apiAgent, err := convertWorkspaceAgent(api.DERPMap, api.TailnetCoordinator, workspaceAgent, nil, api.AgentInactiveDisconnectTimeout)
+	if err != nil {
+		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
+			Message: "Internal error reading workspace agent.",
+			Detail:  err.Error(),
+		})
+		return
+	}
+	if apiAgent.Status != codersdk.WorkspaceAgentConnected {
+		httpapi.Write(ctx, rw, http.StatusPreconditionRequired, codersdk.Response{
+			Message: fmt.Sprintf("Agent state is %q, it must be in the %q state.", apiAgent.Status, codersdk.WorkspaceAgentConnected),
+		})
+		return
+	}
+
 	agentConn, release, err := api.workspaceAgentCache.Acquire(r, workspaceAgent.ID)
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
