coder · coadler · Jul 19, 2023 · Jul 18, 2023 · Jul 19, 2023 · Jul 19, 2023
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -199,7 +199,7 @@ func New(options *Options) *API {
 		options.Authorizer,
 		options.Logger.Named("authz_querier"),
 	)
-	experiments := initExperiments(
+	experiments := ReadExperiments(
 		options.Logger, options.DeploymentValues.Experiments.Value(),
 	)
 	if options.AppHostname != "" && options.AppHostnameRegex == nil || options.AppHostname == "" && options.AppHostnameRegex != nil {
@@ -370,7 +370,9 @@ func New(options *Options) *API {
 			options.Logger,
 			options.DERPServer,
 			options.DERPMap,
-			&api.TailnetCoordinator,
+			func(context.Context) (tailnet.MultiAgentConn, error) {
+				return (*api.TailnetCoordinator.Load()).ServeMultiAgent(uuid.New()), nil
+			},
 			wsconncache.New(api._dialWorkspaceAgentTailnet, 0),
 		)
 		if err != nil {
@@ -1081,7 +1083,7 @@ func (api *API) CreateInMemoryProvisionerDaemon(ctx context.Context, debounce ti
 }
 
 // nolint:revive
-func initExperiments(log slog.Logger, raw []string) codersdk.Experiments {
+func ReadExperiments(log slog.Logger, raw []string) codersdk.Experiments {
 	exps := make([]codersdk.Experiment, 0, len(raw))
 	for _, v := range raw {
 		switch v {

diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -384,6 +384,7 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can
 			TemplateScheduleStore:       &templateScheduleStore,
 			TLSCertificates:             options.TLSCertificates,
 			TrialGenerator:              options.TrialGenerator,
+			TailnetCoordinator:          options.Coordinator,
 			DERPMap:                     derpMap,
 			MetricsCacheRefreshInterval: options.MetricsCacheRefreshInterval,
 			AgentStatsRefreshInterval:   options.AgentStatsRefreshInterval,

diff --git a/coderd/httpapi/websocket.go b/coderd/httpapi/websocket.go
@@ -25,3 +25,24 @@ func Heartbeat(ctx context.Context, conn *websocket.Conn) {
 		}
 	}
 }
+
+// Heartbeat loops to ping a WebSocket to keep it alive. It kills the connection
+// on ping failure.
+func HeartbeatClose(ctx context.Context, exit func(), conn *websocket.Conn) {
+	ticker := time.NewTicker(30 * time.Second)
+	defer ticker.Stop()
+
+	for {
+		select {
+		case <-ctx.Done():
+			return
+		case <-ticker.C:
+		}
+		err := conn.Ping(ctx)
+		if err != nil {
+			_ = conn.Close(websocket.StatusGoingAway, "Ping failed")
+			exit()
+			return
+		}
+	}
+}
diff --git a/coderd/httpmw/groupparam.go b/coderd/httpmw/groupparam.go
@@ -64,7 +64,7 @@ func ExtractGroupParam(db database.Store) func(http.Handler) http.Handler {
 		return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
 			ctx := r.Context()
 
-			groupID, parsed := parseUUID(rw, r, "group")
+			groupID, parsed := ParseUUIDParam(rw, r, "group")
 			if !parsed {
 				return
 			}

diff --git a/coderd/httpmw/httpmw.go b/coderd/httpmw/httpmw.go
@@ -11,8 +11,8 @@ import (
 	"github.com/coder/coder/codersdk"
 )
 
-// parseUUID consumes a url parameter and parses it as a UUID.
-func parseUUID(rw http.ResponseWriter, r *http.Request, param string) (uuid.UUID, bool) {
+// ParseUUIDParam consumes a url parameter and parses it as a UUID.
+func ParseUUIDParam(rw http.ResponseWriter, r *http.Request, param string) (uuid.UUID, bool) {
 	rawID := chi.URLParam(r, param)
 	if rawID == "" {
 		httpapi.Write(r.Context(), rw, http.StatusBadRequest, codersdk.Response{

diff --git a/coderd/httpmw/httpmw_internal_test.go b/coderd/httpmw/httpmw_internal_test.go
@@ -29,7 +29,7 @@ func TestParseUUID_Valid(t *testing.T) {
 	ctx.URLParams.Add(testParam, testWorkspaceAgentID)
 	r = r.WithContext(context.WithValue(r.Context(), chi.RouteCtxKey, ctx))
 
-	parsed, ok := parseUUID(rw, r, "workspaceagent")
+	parsed, ok := ParseUUIDParam(rw, r, "workspaceagent")
 	assert.True(t, ok, "UUID should be parsed")
 	assert.Equal(t, testWorkspaceAgentID, parsed.String())
 }
@@ -44,7 +44,7 @@ func TestParseUUID_Invalid(t *testing.T) {
 	ctx.URLParams.Add(testParam, "wrong-id")
 	r = r.WithContext(context.WithValue(r.Context(), chi.RouteCtxKey, ctx))
 
-	_, ok := parseUUID(rw, r, "workspaceagent")
+	_, ok := ParseUUIDParam(rw, r, "workspaceagent")
 	assert.False(t, ok, "UUID should not be parsed")
 	assert.Equal(t, http.StatusBadRequest, rw.Code)
 

diff --git a/coderd/httpmw/organizationparam.go b/coderd/httpmw/organizationparam.go
@@ -39,7 +39,7 @@ func ExtractOrganizationParam(db database.Store) func(http.Handler) http.Handler
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
 			ctx := r.Context()
-			orgID, ok := parseUUID(rw, r, "organization")
+			orgID, ok := ParseUUIDParam(rw, r, "organization")
 			if !ok {
 				return
 			}

diff --git a/coderd/httpmw/templateparam.go b/coderd/httpmw/templateparam.go
@@ -27,7 +27,7 @@ func ExtractTemplateParam(db database.Store) func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
 			ctx := r.Context()
-			templateID, parsed := parseUUID(rw, r, "template")
+			templateID, parsed := ParseUUIDParam(rw, r, "template")
 			if !parsed {
 				return
 			}

diff --git a/coderd/httpmw/templateversionparam.go b/coderd/httpmw/templateversionparam.go
@@ -29,7 +29,7 @@ func ExtractTemplateVersionParam(db database.Store) func(http.Handler) http.Hand
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
 			ctx := r.Context()
-			templateVersionID, parsed := parseUUID(rw, r, "templateversion")
+			templateVersionID, parsed := ParseUUIDParam(rw, r, "templateversion")
 			if !parsed {
 				return
 			}

diff --git a/coderd/httpmw/workspaceagentparam.go b/coderd/httpmw/workspaceagentparam.go
@@ -29,7 +29,7 @@ func ExtractWorkspaceAgentParam(db database.Store) func(http.Handler) http.Handl
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
 			ctx := r.Context()
-			agentUUID, parsed := parseUUID(rw, r, "workspaceagent")
+			agentUUID, parsed := ParseUUIDParam(rw, r, "workspaceagent")
 			if !parsed {
 				return
 			}

diff --git a/coderd/httpmw/workspacebuildparam.go b/coderd/httpmw/workspacebuildparam.go
@@ -27,7 +27,7 @@ func ExtractWorkspaceBuildParam(db database.Store) func(http.Handler) http.Handl
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
 			ctx := r.Context()
-			workspaceBuildID, parsed := parseUUID(rw, r, "workspacebuild")
+			workspaceBuildID, parsed := ParseUUIDParam(rw, r, "workspacebuild")
 			if !parsed {
 				return
 			}

diff --git a/coderd/httpmw/workspaceparam.go b/coderd/httpmw/workspaceparam.go
@@ -30,7 +30,7 @@ func ExtractWorkspaceParam(db database.Store) func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
 			ctx := r.Context()
-			workspaceID, parsed := parseUUID(rw, r, "workspace")
+			workspaceID, parsed := ParseUUIDParam(rw, r, "workspace")
 			if !parsed {
 				return
 			}

diff --git a/coderd/httpmw/workspaceresourceparam.go b/coderd/httpmw/workspaceresourceparam.go
@@ -29,7 +29,7 @@ func ExtractWorkspaceResourceParam(db database.Store) func(http.Handler) http.Ha
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
 			ctx := r.Context()
-			resourceUUID, parsed := parseUUID(rw, r, "workspaceresource")
+			resourceUUID, parsed := ParseUUIDParam(rw, r, "workspaceresource")
 			if !parsed {
 				return
 			}