Jun 7, 2024 · Jun 6, 2024 · Jun 6, 2024 · Jun 6, 2024
diff --git a/cli/netcheck_test.go b/cli/netcheck_test.go
 "encoding/json"
 "testing"

 "github.com/stretchr/testify/assert"
 "github.com/stretchr/testify/require"

 "github.com/coder/coder/v2/cli/clitest"
 var report healthsdk.DERPHealthReport
 require.NoError(t, json.Unmarshal(b, &report))

 assert.True(t, report.Healthy)
 // We do not assert that the report is healthy, just that
 // it has the expected number of reports per region.
 require.Len(t, report.Regions, 1+1) // 1 built-in region + 1 test-managed STUN region
 for _, v := range report.Regions {
 require.Len(t, v.NodeReports, len(v.Region.Nodes))
diff --git a/coderd/healthcheck/derphealth/derp.go b/coderd/healthcheck/derphealth/derp.go
 }

 func (r *NodeReport) Run(ctx context.Context) {
 ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
 defer cancel()
 // If there already is a deadline set on the context, do not override it.
 if _, ok := ctx.Deadline(); !ok {
 dCtx, cancel := context.WithTimeout(ctx, 10*time.Second)
 defer cancel()
 ctx = dCtx
 }

 r.Severity = health.SeverityOK
 r.ClientLogs = [][]string{}
diff --git a/coderd/healthcheck/derphealth/derp_test.go b/coderd/healthcheck/derphealth/derp_test.go
 "net/http/httptest"
 "net/url"
 "testing"
 "time"

 "github.com/stretchr/testify/assert"
 "github.com/stretchr/testify/require"
 }
 })

 t.Run("TimeoutCtx", func(t *testing.T) {
 t.Parallel()

 derpSrv := derp.NewServer(key.NewNode(), func(format string, args ...any) { t.Logf(format, args...) })
 defer derpSrv.Close()
 srv := httptest.NewServer(derphttp.Handler(derpSrv))
 defer srv.Close()

 var (
 // nolint:gocritic // testing a deadline exceeded
 ctx, cancel = context.WithTimeout(context.Background(), time.Nanosecond)
 report      = derphealth.Report{}
 derpURL, _  = url.Parse(srv.URL)
 opts        = &derphealth.ReportOptions{
 DERPMap: &tailcfg.DERPMap{Regions: map[int]*tailcfg.DERPRegion{
 1: {
 EmbeddedRelay: true,
 RegionID:      999,
 Nodes: []*tailcfg.DERPNode{{
 Name:             "1a",
 RegionID:         999,
 HostName:         derpURL.Host,
 IPv4:             derpURL.Host,
 STUNPort:         -1,
 InsecureForTests: true,
 ForceHTTP:        true,
 }},
 },
 }},
 }
 )
 cancel()

 report.Run(ctx, opts)

 assert.False(t, report.Healthy)
 assert.Nil(t, report.Error)
 })

 t.Run("HealthyWithNodeDegraded", func(t *testing.T) {
 t.Parallel()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,7 +5,6 @@ import (
		"encoding/json"
		"testing"

		"github.com/stretchr/testify/assert"
		"github.com/stretchr/testify/require"

		"github.com/coder/coder/v2/cli/clitest"
Expand All		@@ -30,7 +29,8 @@ func TestNetcheck(t *testing.T) {
		var report healthsdk.DERPHealthReport
		require.NoError(t, json.Unmarshal(b, &report))

		assert.True(t, report.Healthy)
		// We do not assert that the report is healthy, just that
		// it has the expected number of reports per region.
		require.Len(t, report.Regions, 1+1) // 1 built-in region + 1 test-managed STUN region
		for _, v := range report.Regions {
		require.Len(t, v.NodeReports, len(v.Region.Nodes))
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -236,8 +236,12 @@ func (r NodeReport) derpURL() url.URL {
		}

		func (r *NodeReport) Run(ctx context.Context) {
		ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
		defer cancel()
		// If there already is a deadline set on the context, do not override it.
		if _, ok := ctx.Deadline(); !ok {
		dCtx, cancel := context.WithTimeout(ctx, 10*time.Second)
		defer cancel()
		ctx = dCtx
		}

		r.Severity = health.SeverityOK
		r.ClientLogs = [][]string{}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,6 +8,7 @@ import (
		"net/http/httptest"
		"net/url"
		"testing"
		"time"

		"github.com/stretchr/testify/assert"
		"github.com/stretchr/testify/require"
Expand DownExpand Up		@@ -84,6 +85,45 @@ func TestDERP(t *testing.T) {
		}
		})

		t.Run("TimeoutCtx", func(t *testing.T) {
		t.Parallel()

		derpSrv := derp.NewServer(key.NewNode(), func(format string, args ...any) { t.Logf(format, args...) })
		defer derpSrv.Close()
		srv := httptest.NewServer(derphttp.Handler(derpSrv))
		defer srv.Close()

		var (
		// nolint:gocritic // testing a deadline exceeded
		ctx, cancel = context.WithTimeout(context.Background(), time.Nanosecond)
		report = derphealth.Report{}
		derpURL, _ = url.Parse(srv.URL)
		opts = &derphealth.ReportOptions{
		DERPMap: &tailcfg.DERPMap{Regions: map[int]*tailcfg.DERPRegion{
		1: {
		EmbeddedRelay: true,
		RegionID: 999,
		Nodes: []*tailcfg.DERPNode{{
		Name: "1a",
		RegionID: 999,
		HostName: derpURL.Host,
		IPv4: derpURL.Host,
		STUNPort: -1,
		InsecureForTests: true,
		ForceHTTP: true,
		}},
		},
		}},
		}
		)
		cancel()

		report.Run(ctx, opts)

		assert.False(t, report.Healthy)
		assert.Nil(t, report.Error)
		})

		t.Run("HealthyWithNodeDegraded", func(t *testing.T) {
		t.Parallel()

Expand Down