Commitd566008

authored

fix: update tailscale to improve block endpoints functionality (#17496)

Direct endpoints from the peer will no longer be processed.

1 parentafb175d commitd566008Copy full SHA for d566008

File tree

+12

-3

lines changed

+12

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ replace github.com/tcnksm/go-httpstat => github.com/coder/go-httpstat v0.0.0-202`
`36`	`36`
`37`	`37`	`// There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here:`
`38`	`38`	`// https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main`
`39`		`-replacetailscale.com =>github.com/coder/tailscalev1.1.1-0.20250410041146-e62bfe0e9301`
	`39`	`+replacetailscale.com =>github.com/coder/tailscalev1.1.1-0.20250422090654-5090e715905e`
`40`	`40`
`41`	`41`	`// This is replaced to include`
`42`	`42`	`// 1. a fix for a data race: c.f. https://github.com/tailscale/wireguard-go/pull/25`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -919,8 +919,8 @@ github.com/coder/serpent v0.10.0 h1:ofVk9FJXSek+SmL3yVE3GoArP83M+1tX+H7S4t8BSuM=`
`919`	`919`	`github.com/coder/serpentv0.10.0/go.mod h1:cZFW6/fP+kE9nd/oRkEHJpG6sXCtQ+AX7WMMEHv0Y3Q=`
`920`	`920`	`github.com/coder/sshv0.0.0-20231128192721-70855dedb788 h1:YoUSJ19E8AtuUFVYBpXuOD6a/zVP3rcxezNsoDseTUw=`
`921`	`921`	`github.com/coder/sshv0.0.0-20231128192721-70855dedb788/go.mod h1:aGQbuCLyhRLMzZF067xc84Lh7JDs1FKwCmF1Crl9dxQ=`
`922`		`-github.com/coder/tailscalev1.1.1-0.20250410041146-e62bfe0e9301 h1:RMo8EZAMYnM9+HtCBDvXbcgCf0t8Roo1ZLiy8fVuooQ=`
`923`		`-github.com/coder/tailscalev1.1.1-0.20250410041146-e62bfe0e9301/go.mod h1:1ggFFdHTRjPRu9Yc1yA7nVHBYB50w9Ce7VIXNqcW6Ko=`
	`922`	`+github.com/coder/tailscalev1.1.1-0.20250422090654-5090e715905e h1:nope/SZfoLB9MCOB9wdCE6gW5+8l3PhFrDC5IWPL8bk=`
	`923`	`+github.com/coder/tailscalev1.1.1-0.20250422090654-5090e715905e/go.mod h1:1ggFFdHTRjPRu9Yc1yA7nVHBYB50w9Ce7VIXNqcW6Ko=`
`924`	`924`	`github.com/coder/terraform-config-inspectv0.0.0-20250107175719-6d06d90c630e h1:JNLPDi2P73laR1oAclY6jWzAbucf70ASAvf5mh2cME0=`
`925`	`925`	`github.com/coder/terraform-config-inspectv0.0.0-20250107175719-6d06d90c630e/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=`
`926`	`926`	`github.com/coder/terraform-provider-coder/v2v2.4.0-pre1 h1:jdpJAMk5EtkOmQFs9+hFC8eRxiEdrTrzwAzepiIejto=`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ import (`
`12`	`12`	`"net/http"`
`13`	`13`	`"net/url"`
`14`	`14`	`"os"`
	`15`	`+"os/exec"`
`15`	`16`	`"os/signal"`
`16`	`17`	`"path/filepath"`
`17`	`18`	`"runtime"`
`@@ -156,6 +157,14 @@ func TestIntegration(t *testing.T) {`
`156`	`157`	`// isolated NetNS.`
`157`	`158`	`t.Parallel()`
`158`	`159`
	`160`	`+// Fail early if NGINX is not installed in tests that require it.`
	`161`	`+if_,ok:=topo.Server.(integration.NGINXServerOptions);ok {`
	`162`	`+_,err:=exec.LookPath("nginx")`
	`163`	`+iferr!=nil {`
	`164`	`+t.Fatalf("could not find nginx in PATH: %v",err)`
	`165`	`+}`
	`166`	`+}`
	`167`	`+`
`159`	`168`	`log:=testutil.Logger(t)`
`160`	`169`	`networking:=topo.SetupNetworking(t,log)`
`161`	`170`

Comments

(0)