Skip to content

Commit 1105203

Browse files
matifalimatifali
authored
Merge branch 'main' into release-docs-hotfix
2 parents 1b7d73e + 2f043d7 commit 1105203

File tree

241 files changed

+9392
-3122
lines changed

Some content is hidden

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

241 files changed

+9392
-3122
lines changed

‎.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ jobs:
186186
187187
# Check for any typos
188188
- name: Check for typos
189-
uses: crate-ci/typos@v1.24.5
189+
uses: crate-ci/typos@v1.24.6
190190
with:
191191
config: .github/workflows/typos.toml
192192

‎.github/workflows/contrib.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
steps:
3737
- name: cla
3838
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
39-
uses: contributor-assistant/github-action@v2.5.1
39+
uses: contributor-assistant/github-action@v2.6.1
4040
env:
4141
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4242
# the below token should have repo scope and must be manually added by you in the repository's secret

‎Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,7 @@ gen: \
488488
agent/proto/agent.pb.go \
489489
provisionersdk/proto/provisioner.pb.go \
490490
provisionerd/proto/provisionerd.pb.go \
491+
vpn/vpn.pb.go \
491492
coderd/database/dump.sql \
492493
$(DB_GEN_FILES) \
493494
site/src/api/typesGenerated.ts \
@@ -517,6 +518,7 @@ gen/mark-fresh:
517518
agent/proto/agent.pb.go \
518519
provisionersdk/proto/provisioner.pb.go \
519520
provisionerd/proto/provisionerd.pb.go \
521+
vpn/vpn.pb.go \
520522
coderd/database/dump.sql \
521523
$(DB_GEN_FILES) \
522524
site/src/api/typesGenerated.ts \
@@ -600,6 +602,12 @@ provisionerd/proto/provisionerd.pb.go: provisionerd/proto/provisionerd.proto
600602
--go-drpc_opt=paths=source_relative \
601603
./provisionerd/proto/provisionerd.proto
602604

605+
vpn/vpn.pb.go: vpn/vpn.proto
606+
protoc \
607+
--go_out=. \
608+
--go_opt=paths=source_relative \
609+
./vpn/vpn.proto
610+
603611
site/src/api/typesGenerated.ts: $(wildcard scripts/apitypings/*) $(shell find ./codersdk $(FIND_EXCLUSIONS) -type f -name '*.go')
604612
go run ./scripts/apitypings/ > $@
605613
./scripts/pnpm_install.sh

‎buildinfo/buildinfo.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ var (
2424
// Updated by buildinfo_slim.go on start.
2525
slim bool
2626

27+
// Updated by buildinfo_site.go on start.
28+
site bool
29+
2730
// Injected with ldflags at build, see scripts/build_go.sh
2831
tag string
2932
agpl string // either "true" or "false", ldflags does not support bools
@@ -95,6 +98,11 @@ func IsSlim() bool {
9598
return slim
9699
}
97100

101+
// HasSite returns true if the frontend is embedded in the build.
102+
func HasSite() bool {
103+
return site
104+
}
105+
98106
// IsAGPL returns true if this is an AGPL build.
99107
func IsAGPL() bool {
100108
return strings.Contains(agpl, "t")

‎buildinfo/buildinfo_site.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
//go:build embed
2+
3+
package buildinfo
4+
5+
func init() {
6+
site = true
7+
}

‎cli/cliui/agent.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,9 @@ func (d ConnDiags) Write(w io.Writer) {
370370
for _, msg := range general {
371371
_, _ = fmt.Fprintln(w, msg)
372372
}
373+
if len(general) > 0 {
374+
_, _ = fmt.Fprintln(w, "")
375+
}
373376
if len(client) > 0 {
374377
_, _ = fmt.Fprint(w, "Possible client-side issues with direct connection:\n\n")
375378
for _, msg := range client {
@@ -385,12 +388,6 @@ func (d ConnDiags) Write(w io.Writer) {
385388
}
386389

387390
func (d ConnDiags) splitDiagnostics() (general, client, agent []string) {
388-
if d.PingP2P {
389-
general = append(general, "✔ You are connected directly (p2p)")
390-
} else {
391-
general = append(general, "❗ You are connected via a DERP relay, not directly (p2p)")
392-
}
393-
394391
if d.AgentNetcheck != nil {
395392
for _, msg := range d.AgentNetcheck.Interfaces.Warnings {
396393
agent = append(agent, msg.Message)
@@ -461,5 +458,6 @@ func (d ConnDiags) splitDiagnostics() (general, client, agent []string) {
461458
agent = append(agent,
462459
fmt.Sprintf("Agent IP address is within an AWS range (AWS uses hard NAT)\n %s#endpoint-dependent-nat-hard-nat", d.TroubleshootingURL))
463460
}
461+
464462
return general, client, agent
465463
}

‎cli/cliui/agent_test.go

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -683,19 +683,6 @@ func TestConnDiagnostics(t *testing.T) {
683683
diags cliui.ConnDiags
684684
want []string
685685
}{
686-
{
687-
name: "Direct",
688-
diags: cliui.ConnDiags{
689-
ConnInfo: workspacesdk.AgentConnectionInfo{
690-
DERPMap: &tailcfg.DERPMap{},
691-
},
692-
PingP2P: true,
693-
LocalNetInfo: &tailcfg.NetInfo{},
694-
},
695-
want: []string{
696-
`✔ You are connected directly (p2p)`,
697-
},
698-
},
699686
{
700687
name: "DirectBlocked",
701688
diags: cliui.ConnDiags{
@@ -705,7 +692,6 @@ func TestConnDiagnostics(t *testing.T) {
705692
},
706693
},
707694
want: []string{
708-
`❗ You are connected via a DERP relay, not directly (p2p)`,
709695
`❗ Your Coder administrator has blocked direct connections`,
710696
},
711697
},
@@ -718,7 +704,6 @@ func TestConnDiagnostics(t *testing.T) {
718704
LocalNetInfo: &tailcfg.NetInfo{},
719705
},
720706
want: []string{
721-
`❗ You are connected via a DERP relay, not directly (p2p)`,
722707
`The DERP map is not configured to use STUN`,
723708
},
724709
},
@@ -743,7 +728,6 @@ func TestConnDiagnostics(t *testing.T) {
743728
},
744729
},
745730
want: []string{
746-
`❗ You are connected via a DERP relay, not directly (p2p)`,
747731
`Client could not connect to STUN over UDP`,
748732
},
749733
},
@@ -770,7 +754,6 @@ func TestConnDiagnostics(t *testing.T) {
770754
},
771755
},
772756
want: []string{
773-
`❗ You are connected via a DERP relay, not directly (p2p)`,
774757
`Agent could not connect to STUN over UDP`,
775758
},
776759
},
@@ -785,7 +768,6 @@ func TestConnDiagnostics(t *testing.T) {
785768
},
786769
},
787770
want: []string{
788-
`❗ You are connected via a DERP relay, not directly (p2p)`,
789771
`Client is potentially behind a hard NAT, as multiple endpoints were retrieved from different STUN servers`,
790772
},
791773
},
@@ -795,14 +777,12 @@ func TestConnDiagnostics(t *testing.T) {
795777
ConnInfo: workspacesdk.AgentConnectionInfo{
796778
DERPMap: &tailcfg.DERPMap{},
797779
},
798-
PingP2P: false,
799780
LocalNetInfo: &tailcfg.NetInfo{},
800781
AgentNetcheck: &healthsdk.AgentNetcheckReport{
801782
NetInfo: &tailcfg.NetInfo{MappingVariesByDestIP: "true"},
802783
},
803784
},
804785
want: []string{
805-
`❗ You are connected via a DERP relay, not directly (p2p)`,
806786
`Agent is potentially behind a hard NAT, as multiple endpoints were retrieved from different STUN servers`,
807787
},
808788
},
@@ -812,7 +792,6 @@ func TestConnDiagnostics(t *testing.T) {
812792
ConnInfo: workspacesdk.AgentConnectionInfo{
813793
DERPMap: &tailcfg.DERPMap{},
814794
},
815-
PingP2P: true,
816795
AgentNetcheck: &healthsdk.AgentNetcheckReport{
817796
Interfaces: healthsdk.InterfacesReport{
818797
BaseReport: healthsdk.BaseReport{
@@ -824,7 +803,6 @@ func TestConnDiagnostics(t *testing.T) {
824803
},
825804
},
826805
want: []string{
827-
`✔ You are connected directly (p2p)`,
828806
`Network interface eth0 has MTU 1280, (less than 1378), which may degrade the quality of direct connections`,
829807
},
830808
},
@@ -834,7 +812,6 @@ func TestConnDiagnostics(t *testing.T) {
834812
ConnInfo: workspacesdk.AgentConnectionInfo{
835813
DERPMap: &tailcfg.DERPMap{},
836814
},
837-
PingP2P: true,
838815
LocalInterfaces: &healthsdk.InterfacesReport{
839816
BaseReport: healthsdk.BaseReport{
840817
Warnings: []health.Message{
@@ -844,7 +821,6 @@ func TestConnDiagnostics(t *testing.T) {
844821
},
845822
},
846823
want: []string{
847-
`✔ You are connected directly (p2p)`,
848824
`Network interface eth1 has MTU 1310, (less than 1378), which may degrade the quality of direct connections`,
849825
},
850826
},
@@ -858,7 +834,6 @@ func TestConnDiagnostics(t *testing.T) {
858834
AgentIPIsAWS: false,
859835
},
860836
want: []string{
861-
`❗ You are connected via a DERP relay, not directly (p2p)`,
862837
`Client IP address is within an AWS range (AWS uses hard NAT)`,
863838
},
864839
},
@@ -872,7 +847,6 @@ func TestConnDiagnostics(t *testing.T) {
872847
AgentIPIsAWS: true,
873848
},
874849
want: []string{
875-
`❗ You are connected via a DERP relay, not directly (p2p)`,
876850
`Agent IP address is within an AWS range (AWS uses hard NAT)`,
877851
},
878852
},

‎cli/cliui/table.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,10 @@ func renderTable(out any, sort string, headers table.Row, filterColumns []string
199199
if val != nil {
200200
v = *val
201201
}
202+
case *time.Duration:
203+
if val != nil {
204+
v = val.String()
205+
}
202206
case fmt.Stringer:
203207
if val != nil {
204208
v = val.String()

‎cli/notifications_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ func createOpts(t *testing.T) *coderdtest.Options {
2020
t.Helper()
2121

2222
dt := coderdtest.DeploymentValues(t)
23-
dt.Experiments = []string{string(codersdk.ExperimentNotifications)}
2423
return &coderdtest.Options{
2524
DeploymentValues: dt,
2625
}

0 commit comments

Comments
 (0)