Fix context

kylecarbs · kylecarbs · commit d77cb80a89ff · 2022-09-22T15:06:04.000Z
diff --git a/enterprise/cli/features_test.go b/enterprise/cli/features_test.go
@@ -57,12 +57,14 @@ func TestFeaturesList(t *testing.T) {
 		var entitlements codersdk.Entitlements
 		err := json.Unmarshal(buf.Bytes(), &entitlements)
 		require.NoError(t, err, "unmarshal JSON output")
-		assert.Len(t, entitlements.Features, 2)
+		assert.Len(t, entitlements.Features, 3)
 		assert.Empty(t, entitlements.Warnings)
 		assert.Equal(t, codersdk.EntitlementNotEntitled,
 			entitlements.Features[codersdk.FeatureUserLimit].Entitlement)
 		assert.Equal(t, codersdk.EntitlementNotEntitled,
 			entitlements.Features[codersdk.FeatureAuditLog].Entitlement)
+		assert.Equal(t, codersdk.EntitlementNotEntitled,
+			entitlements.Features[codersdk.FeatureBrowserOnly].Entitlement)
 		assert.False(t, entitlements.HasLicense)
 	})
 }
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -133,8 +133,9 @@ func (api *API) updateEntitlements(ctx context.Context) error {
 			Enabled:     false,
 			Entitlement: codersdk.EntitlementNotEntitled,
 		},
-		auditLogs: codersdk.EntitlementNotEntitled,
-		scim:      codersdk.EntitlementNotEntitled,
+		auditLogs:   codersdk.EntitlementNotEntitled,
+		scim:        codersdk.EntitlementNotEntitled,
+		browserOnly: codersdk.EntitlementNotEntitled,
 	}
 
 	// Here we loop through licenses to detect enabled features.
diff --git a/enterprise/coderd/licenses_test.go b/enterprise/coderd/licenses_test.go
@@ -78,16 +78,18 @@ func TestGetLicense(t *testing.T) {
 		defer cancel()
 
 		coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			AccountID: "testing",
-			AuditLog:  true,
-			SCIM:      true,
+			AccountID:   "testing",
+			AuditLog:    true,
+			SCIM:        true,
+			BrowserOnly: true,
 		})
 
 		coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			AccountID: "testing2",
-			AuditLog:  true,
-			SCIM:      true,
-			UserLimit: 200,
+			AccountID:   "testing2",
+			AuditLog:    true,
+			SCIM:        true,
+			BrowserOnly: true,
+			UserLimit:   200,
 		})
 
 		licenses, err := client.Licenses(ctx)
@@ -96,16 +98,18 @@ func TestGetLicense(t *testing.T) {
 		assert.Equal(t, int32(1), licenses[0].ID)
 		assert.Equal(t, "testing", licenses[0].Claims["account_id"])
 		assert.Equal(t, map[string]interface{}{
-			codersdk.FeatureUserLimit: json.Number("0"),
-			codersdk.FeatureAuditLog:  json.Number("1"),
-			codersdk.FeatureSCIM:      json.Number("1"),
+			codersdk.FeatureUserLimit:   json.Number("0"),
+			codersdk.FeatureAuditLog:    json.Number("1"),
+			codersdk.FeatureSCIM:        json.Number("1"),
+			codersdk.FeatureBrowserOnly: json.Number("1"),
 		}, licenses[0].Claims["features"])
 		assert.Equal(t, int32(2), licenses[1].ID)
 		assert.Equal(t, "testing2", licenses[1].Claims["account_id"])
 		assert.Equal(t, map[string]interface{}{
-			codersdk.FeatureUserLimit: json.Number("200"),
-			codersdk.FeatureAuditLog:  json.Number("1"),
-			codersdk.FeatureSCIM:      json.Number("1"),
+			codersdk.FeatureUserLimit:   json.Number("200"),
+			codersdk.FeatureAuditLog:    json.Number("1"),
+			codersdk.FeatureSCIM:        json.Number("1"),
+			codersdk.FeatureBrowserOnly: json.Number("1"),
 		}, licenses[1].Claims["features"])
 	})
 }
diff --git a/enterprise/coderd/workspaceagents.go b/enterprise/coderd/workspaceagents.go
@@ -1,6 +1,7 @@
 package coderd
 
 import (
+	"context"
 	"net/http"
 
 	"github.com/coder/coder/coderd/httpapi"
@@ -12,7 +13,7 @@ func (api *API) shouldBlockNonBrowserConnections(rw http.ResponseWriter) bool {
 	browserOnly := api.entitlements.browserOnly
 	api.entitlementsMu.Unlock()
 	if api.BrowserOnly && browserOnly != codersdk.EntitlementNotEntitled {
-		httpapi.Write(rw, http.StatusConflict, codersdk.Response{
+		httpapi.Write(context.Background(), rw, http.StatusConflict, codersdk.Response{
 			Message: "Non-browser connections are disabled for your deployment.",
 		})
 		return true
