chore: update coder/coder to use branch of coder/tailscale

Emyrk · Emyrk · commit 26b4ad429cc5 · 2024-12-18T14:01:29.000-06:00
diff --git a/go.mod b/go.mod
@@ -39,7 +39,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.20241003034647-02286e537fc2
+replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20241218194148-d8574de4b4ca
 
 // This is replaced to include
 // 1. a fix for a data race: c.f. https://github.com/tailscale/wireguard-go/pull/25
@@ -230,6 +230,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect
 	github.com/charmbracelet/x/ansi v0.4.5 // indirect
 	github.com/charmbracelet/x/term v0.2.0 // indirect
+	github.com/coder/websocket v1.8.12 // indirect
 	github.com/dop251/goja v0.0.0-20241024094426-79f3a7efcdbd // indirect
 	github.com/eapache/queue/v2 v2.0.0-20230407133247-75960ed334e4 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
diff --git a/go.sum b/go.sum
@@ -234,10 +234,12 @@ github.com/coder/serpent v0.10.0 h1:ofVk9FJXSek+SmL3yVE3GoArP83M+1tX+H7S4t8BSuM=
 github.com/coder/serpent v0.10.0/go.mod h1:cZFW6/fP+kE9nd/oRkEHJpG6sXCtQ+AX7WMMEHv0Y3Q=
 github.com/coder/ssh v0.0.0-20231128192721-70855dedb788 h1:YoUSJ19E8AtuUFVYBpXuOD6a/zVP3rcxezNsoDseTUw=
 github.com/coder/ssh v0.0.0-20231128192721-70855dedb788/go.mod h1:aGQbuCLyhRLMzZF067xc84Lh7JDs1FKwCmF1Crl9dxQ=
-github.com/coder/tailscale v1.1.1-0.20241003034647-02286e537fc2 h1:mBbPFyJ2i9o490IwWGvWgtG0qmvIk45R7GWJpoaXotI=
-github.com/coder/tailscale v1.1.1-0.20241003034647-02286e537fc2/go.mod h1:rp6BIJxCp127/hvvDWNkHC9MxAlKvQfoOtBr8s5sCqo=
+github.com/coder/tailscale v1.1.1-0.20241218194148-d8574de4b4ca h1:3b/X2PKsfBG1RNFmnQs918xx7iJW7g9X0N9lEBzTN1I=
+github.com/coder/tailscale v1.1.1-0.20241218194148-d8574de4b4ca/go.mod h1:LOne094of6xzi3PdF+WyhPvKjK5zVuGADQ8WP46iIrM=
 github.com/coder/terraform-provider-coder v1.0.2 h1:xKbnJF/XUxcUJlZoC3ZkNOj4PZvk5Stdkel2TCZluDQ=
 github.com/coder/terraform-provider-coder v1.0.2/go.mod h1:1f3EjO+DA9QcIbM7sBSk/Ffw3u7kh6vXNBIQfV59yUk=
+github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
+github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
 github.com/coder/wgtunnel v0.1.13-0.20240522110300-ade90dfb2da0 h1:C2/eCr+r0a5Auuw3YOiSyLNHkdMtyCZHPFBx7syN4rk=
 github.com/coder/wgtunnel v0.1.13-0.20240522110300-ade90dfb2da0/go.mod h1:qANbdpqyAGlo2bg+4gQKPj24H1ZWa3bQU2Q5/bV5B3Y=
 github.com/coder/wireguard-go v0.0.0-20240522052547-769cdd7f7818 h1:bNhUTaKl3q0bFn78bBRq7iIwo72kNTvUD9Ll5TTzDDk=
diff --git a/tailnet/derp.go b/tailnet/derp.go
@@ -10,7 +10,6 @@ import (
 
 	"nhooyr.io/websocket"
 	"tailscale.com/derp"
-	"tailscale.com/net/wsconn"
 )
 
 // WithWebsocketSupport returns an http.Handler that upgrades
@@ -60,7 +59,7 @@ func WithWebsocketSupport(s *derp.Server, base http.Handler) (http.Handler, func
 				c.Close(websocket.StatusPolicyViolation, "client must speak the derp subprotocol")
 				return
 			}
-			wc := wsconn.NetConn(ctx, c, websocket.MessageBinary)
+			wc := websocket.NetConn(ctx, c, websocket.MessageBinary)
 			brw := bufio.NewReadWriter(bufio.NewReader(wc), bufio.NewWriter(wc))
 			s.Accept(ctx, wc, brw, r.RemoteAddr)
 		}), func() {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ import (`
`10`	`10`
`11`	`11`	`"nhooyr.io/websocket"`
`12`	`12`	`"tailscale.com/derp"`
`13`		`- "tailscale.com/net/wsconn"`
`14`	`13`	`)`
`15`	`14`
`16`	`15`	`// WithWebsocketSupport returns an http.Handler that upgrades`
`@@ -60,7 +59,7 @@ func WithWebsocketSupport(s *derp.Server, base http.Handler) (http.Handler, func`
`60`	`59`	`c.Close(websocket.StatusPolicyViolation, "client must speak the derp subprotocol")`
`61`	`60`	`return`
`62`	`61`	`}`
`63`		`- wc := wsconn.NetConn(ctx, c, websocket.MessageBinary)`
	`62`	`+ wc := websocket.NetConn(ctx, c, websocket.MessageBinary)`
`64`	`63`	`brw := bufio.NewReadWriter(bufio.NewReader(wc), bufio.NewWriter(wc))`
`65`	`64`	`s.Accept(ctx, wc, brw, r.RemoteAddr)`
`66`	`65`	`}), func() {`