fix: upgrade tailscale to fix STUN probes on dual stack

spikecurtis · spikecurtis · commit 0bdc2dfb0c79 · 2023-11-07T08:29:14.000+04:00
diff --git a/coderd/healthcheck/derphealth/derp_test.go b/coderd/healthcheck/derphealth/derp_test.go
@@ -69,9 +69,9 @@ func TestDERP(t *testing.T) {
 				assert.True(t, node.CanExchangeMessages)
 				assert.NotEmpty(t, node.RoundTripPing)
 				assert.Len(t, node.ClientLogs, 2)
-				assert.Len(t, node.ClientLogs[0], 1)
+				assert.Len(t, node.ClientLogs[0], 3)
 				assert.Len(t, node.ClientErrs[0], 0)
-				assert.Len(t, node.ClientLogs[1], 1)
+				assert.Len(t, node.ClientLogs[1], 3)
 				assert.Len(t, node.ClientErrs[1], 0)
 
 				assert.False(t, node.STUN.Enabled)
@@ -113,9 +113,11 @@ func TestDERP(t *testing.T) {
 				assert.True(t, node.CanExchangeMessages)
 				assert.NotEmpty(t, node.RoundTripPing)
 				assert.Len(t, node.ClientLogs, 2)
-				assert.Len(t, node.ClientLogs[0], 1)
+				// the exact number of logs depends on the certificates, which we don't control.
+				assert.GreaterOrEqual(t, len(node.ClientLogs[0]), 1)
 				assert.Len(t, node.ClientErrs[0], 0)
-				assert.Len(t, node.ClientLogs[1], 1)
+				// the exact number of logs depends on the certificates, which we don't control.
+				assert.GreaterOrEqual(t, len(node.ClientLogs[1]), 1)
 				assert.Len(t, node.ClientErrs[1], 0)
 
 				assert.True(t, node.STUN.Enabled)
@@ -125,7 +127,7 @@ func TestDERP(t *testing.T) {
 		}
 	})
 
-	t.Run("ForceWebsockets", func(t *testing.T) {
+	t.Run("FailoverToWebsockets", func(t *testing.T) {
 		t.Parallel()
 
 		derpSrv := derp.NewServer(key.NewNode(), func(format string, args ...any) { t.Logf(format, args...) })
@@ -176,8 +178,8 @@ func TestDERP(t *testing.T) {
 				assert.True(t, node.CanExchangeMessages)
 				assert.NotEmpty(t, node.RoundTripPing)
 				assert.Len(t, node.ClientLogs, 2)
-				assert.Len(t, node.ClientLogs[0], 3)
-				assert.Len(t, node.ClientLogs[1], 3)
+				assert.Len(t, node.ClientLogs[0], 5)
+				assert.Len(t, node.ClientLogs[1], 5)
 				assert.Len(t, node.ClientErrs, 2)
 				assert.Len(t, node.ClientErrs[0], 1) // this
 				assert.Len(t, node.ClientErrs[1], 1)
diff --git a/go.mod b/go.mod
@@ -33,7 +33,7 @@ replace github.com/dlclark/regexp2 => github.com/dlclark/regexp2 v1.7.0
 
 // There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here:
 // https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main
-replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20231030172646-324d125f1d8f
+replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20231106123012-ba3acaa26275
 
 // Fixes a race-condition in coder/wgtunnel.
 // Upstream PR: https://github.com/WireGuard/wireguard-go/pull/85
diff --git a/go.sum b/go.sum
@@ -232,8 +232,8 @@ github.com/coder/retry v1.4.0 h1:g0fojHFxcdgM3sBULqgjFDxw1UIvaCqk4ngUDu0EWag=
 github.com/coder/retry v1.4.0/go.mod h1:blHMk9vs6LkoRT9ZHyuZo360cufXEhrxqvEzeMtRGoY=
 github.com/coder/ssh v0.0.0-20230621095435-9a7e23486f1c h1:TI7TzdFI0UvQmwgyQhtI1HeyYNRxAQpr8Tw/rjT8VSA=
 github.com/coder/ssh v0.0.0-20230621095435-9a7e23486f1c/go.mod h1:aGQbuCLyhRLMzZF067xc84Lh7JDs1FKwCmF1Crl9dxQ=
-github.com/coder/tailscale v1.1.1-0.20231030172646-324d125f1d8f h1:M+UeuoMLQeduc1tXB4VuOAXBLHGrsl9YCo8MuGqbgD4=
-github.com/coder/tailscale v1.1.1-0.20231030172646-324d125f1d8f/go.mod h1:L8tPrwSi31RAMEMV8rjb0vYTGs7rXt8rAHbqY/p41j4=
+github.com/coder/tailscale v1.1.1-0.20231106123012-ba3acaa26275 h1:FhaWxLBGCPaX6+0yRy98OrmsDK6mr/jvwBilCW42otE=
+github.com/coder/tailscale v1.1.1-0.20231106123012-ba3acaa26275/go.mod h1:L8tPrwSi31RAMEMV8rjb0vYTGs7rXt8rAHbqY/p41j4=
 github.com/coder/terraform-provider-coder v0.12.2 h1:KsnJLHyTtELvV1Rzkm75iCQ7npXjL0KcoU3NTreagZU=
 github.com/coder/terraform-provider-coder v0.12.2/go.mod h1:+BHer8AX5Y0QqZS9viau+ZkDTaOCOE3ga1lx1QIJDrk=
 github.com/coder/wgtunnel v0.1.12 h1:j3v1Q7qyplrRyyNPm0DK50d3O3flboIErxBFhm4NCkA=
