Skip to content

chore: make default workspace proxy editable #7903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jun 8, 2023
Merged

chore: make default workspace proxy editable #7903

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9cb6421
chore: add database methods for editing the default workspace proxy
Emyrk Jun 7, 2023
9db95ae
Unit test to fetch primary with httpmw
Emyrk Jun 7, 2023
e2356b2
Show default proxy in proxy list
Emyrk Jun 7, 2023
d4f00ce
fixup! Show default proxy in proxy list
Emyrk Jun 7, 2023
9a6e5e1
Import order
Emyrk Jun 7, 2023
55b4527
Lint
Emyrk Jun 7, 2023
d4a8b81
fix unit tests
Emyrk Jun 7, 2023
28d80ad
Make sure unit tests have deployment ids
Emyrk Jun 7, 2023
904ce34
Unit test deployment id stuff
Emyrk Jun 7, 2023
bf0e1ce
Fix data race'
Emyrk Jun 7, 2023
881895b
sql spacing
Emyrk Jun 8, 2023
356dc3a
factor out patch primary
Emyrk Jun 8, 2023
79e2637
Make gen
Emyrk Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix data race'
  • Loading branch information
@Emyrk
Emyrk committed Jun 7, 2023
commit bf0e1ced478ca0f7da69c2d6b3021d4d3bf8f733
9 changes: 6 additions & 3 deletions enterprise/coderd/workspaceproxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,11 +385,10 @@ func TestIssueSignedAppToken(t *testing.T) {
})
require.NoError(t, err)

proxyClient := wsproxysdk.New(client.URL)
proxyClient.SetSessionToken(proxyRes.ProxyToken)

t.Run("BadAppRequest", func(t *testing.T) {
t.Parallel()
proxyClient := wsproxysdk.New(client.URL)
proxyClient.SetSessionToken(proxyRes.ProxyToken)

ctx := testutil.Context(t, testutil.WaitLong)
_, err = proxyClient.IssueSignedAppToken(ctx, workspaceapps.IssueTokenRequest{
Expand All @@ -410,6 +409,8 @@ func TestIssueSignedAppToken(t *testing.T) {
}
t.Run("OK", func(t *testing.T) {
t.Parallel()
proxyClient := wsproxysdk.New(client.URL)
proxyClient.SetSessionToken(proxyRes.ProxyToken)

ctx := testutil.Context(t, testutil.WaitLong)
_, err = proxyClient.IssueSignedAppToken(ctx, goodRequest)
Expand All @@ -418,6 +419,8 @@ func TestIssueSignedAppToken(t *testing.T) {

t.Run("OKHTML", func(t *testing.T) {
t.Parallel()
proxyClient := wsproxysdk.New(client.URL)
proxyClient.SetSessionToken(proxyRes.ProxyToken)

rw := httptest.NewRecorder()
ctx := testutil.Context(t, testutil.WaitLong)
Expand Down