synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-21 01:28:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix lint in main caused by incompatible merge (#7239)

Browse Source
This commit is contained in:
Dean Sheather
2023-04-21 03:27:56 -07:00
committed by GitHub
parent 4353ad7940
commit 3680e158d9
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
enterprise/coderd/workspaceproxy_test.go
View File

@ -214,7 +214,7 @@ func TestReconnectingPTYSignedToken(t *testing.T) {
} }
db, pubsub := dbtestutil.NewDB(t) db, pubsub := dbtestutil.NewDB(t)
client := coderdenttest.New(t, &coderdenttest.Options{ client, closer, api := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
Options: &coderdtest.Options{ Options: &coderdtest.Options{
DeploymentValues: dv, DeploymentValues: dv,
Database: db, Database: db,
@ -222,6 +222,9 @@ func TestReconnectingPTYSignedToken(t *testing.T) {
IncludeProvisionerDaemon: true, IncludeProvisionerDaemon: true,
}, },
}) })
t.Cleanup(func() {
closer.Close()
})
user := coderdtest.CreateFirstUser(t, client) user := coderdtest.CreateFirstUser(t, client)
_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{ _ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
@ -253,19 +256,18 @@ func TestReconnectingPTYSignedToken(t *testing.T) {
t.Cleanup(func() { t.Cleanup(func() {
_ = agentCloser.Close() _ = agentCloser.Close()
}) })
coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID) coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
createProxyCtx := testutil.Context(t, testutil.WaitLong) proxyURL, err := url.Parse(fmt.Sprintf("https://%s.com", namesgenerator.GetRandomName(1)))
proxyRes, err := client.CreateWorkspaceProxy(createProxyCtx, codersdk.CreateWorkspaceProxyRequest{
Name: namesgenerator.GetRandomName(1),
Icon: "/emojis/flag.png",
URL: "https://" + namesgenerator.GetRandomName(1) + ".com",
WildcardHostname: "*.sub.example.com",
})
require.NoError(t, err) require.NoError(t, err)
u, err := url.Parse(proxyRes.Proxy.URL) _ = coderdenttest.NewWorkspaceProxy(t, api, client, &coderdenttest.ProxyOptions{
Name: namesgenerator.GetRandomName(1),
ProxyURL: proxyURL,
AppHostname: "*.sub.example.com",
})
u, err := url.Parse(proxyURL.String())
require.NoError(t, err) require.NoError(t, err)
if u.Scheme == "https" { if u.Scheme == "https" {
u.Scheme = "wss" u.Scheme = "wss"