Skip to content

Commit c23a42c

Browse files
committed
Fix context
1 parent 1a98647 commit c23a42c

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

enterprise/coderd/licenses_test.go

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,18 @@ func TestGetLicense(t *testing.T) {
7878
defer cancel()
7979

8080
coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
81-
AccountID: "testing",
82-
AuditLog: true,
83-
SCIM: true,
81+
AccountID: "testing",
82+
AuditLog: true,
83+
SCIM: true,
84+
BrowserOnly: true,
8485
})
8586

8687
coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
87-
AccountID: "testing2",
88-
AuditLog: true,
89-
SCIM: true,
90-
UserLimit: 200,
88+
AccountID: "testing2",
89+
AuditLog: true,
90+
SCIM: true,
91+
BrowserOnly: true,
92+
UserLimit: 200,
9193
})
9294

9395
licenses, err := client.Licenses(ctx)
@@ -96,16 +98,18 @@ func TestGetLicense(t *testing.T) {
9698
assert.Equal(t, int32(1), licenses[0].ID)
9799
assert.Equal(t, "testing", licenses[0].Claims["account_id"])
98100
assert.Equal(t, map[string]interface{}{
99-
codersdk.FeatureUserLimit: json.Number("0"),
100-
codersdk.FeatureAuditLog: json.Number("1"),
101-
codersdk.FeatureSCIM: json.Number("1"),
101+
codersdk.FeatureUserLimit: json.Number("0"),
102+
codersdk.FeatureAuditLog: json.Number("1"),
103+
codersdk.FeatureSCIM: json.Number("1"),
104+
codersdk.FeatureBrowserOnly: json.Number("1"),
102105
}, licenses[0].Claims["features"])
103106
assert.Equal(t, int32(2), licenses[1].ID)
104107
assert.Equal(t, "testing2", licenses[1].Claims["account_id"])
105108
assert.Equal(t, map[string]interface{}{
106-
codersdk.FeatureUserLimit: json.Number("200"),
107-
codersdk.FeatureAuditLog: json.Number("1"),
108-
codersdk.FeatureSCIM: json.Number("1"),
109+
codersdk.FeatureUserLimit: json.Number("200"),
110+
codersdk.FeatureAuditLog: json.Number("1"),
111+
codersdk.FeatureSCIM: json.Number("1"),
112+
codersdk.FeatureBrowserOnly: json.Number("1"),
109113
}, licenses[1].Claims["features"])
110114
})
111115
}

enterprise/coderd/workspaceagents.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package coderd
22

33
import (
4+
"context"
45
"net/http"
56

67
"github.com/coder/coder/coderd/httpapi"
@@ -12,7 +13,7 @@ func (api *API) shouldBlockNonBrowserConnections(rw http.ResponseWriter) bool {
1213
browserOnly := api.entitlements.browserOnly
1314
api.entitlementsMu.Unlock()
1415
if api.BrowserOnly && browserOnly != codersdk.EntitlementNotEntitled {
15-
httpapi.Write(rw, http.StatusConflict, codersdk.Response{
16+
httpapi.Write(context.Background(), rw, http.StatusConflict, codersdk.Response{
1617
Message: "Non-browser connections are disabled for your deployment.",
1718
})
1819
return true

0 commit comments

Comments
 (0)