From b77d6bdd91f140079fcdc91889753edf033858fc Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Thu, 22 Sep 2022 11:03:49 -0500 Subject: [PATCH] fix: Panic when loading coordination override (#4152) This was broken because of browser-only. This should fix it! Signed-off-by: Kyle Carberry Signed-off-by: Kyle Carberry --- coderd/workspaceagents.go | 7 +++++-- enterprise/coderd/coderd.go | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go index 691564d600..942f0b184f 100644 --- 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 index 237f15ebdc..278b5acd0c 100644 --- 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, }