fix: Panic when loading coordination override (coder#4152)

kylecarbs · web-flow · commit b77d6bdd91f1 · 2022-09-22T11:03:49.000-05:00
This was broken because of browser-only. This should fix it!

Signed-off-by: Kyle Carberry &lt;kyle@carberry.com&gt;

Signed-off-by: Kyle Carberry &lt;kyle@carberry.com&gt;
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -405,8 +405,11 @@ func (api *API) workspaceAgentClientCoordinate(rw http.ResponseWriter, r *http.R
 	}
 	// This is used by Enterprise code to control the functionality of this route.
 	override := api.WorkspaceClientCoordinateOverride.Load()
-	if override != nil && (*override)(rw) {
-		return
+	if override != nil {
+		overrideFunc := *override
+		if overrideFunc != nil && overrideFunc(rw) {
+			return
+		}
 	}
 
 	api.websocketWaitMutex.Lock()
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -43,7 +43,9 @@ func New(ctx context.Context, options *Options) (*API, error) {
 				Entitlement: codersdk.EntitlementNotEntitled,
 				Enabled:     false,
 			},
-			auditLogs: codersdk.EntitlementNotEntitled,
+			auditLogs:   codersdk.EntitlementNotEntitled,
+			browserOnly: codersdk.EntitlementNotEntitled,
+			scim:        codersdk.EntitlementNotEntitled,
 		},
 		cancelEntitlementsLoop: cancelFunc,
 	}

Original file line number	Diff line number	Diff line change
`@@ -405,8 +405,11 @@ func (api API) workspaceAgentClientCoordinate(rw http.ResponseWriter, r http.R`
`405`	`405`	`}`
`406`	`406`	`// This is used by Enterprise code to control the functionality of this route.`
`407`	`407`	`override := api.WorkspaceClientCoordinateOverride.Load()`
`408`		`- if override != nil && (*override)(rw) {`
`409`		`- return`
	`408`	`+ if override != nil {`
	`409`	`+ overrideFunc := *override`
	`410`	`+ if overrideFunc != nil && overrideFunc(rw) {`
	`411`	`+ return`
	`412`	`+ }`
`410`	`413`	`}`
`411`	`414`
`412`	`415`	`api.websocketWaitMutex.Lock()`