Skip to content

Commit d801f3f

Browse files
johnstcnjohnstcn
committed
Merge remote-tracking branch 'origin/main' into cj/healthreport-summarize
2 parents 16af4a6 + 41ca6e4 commit d801f3f

File tree

56 files changed

+892
-358
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+892
-358
lines changed

‎cli/support.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func (r *RootCmd) supportBundle() *serpent.Command {
101101

102102
// Check if we're running inside a workspace
103103
if val, found := os.LookupEnv("CODER"); found && val == "true" {
104-
_, _ = fmt.Fprintln(inv.Stderr, "Running inside Coder workspace; this can affect results!")
104+
cliui.Warn(inv.Stderr, "Running inside Coder workspace; this can affect results!")
105105
cliLog.Debug(inv.Context(), "running inside coder workspace")
106106
}
107107

@@ -122,7 +122,7 @@ func (r *RootCmd) supportBundle() *serpent.Command {
122122

123123
if len(inv.Args) == 0 {
124124
cliLog.Warn(inv.Context(), "no workspace specified")
125-
_, _ = fmt.Fprintln(inv.Stderr, "Warning: no workspace specified. This will result in incomplete information.")
125+
cliui.Warn(inv.Stderr, "No workspace specified. This will result in incomplete information.")
126126
} else {
127127
ws, err := namedWorkspace(inv.Context(), client, inv.Args[0])
128128
if err != nil {
@@ -200,6 +200,7 @@ func (r *RootCmd) supportBundle() *serpent.Command {
200200
return xerrors.Errorf("write support bundle to %s: %w", outputPath, err)
201201
}
202202
_, _ = fmt.Fprintln(inv.Stderr, "Wrote support bundle to "+outputPath)
203+
203204
return nil
204205
},
205206
}

‎coderd/healthcheck/derphealth/derp.go

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ const (
3232
warningNodeUsesWebsocket = `Node uses WebSockets because the "Upgrade: DERP" header may be blocked on the load balancer.`
3333
oneNodeUnhealthy = "Region is operational, but performance might be degraded as one node is unhealthy."
3434
missingNodeReport = "Missing node health report, probably a developer error."
35+
noSTUN = "No STUN servers are available."
36+
stunMapVaryDest = "STUN returned different addresses; you may be behind a hard NAT."
3537
)
3638

3739
type ReportOptions struct {
@@ -107,9 +109,30 @@ func (r *Report) Run(ctx context.Context, opts *ReportOptions) {
107109
ncReport, netcheckErr := nc.GetReport(ctx, opts.DERPMap)
108110
r.Netcheck = ncReport
109111
r.NetcheckErr = convertError(netcheckErr)
112+
if mapVaryDest, _ := r.Netcheck.MappingVariesByDestIP.Get(); mapVaryDest {
113+
r.Warnings = append(r.Warnings, health.Messagef(health.CodeSTUNMapVaryDest, stunMapVaryDest))
114+
}
110115

111116
wg.Wait()
112117

118+
// Count the number of STUN-capable nodes.
119+
var stunCapableNodes int
120+
var stunTotalNodes int
121+
for _, region := range r.Regions {
122+
for _, node := range region.NodeReports {
123+
if node.STUN.Enabled {
124+
stunTotalNodes++
125+
}
126+
if node.STUN.CanSTUN {
127+
stunCapableNodes++
128+
}
129+
}
130+
}
131+
if stunCapableNodes == 0 && stunTotalNodes > 0 {
132+
r.Severity = health.SeverityWarning
133+
r.Warnings = append(r.Warnings, health.Messagef(health.CodeSTUNNoNodes, noSTUN))
134+
}
135+
113136
// Review region reports and select the highest severity.
114137
for _, regionReport := range r.Regions {
115138
if regionReport.Severity.Value() > r.Severity.Value() {

‎coderd/healthcheck/derphealth/derp_test.go

Lines changed: 162 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,67 @@ func TestDERP(t *testing.T) {
129129
assert.True(t, report.Healthy)
130130
assert.Equal(t, health.SeverityWarning, report.Severity)
131131
assert.True(t, report.Dismissed)
132-
if assert.NotEmpty(t, report.Warnings) {
132+
if assert.Len(t, report.Warnings, 1) {
133133
assert.Contains(t, report.Warnings[0].Code, health.CodeDERPOneNodeUnhealthy)
134134
}
135+
for _, region := range report.Regions {
136+
assert.True(t, region.Healthy)
137+
assert.True(t, region.NodeReports[0].Healthy)
138+
assert.Empty(t, region.NodeReports[0].Warnings)
139+
assert.Equal(t, health.SeverityOK, region.NodeReports[0].Severity)
140+
assert.False(t, region.NodeReports[1].Healthy)
141+
assert.Equal(t, health.SeverityError, region.NodeReports[1].Severity)
142+
assert.Len(t, region.Warnings, 1)
143+
}
144+
})
145+
146+
t.Run("HealthyWithNoSTUN", func(t *testing.T) {
147+
t.Parallel()
148+
149+
healthyDerpSrv := derp.NewServer(key.NewNode(), func(format string, args ...any) { t.Logf(format, args...) })
150+
defer healthyDerpSrv.Close()
151+
healthySrv := httptest.NewServer(derphttp.Handler(healthyDerpSrv))
152+
defer healthySrv.Close()
153+
154+
var (
155+
ctx = context.Background()
156+
report = derphealth.Report{}
157+
derpURL, _ = url.Parse(healthySrv.URL)
158+
opts = &derphealth.ReportOptions{
159+
DERPMap: &tailcfg.DERPMap{Regions: map[int]*tailcfg.DERPRegion{
160+
1: {
161+
EmbeddedRelay: true,
162+
RegionID: 999,
163+
Nodes: []*tailcfg.DERPNode{{
164+
Name: "1a",
165+
RegionID: 999,
166+
HostName: derpURL.Host,
167+
IPv4: derpURL.Host,
168+
STUNPort: -1,
169+
InsecureForTests: true,
170+
ForceHTTP: true,
171+
}, {
172+
Name: "badstun",
173+
RegionID: 999,
174+
HostName: derpURL.Host,
175+
STUNPort: 19302,
176+
STUNOnly: true,
177+
InsecureForTests: true,
178+
ForceHTTP: true,
179+
}},
180+
},
181+
}},
182+
}
183+
)
184+
185+
report.Run(ctx, opts)
186+
187+
assert.True(t, report.Healthy)
188+
assert.Equal(t, health.SeverityWarning, report.Severity)
189+
if assert.Len(t, report.Warnings, 2) {
190+
assert.EqualValues(t, report.Warnings[1].Code, health.CodeSTUNNoNodes)
191+
assert.EqualValues(t, report.Warnings[0].Code, health.CodeDERPOneNodeUnhealthy)
192+
}
135193
for _, region := range report.Regions {
136194
assert.True(t, region.Healthy)
137195
assert.True(t, region.NodeReports[0].Healthy)
@@ -291,8 +349,10 @@ func TestDERP(t *testing.T) {
291349
report.Run(ctx, opts)
292350

293351
assert.True(t, report.Healthy)
352+
assert.Equal(t, health.SeverityOK, report.Severity)
294353
for _, region := range report.Regions {
295354
assert.True(t, region.Healthy)
355+
assert.Equal(t, health.SeverityOK, region.Severity)
296356
for _, node := range region.NodeReports {
297357
assert.True(t, node.Healthy)
298358
assert.False(t, node.CanExchangeMessages)
@@ -304,6 +364,107 @@ func TestDERP(t *testing.T) {
304364
}
305365
}
306366
})
367+
368+
t.Run("STUNOnly/OneBadOneGood", func(t *testing.T) {
369+
t.Parallel()
370+
371+
var (
372+
ctx = context.Background()
373+
report = derphealth.Report{}
374+
opts = &derphealth.ReportOptions{
375+
DERPMap: &tailcfg.DERPMap{
376+
Regions: map[int]*tailcfg.DERPRegion{
377+
1: {
378+
EmbeddedRelay: true,
379+
RegionID: 999,
380+
Nodes: []*tailcfg.DERPNode{{
381+
Name: "badstun",
382+
RegionID: 999,
383+
HostName: "badstun.example.com",
384+
STUNPort: 19302,
385+
STUNOnly: true,
386+
InsecureForTests: true,
387+
ForceHTTP: true,
388+
}, {
389+
Name: "goodstun",
390+
RegionID: 999,
391+
HostName: "stun.l.google.com",
392+
STUNPort: 19302,
393+
STUNOnly: true,
394+
InsecureForTests: true,
395+
ForceHTTP: true,
396+
}},
397+
},
398+
},
399+
},
400+
}
401+
)
402+
403+
report.Run(ctx, opts)
404+
assert.True(t, report.Healthy)
405+
assert.Equal(t, health.SeverityWarning, report.Severity)
406+
if assert.Len(t, report.Warnings, 1) {
407+
assert.Equal(t, health.CodeDERPOneNodeUnhealthy, report.Warnings[0].Code)
408+
}
409+
for _, region := range report.Regions {
410+
assert.True(t, region.Healthy)
411+
assert.Equal(t, health.SeverityWarning, region.Severity)
412+
// badstun
413+
assert.False(t, region.NodeReports[0].Healthy)
414+
assert.True(t, region.NodeReports[0].STUN.Enabled)
415+
assert.False(t, region.NodeReports[0].STUN.CanSTUN)
416+
assert.NotNil(t, region.NodeReports[0].STUN.Error)
417+
// goodstun
418+
assert.True(t, region.NodeReports[1].Healthy)
419+
assert.True(t, region.NodeReports[1].STUN.Enabled)
420+
assert.True(t, region.NodeReports[1].STUN.CanSTUN)
421+
assert.Nil(t, region.NodeReports[1].STUN.Error)
422+
}
423+
})
424+
425+
t.Run("STUNOnly/NoStun", func(t *testing.T) {
426+
t.Parallel()
427+
428+
var (
429+
ctx = context.Background()
430+
report = derphealth.Report{}
431+
opts = &derphealth.ReportOptions{
432+
DERPMap: &tailcfg.DERPMap{
433+
Regions: map[int]*tailcfg.DERPRegion{
434+
1: {
435+
EmbeddedRelay: true,
436+
RegionID: 999,
437+
Nodes: []*tailcfg.DERPNode{{
438+
Name: "badstun",
439+
RegionID: 999,
440+
HostName: "badstun.example.com",
441+
STUNPort: 19302,
442+
STUNOnly: true,
443+
InsecureForTests: true,
444+
ForceHTTP: true,
445+
}},
446+
},
447+
},
448+
},
449+
}
450+
)
451+
452+
report.Run(ctx, opts)
453+
assert.False(t, report.Healthy)
454+
assert.Equal(t, health.SeverityError, report.Severity)
455+
for _, region := range report.Regions {
456+
assert.False(t, region.Healthy)
457+
assert.Equal(t, health.SeverityError, region.Severity)
458+
for _, node := range region.NodeReports {
459+
assert.False(t, node.Healthy)
460+
assert.False(t, node.CanExchangeMessages)
461+
assert.Empty(t, node.ClientLogs)
462+
assert.True(t, node.STUN.Enabled)
463+
assert.False(t, node.STUN.CanSTUN)
464+
assert.NotNil(t, node.STUN.Error)
465+
}
466+
}
467+
})
307468
}
308469

309470
func tsDERPMap(ctx context.Context, t testing.TB) *tailcfg.DERPMap {

‎coderd/healthcheck/health/model.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ const (
3636

3737
CodeDERPNodeUsesWebsocket Code = `EDERP01`
3838
CodeDERPOneNodeUnhealthy Code = `EDERP02`
39+
CodeSTUNNoNodes = `ESTUN01`
40+
CodeSTUNMapVaryDest = `ESTUN02`
3941

4042
CodeProvisionerDaemonsNoProvisionerDaemons Code = `EPD01`
4143
CodeProvisionerDaemonVersionMismatch Code = `EPD02`

‎coderd/telemetry/telemetry.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,7 @@ func ConvertWorkspaceResource(resource database.WorkspaceResource) WorkspaceReso
624624
return WorkspaceResource{
625625
ID: resource.ID,
626626
JobID: resource.JobID,
627+
CreatedAt: resource.CreatedAt,
627628
Transition: resource.Transition,
628629
Type: resource.Type,
629630
InstanceType: resource.InstanceType.String,
@@ -833,6 +834,7 @@ type User struct {
833834

834835
type WorkspaceResource struct {
835836
ID uuid.UUID `json:"id"`
837+
CreatedAt time.Time `json:"created_at"`
836838
JobID uuid.UUID `json:"job_id"`
837839
Transition database.WorkspaceTransition `json:"transition"`
838840
Type string `json:"type"`

‎docs/admin/healthcheck.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,31 @@ curl -v "https://coder.company.com/derp"
170170
# DERP requires connection upgrade
171171
```
172172

173+
### ESTUN01
174+
175+
_No STUN servers available._
176+
177+
**Problem:** This is shown if no STUN servers are available. Coder will use STUN
178+
to establish [direct connections](../networking/stun.md). Without at least one
179+
working STUN server, direct connections may not be possible.
180+
181+
**Solution:** Ensure that the
182+
[configured STUN severs](../cli/server.md#derp-server-stun-addresses) are
183+
reachable from Coder and that UDP traffic can be sent/received on the configured
184+
port.
185+
186+
### ESTUN02
187+
188+
_STUN returned different addresses; you may be behind a hard NAT._
189+
190+
**Problem:** This is a warning shown when multiple attempts to determine our
191+
public IP address/port via STUN resulted in different `ip:port` combinations.
192+
This is a sign that you are behind a "hard NAT", and may result in difficulty
193+
establishing direct connections. However, it does not mean that direct
194+
connections are impossible.
195+
196+
**Solution:** Engage with your network administrator.
197+
173198
## Websocket
174199

175200
Coder makes heavy use of [WebSockets](https://datatracker.ietf.org/doc/rfc6455/)

‎docs/guides/xray-integration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ March 17, 2024
1212

1313
This guide will walk you through the process of adding
1414
[JFrog Xray](https://jfrog.com/xray/) integration to Coder Kubernetes workspaces
15-
using Coder's [JFrog Xray Integration](github.com/coder/coder-xray).
15+
using Coder's [JFrog Xray Integration](https://github.com/coder/coder-xray).
1616

1717
## Prerequisites
1818

@@ -65,8 +65,8 @@ image = "<ARTIFACTORY_URL>/<REPO>/<IMAGE>:<TAG>"
6565

6666
> **Note**: To authenticate with the Artifactory registry, you may need to
6767
> create a
68-
> [Docker config](https://jfrog.com/artifactory/docs/docker/#docker-login) and
69-
> use it in the `imagePullSecrets` field of the kubernetes pod. See this
68+
> [Docker config](https://jfrog.com/help/r/jfrog-artifactory-documentation/docker-advanced-topics)
69+
> and use it in the `imagePullSecrets` field of the kubernetes pod. See this
7070
> [guide](./image-pull-secret.md) for more information.
7171
7272
![JFrog Xray Integration](../images/guides/xray-integration/example.png)

‎scripts/apitypings/main.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -815,11 +815,17 @@ func (g *Generator) typescriptType(ty types.Type) (TypescriptType, error) {
815815
return TypescriptType{}, xerrors.Errorf("array: %w", err)
816816
}
817817
genValue := ""
818+
819+
// Always wrap in parentheses for proper scoped types.
820+
// Running prettier on this output will remove redundant parenthesis,
821+
// so this makes our decision-making easier.
822+
// The example that breaks without this is:
823+
// readonly readonly string[][]
818824
if underlying.GenericValue != "" {
819-
genValue = underlying.GenericValue + "[]"
825+
genValue = "(readonly " + underlying.GenericValue + "[])"
820826
}
821827
return TypescriptType{
822-
ValueType: underlying.ValueType + "[]",
828+
ValueType: "(readonly " + underlying.ValueType + "[])",
823829
GenericValue: genValue,
824830
AboveTypeLine: underlying.AboveTypeLine,
825831
GenericTypes: underlying.GenericTypes,

‎scripts/apitypings/main_test.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
package main
88

99
import (
10+
"flag"
1011
"os"
1112
"path/filepath"
1213
"strings"
@@ -15,6 +16,9 @@ import (
1516
"github.com/stretchr/testify/require"
1617
)
1718

19+
// updateGoldenFiles is a flag that can be set to update golden files.
20+
var updateGoldenFiles = flag.Bool("update", false, "Update golden files")
21+
1822
func TestGeneration(t *testing.T) {
1923
t.Parallel()
2024
files, err := os.ReadDir("testdata")
@@ -37,7 +41,13 @@ func TestGeneration(t *testing.T) {
3741
require.NoErrorf(t, err, "read file %s", golden)
3842
expectedString := strings.TrimSpace(string(expected))
3943
output = strings.TrimSpace(output)
40-
require.Equal(t, expectedString, output, "matched output")
44+
if *updateGoldenFiles {
45+
// nolint:gosec
46+
err := os.WriteFile(golden, []byte(output), 0o644)
47+
require.NoError(t, err, "write golden file")
48+
} else {
49+
require.Equal(t, expectedString, output, "matched output")
50+
}
4151
})
4252
}
4353
}

‎scripts/apitypings/testdata/enums/enums.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package codersdk
22

33
type (
4-
Enum string
5-
Enums []Enum
4+
Enum string
5+
EnumSliceType []Enum
66
)
77

88
const (

0 commit comments

Comments
 (0)