Skip to content

Commit 39e3b04

Browse files
mafredrimafredri
authored
refactor(coderd/healthcheck): move derp report to derphealth package (coder#9506)
This change helps remove one indirect use of coderd/database in the slim CLI. No size change (yet). Ref: coder#9380
1 parent a1025f9 commit 39e3b04

File tree

12 files changed

+233
-219
lines changed

12 files changed

+233
-219
lines changed

‎cli/netcheck.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"golang.org/x/xerrors"
1010

1111
"github.com/coder/coder/v2/cli/clibase"
12-
"github.com/coder/coder/v2/coderd/healthcheck"
12+
"github.com/coder/coder/v2/coderd/healthcheck/derphealth"
1313
"github.com/coder/coder/v2/codersdk"
1414
)
1515

@@ -33,8 +33,8 @@ func (r *RootCmd) netcheck() *clibase.Cmd {
3333

3434
_, _ = fmt.Fprint(inv.Stderr, "Gathering a network report. This may take a few seconds...\n\n")
3535

36-
var report healthcheck.DERPReport
37-
report.Run(ctx, &healthcheck.DERPReportOptions{
36+
var report derphealth.Report
37+
report.Run(ctx, &derphealth.ReportOptions{
3838
DERPMap: connInfo.DERPMap,
3939
})
4040

‎cli/netcheck_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/stretchr/testify/require"
1010

1111
"github.com/coder/coder/v2/cli/clitest"
12-
"github.com/coder/coder/v2/coderd/healthcheck"
12+
"github.com/coder/coder/v2/coderd/healthcheck/derphealth"
1313
"github.com/coder/coder/v2/pty/ptytest"
1414
)
1515

@@ -27,7 +27,7 @@ func TestNetcheck(t *testing.T) {
2727

2828
b := out.Bytes()
2929
t.Log(string(b))
30-
var report healthcheck.DERPReport
30+
var report derphealth.Report
3131
require.NoError(t, json.Unmarshal(b, &report))
3232

3333
assert.True(t, report.Healthy)

‎coderd/apidoc/docs.go

Lines changed: 31 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 31 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)