Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc87deb8

Browse files
authored
fix: upgrade tailscale to fix STUN probes on dual stack (#10535)
Fixes STUN probe issues on dual stack systems by incorporatingcoder/tailscale#43
1 parent14925e7 commitc87deb8

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

‎coderd/healthcheck/derphealth/derp_test.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ func TestDERP(t *testing.T) {
6969
assert.True(t,node.CanExchangeMessages)
7070
assert.NotEmpty(t,node.RoundTripPing)
7171
assert.Len(t,node.ClientLogs,2)
72-
assert.Len(t,node.ClientLogs[0],1)
72+
assert.Len(t,node.ClientLogs[0],3)
7373
assert.Len(t,node.ClientErrs[0],0)
74-
assert.Len(t,node.ClientLogs[1],1)
74+
assert.Len(t,node.ClientLogs[1],3)
7575
assert.Len(t,node.ClientErrs[1],0)
7676

7777
assert.False(t,node.STUN.Enabled)
@@ -113,9 +113,11 @@ func TestDERP(t *testing.T) {
113113
assert.True(t,node.CanExchangeMessages)
114114
assert.NotEmpty(t,node.RoundTripPing)
115115
assert.Len(t,node.ClientLogs,2)
116-
assert.Len(t,node.ClientLogs[0],1)
116+
// the exact number of logs depends on the certificates, which we don't control.
117+
assert.GreaterOrEqual(t,len(node.ClientLogs[0]),1)
117118
assert.Len(t,node.ClientErrs[0],0)
118-
assert.Len(t,node.ClientLogs[1],1)
119+
// the exact number of logs depends on the certificates, which we don't control.
120+
assert.GreaterOrEqual(t,len(node.ClientLogs[1]),1)
119121
assert.Len(t,node.ClientErrs[1],0)
120122

121123
assert.True(t,node.STUN.Enabled)
@@ -125,7 +127,7 @@ func TestDERP(t *testing.T) {
125127
}
126128
})
127129

128-
t.Run("ForceWebsockets",func(t*testing.T) {
130+
t.Run("FailoverToWebsockets",func(t*testing.T) {
129131
t.Parallel()
130132

131133
derpSrv:=derp.NewServer(key.NewNode(),func(formatstring,args...any) {t.Logf(format,args...) })
@@ -176,8 +178,8 @@ func TestDERP(t *testing.T) {
176178
assert.True(t,node.CanExchangeMessages)
177179
assert.NotEmpty(t,node.RoundTripPing)
178180
assert.Len(t,node.ClientLogs,2)
179-
assert.Len(t,node.ClientLogs[0],3)
180-
assert.Len(t,node.ClientLogs[1],3)
181+
assert.Len(t,node.ClientLogs[0],5)
182+
assert.Len(t,node.ClientLogs[1],5)
181183
assert.Len(t,node.ClientErrs,2)
182184
assert.Len(t,node.ClientErrs[0],1)// this
183185
assert.Len(t,node.ClientErrs[1],1)

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ replace github.com/dlclark/regexp2 => github.com/dlclark/regexp2 v1.7.0
3333

3434
// There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here:
3535
// https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main
36-
replacetailscale.com =>github.com/coder/tailscalev1.1.1-0.20231030172646-324d125f1d8f
36+
replacetailscale.com =>github.com/coder/tailscalev1.1.1-0.20231106123012-ba3acaa26275
3737

3838
// Fixes a race-condition in coder/wgtunnel.
3939
// Upstream PR: https://github.com/WireGuard/wireguard-go/pull/85

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ github.com/coder/retry v1.4.0 h1:g0fojHFxcdgM3sBULqgjFDxw1UIvaCqk4ngUDu0EWag=
232232
github.com/coder/retryv1.4.0/go.mod h1:blHMk9vs6LkoRT9ZHyuZo360cufXEhrxqvEzeMtRGoY=
233233
github.com/coder/sshv0.0.0-20230621095435-9a7e23486f1c h1:TI7TzdFI0UvQmwgyQhtI1HeyYNRxAQpr8Tw/rjT8VSA=
234234
github.com/coder/sshv0.0.0-20230621095435-9a7e23486f1c/go.mod h1:aGQbuCLyhRLMzZF067xc84Lh7JDs1FKwCmF1Crl9dxQ=
235-
github.com/coder/tailscalev1.1.1-0.20231030172646-324d125f1d8f h1:M+UeuoMLQeduc1tXB4VuOAXBLHGrsl9YCo8MuGqbgD4=
236-
github.com/coder/tailscalev1.1.1-0.20231030172646-324d125f1d8f/go.mod h1:L8tPrwSi31RAMEMV8rjb0vYTGs7rXt8rAHbqY/p41j4=
235+
github.com/coder/tailscalev1.1.1-0.20231106123012-ba3acaa26275 h1:FhaWxLBGCPaX6+0yRy98OrmsDK6mr/jvwBilCW42otE=
236+
github.com/coder/tailscalev1.1.1-0.20231106123012-ba3acaa26275/go.mod h1:L8tPrwSi31RAMEMV8rjb0vYTGs7rXt8rAHbqY/p41j4=
237237
github.com/coder/terraform-provider-coderv0.12.2 h1:KsnJLHyTtELvV1Rzkm75iCQ7npXjL0KcoU3NTreagZU=
238238
github.com/coder/terraform-provider-coderv0.12.2/go.mod h1:+BHer8AX5Y0QqZS9viau+ZkDTaOCOE3ga1lx1QIJDrk=
239239
github.com/coder/wgtunnelv0.1.12 h1:j3v1Q7qyplrRyyNPm0DK50d3O3flboIErxBFhm4NCkA=

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp