Skip to content

test: Return early and avoid using nil handler #7411

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 2 commits into from
May 4, 2023
Merged

test: Return early and avoid using nil handler #7411

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc2e708
test: Return early and avoid using nil handler
Emyrk May 4, 2023
a6d4d60
Add comment
Emyrk May 4, 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
5 changes: 4 additions & 1 deletion enterprise/coderd/coderdenttest/proxytest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,17 @@ func NewWorkspaceProxy(t *testing.T, coderdAPI *coderd.API, owner *codersdk.Clie
options = &ProxyOptions{}
}

// HTTP Server
// HTTP Server. We have to start this once to get the access URL to start
// the workspace proxy with. The workspace proxy has the handler, so the
// http server will start with a 503 until the proxy is started.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A strategy that avoids the mutex is to create a listener, then pass that to http.Serve()

l := net.Listen("tcp", "127.0.0.1:")
url := "http://" + l.Addr().String()

I guess it gets a bit more complex if we need TLS. Does the wsproxy care whether its TLS?

var mutex sync.RWMutex
var handler http.Handler
srv := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
mutex.RLock()
defer mutex.RUnlock()
if handler == nil {
http.Error(w, "handler not set", http.StatusServiceUnavailable)
return
}

handler.ServeHTTP(w, r)
Expand Down