Skip to content

Commit

Permalink
fix: use backend for /healthz page (#4938)
Browse files Browse the repository at this point in the history
  • Loading branch information
coadler committed Nov 7, 2022
1 parent bda7636 commit 50ad4a8
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 36 deletions.
2 changes: 2 additions & 0 deletions coderd/coderd.go
Expand Up @@ -233,6 +233,8 @@ func New(options *Options) *API {
httpmw.CSRF(options.SecureAuthCookie),
)

r.Get("/healthz", func(w http.ResponseWriter, r *http.Request) { _, _ = w.Write([]byte("OK")) })

apps := func(r chi.Router) {
r.Use(
tracing.Middleware(api.TracerProvider),
Expand Down
15 changes: 15 additions & 0 deletions coderd/coderd_test.go
Expand Up @@ -2,6 +2,7 @@ package coderd_test

import (
"context"
"io"
"net/http"
"net/netip"
"strconv"
Expand Down Expand Up @@ -114,3 +115,17 @@ func TestDERPLatencyCheck(t *testing.T) {
defer res.Body.Close()
require.Equal(t, http.StatusOK, res.StatusCode)
}
func TestHealthz(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, nil)

res, err := client.Request(context.Background(), http.MethodGet, "/healthz", nil)
require.NoError(t, err)
defer res.Body.Close()

require.Equal(t, http.StatusOK, res.StatusCode)
body, err := io.ReadAll(res.Body)
require.NoError(t, err)

assert.Equal(t, "OK", string(body))
}
1 change: 1 addition & 0 deletions coderd/coderdtest/authorize.go
Expand Up @@ -37,6 +37,7 @@ func AGPLRoutes(a *AuthTester) (map[string]string, map[string]RouteCheck) {

assertRoute := map[string]RouteCheck{
// These endpoints do not require auth
"GET:/healthz": {NoAuthorize: true},
"GET:/api/v2": {NoAuthorize: true},
"GET:/api/v2/buildinfo": {NoAuthorize: true},
"GET:/api/v2/users/first": {NoAuthorize: true},
Expand Down
13 changes: 0 additions & 13 deletions site/e2e/pom/HealthzPage.ts

This file was deleted.

11 changes: 0 additions & 11 deletions site/e2e/tests/healthz.spec.ts

This file was deleted.

2 changes: 0 additions & 2 deletions site/src/AppRouter.tsx
Expand Up @@ -30,7 +30,6 @@ const NotFoundPage = lazy(() => import("./pages/404Page/404Page"))
const CliAuthenticationPage = lazy(
() => import("./pages/CliAuthPage/CliAuthPage"),
)
const HealthzPage = lazy(() => import("./pages/HealthzPage/HealthzPage"))
const AccountPage = lazy(
() => import("./pages/UserSettingsPage/AccountPage/AccountPage"),
)
Expand Down Expand Up @@ -107,7 +106,6 @@ export const AppRouter: FC = () => {

<Route path="login" element={<LoginPage />} />
<Route path="setup" element={<SetupPage />} />
<Route path="healthz" element={<HealthzPage />} />
<Route
path="cli-auth"
element={
Expand Down
10 changes: 0 additions & 10 deletions site/src/pages/HealthzPage/HealthzPage.tsx

This file was deleted.

0 comments on commit 50ad4a8

Please sign in to comment.