mirror of
https://github.com/tailscale/tailscale.git
synced 2025-03-31 21:42:24 +00:00
derp/derphttp: remove ban on websockets dependency
The event bus's debug page uses websockets. Updates #15160 Signed-off-by: David Anderson <dave@tailscale.com>
This commit is contained in:
parent
7bd134bc1b
commit
d64dc29714
@ -678,7 +678,6 @@ var tstunNew = tstun.New
|
|||||||
|
|
||||||
func tryEngine(logf logger.Logf, sys *tsd.System, name string) (onlyNetstack bool, err error) {
|
func tryEngine(logf logger.Logf, sys *tsd.System, name string) (onlyNetstack bool, err error) {
|
||||||
conf := wgengine.Config{
|
conf := wgengine.Config{
|
||||||
EventBus: sys.Bus.Get(),
|
|
||||||
ListenPort: args.port,
|
ListenPort: args.port,
|
||||||
NetMon: sys.NetMon.Get(),
|
NetMon: sys.NetMon.Get(),
|
||||||
HealthTracker: sys.HealthTracker(),
|
HealthTracker: sys.HealthTracker(),
|
||||||
|
@ -32,7 +32,6 @@ import (
|
|||||||
"tailscale.com/net/tsdial"
|
"tailscale.com/net/tsdial"
|
||||||
"tailscale.com/tailcfg"
|
"tailscale.com/tailcfg"
|
||||||
"tailscale.com/tstest"
|
"tailscale.com/tstest"
|
||||||
"tailscale.com/tstest/deptest"
|
|
||||||
"tailscale.com/tstime"
|
"tailscale.com/tstime"
|
||||||
"tailscale.com/types/key"
|
"tailscale.com/types/key"
|
||||||
"tailscale.com/types/logger"
|
"tailscale.com/types/logger"
|
||||||
@ -822,14 +821,3 @@ func (c *closeTrackConn) Close() error {
|
|||||||
c.d.noteClose(c)
|
c.d.noteClose(c)
|
||||||
return c.Conn.Close()
|
return c.Conn.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestDeps(t *testing.T) {
|
|
||||||
deptest.DepChecker{
|
|
||||||
GOOS: "darwin",
|
|
||||||
GOARCH: "arm64",
|
|
||||||
BadDeps: map[string]string{
|
|
||||||
// Only the controlhttpserver needs WebSockets...
|
|
||||||
"github.com/coder/websocket": "controlhttp client shouldn't need websockets",
|
|
||||||
},
|
|
||||||
}.Check(t)
|
|
||||||
}
|
|
||||||
|
@ -17,9 +17,7 @@ import (
|
|||||||
|
|
||||||
"tailscale.com/derp"
|
"tailscale.com/derp"
|
||||||
"tailscale.com/net/netmon"
|
"tailscale.com/net/netmon"
|
||||||
"tailscale.com/tstest/deptest"
|
|
||||||
"tailscale.com/types/key"
|
"tailscale.com/types/key"
|
||||||
"tailscale.com/util/set"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestSendRecv(t *testing.T) {
|
func TestSendRecv(t *testing.T) {
|
||||||
@ -487,23 +485,3 @@ func TestProbe(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestDeps(t *testing.T) {
|
|
||||||
deptest.DepChecker{
|
|
||||||
GOOS: "darwin",
|
|
||||||
GOARCH: "arm64",
|
|
||||||
BadDeps: map[string]string{
|
|
||||||
"github.com/coder/websocket": "shouldn't link websockets except on js/wasm",
|
|
||||||
},
|
|
||||||
}.Check(t)
|
|
||||||
|
|
||||||
deptest.DepChecker{
|
|
||||||
GOOS: "darwin",
|
|
||||||
GOARCH: "arm64",
|
|
||||||
Tags: "ts_debug_websockets",
|
|
||||||
WantDeps: set.Of(
|
|
||||||
"github.com/coder/websocket",
|
|
||||||
),
|
|
||||||
}.Check(t)
|
|
||||||
|
|
||||||
}
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user