more rules

mtojek · mtojek · commit d00802e3867a · 2023-11-22T17:45:11.000+01:00
diff --git a/coderd/healthcheck/accessurl.go b/coderd/healthcheck/accessurl.go
@@ -35,9 +35,11 @@ func (r *AccessURLReport) Run(ctx context.Context, opts *AccessURLReportOptions)
 	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
 	defer cancel()
 
+	r.Severity = health.SeverityOK
 	r.Warnings = []string{}
 	if opts.AccessURL == nil {
 		r.Error = ptr.Ref("access URL is nil")
+		r.Severity = health.SeverityError
 		return
 	}
 	r.AccessURL = opts.AccessURL.String()
@@ -49,30 +51,37 @@ func (r *AccessURLReport) Run(ctx context.Context, opts *AccessURLReportOptions)
 	accessURL, err := opts.AccessURL.Parse("/healthz")
 	if err != nil {
 		r.Error = convertError(xerrors.Errorf("parse healthz endpoint: %w", err))
+		r.Severity = health.SeverityError
 		return
 	}
 
 	req, err := http.NewRequestWithContext(ctx, "GET", accessURL.String(), nil)
 	if err != nil {
 		r.Error = convertError(xerrors.Errorf("create healthz request: %w", err))
+		r.Severity = health.SeverityError
 		return
 	}
 
 	res, err := opts.Client.Do(req)
 	if err != nil {
 		r.Error = convertError(xerrors.Errorf("get healthz endpoint: %w", err))
+		r.Severity = health.SeverityError
 		return
 	}
 	defer res.Body.Close()
 
 	body, err := io.ReadAll(res.Body)
 	if err != nil {
 		r.Error = convertError(xerrors.Errorf("read healthz response: %w", err))
+		r.Severity = health.SeverityError
 		return
 	}
 
 	r.Reachable = true
 	r.Healthy = res.StatusCode == http.StatusOK
 	r.StatusCode = res.StatusCode
+	if res.StatusCode != http.StatusOK {
+		r.Severity = health.SeverityWarning
+	}
 	r.HealthzResponse = string(body)
 }
diff --git a/coderd/healthcheck/accessurl_test.go b/coderd/healthcheck/accessurl_test.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/coderd/healthcheck"
+	"github.com/coder/coder/v2/coderd/healthcheck/health"
 )
 
 func TestAccessURL(t *testing.T) {
@@ -34,6 +35,7 @@ func TestAccessURL(t *testing.T) {
 
 		assert.True(t, report.Healthy)
 		assert.True(t, report.Reachable)
+		assert.Equal(t, health.SeverityOK, report.Severity)
 		assert.Equal(t, http.StatusOK, report.StatusCode)
 		assert.Equal(t, "OK", report.HealthzResponse)
 		assert.Nil(t, report.Error)
@@ -64,6 +66,7 @@ func TestAccessURL(t *testing.T) {
 
 		assert.False(t, report.Healthy)
 		assert.True(t, report.Reachable)
+		assert.Equal(t, health.SeverityWarning, report.Severity)
 		assert.Equal(t, http.StatusNotFound, report.StatusCode)
 		assert.Equal(t, string(resp), report.HealthzResponse)
 		assert.Nil(t, report.Error)
@@ -100,6 +103,7 @@ func TestAccessURL(t *testing.T) {
 
 		assert.False(t, report.Healthy)
 		assert.False(t, report.Reachable)
+		assert.Equal(t, health.SeverityError, report.Severity)
 		assert.Equal(t, 0, report.StatusCode)
 		assert.Equal(t, "", report.HealthzResponse)
 		require.NotNil(t, report.Error)
diff --git a/coderd/healthcheck/database_test.go b/coderd/healthcheck/database_test.go
@@ -60,6 +60,7 @@ func TestDatabase(t *testing.T) {
 
 		assert.False(t, report.Healthy)
 		assert.False(t, report.Reachable)
+		assert.Equal(t, health.SeverityError, report.Severity)
 		assert.Zero(t, report.Latency)
 		require.NotNil(t, report.Error)
 		assert.Equal(t, healthcheck.DatabaseDefaultThreshold.Milliseconds(), report.ThresholdMS)
@@ -86,6 +87,7 @@ func TestDatabase(t *testing.T) {
 
 		assert.True(t, report.Healthy)
 		assert.True(t, report.Reachable)
+		assert.Equal(t, health.SeverityOK, report.Severity)
 		assert.Equal(t, time.Millisecond.String(), report.Latency)
 		assert.EqualValues(t, 1, report.LatencyMS)
 		assert.Equal(t, healthcheck.DatabaseDefaultThreshold.Milliseconds(), report.ThresholdMS)
@@ -112,6 +114,7 @@ func TestDatabase(t *testing.T) {
 
 		assert.False(t, report.Healthy)
 		assert.True(t, report.Reachable)
+		assert.Equal(t, health.SeverityWarning, report.Severity)
 		assert.Equal(t, time.Second.String(), report.Latency)
 		assert.EqualValues(t, 1000, report.LatencyMS)
 		assert.Equal(t, time.Second.Milliseconds(), report.ThresholdMS)
