Skip to content

Commit 745868f

Browse files
coadlercoadler
authored
revert: chore: upgrade tailscale (#7236)
1 parent 300ae4a commit 745868f

File tree

4 files changed

+93
-92
lines changed

4 files changed

+93
-92
lines changed

‎coderd/healthcheck/derp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func (r *DERPReport) Run(ctx context.Context, opts *DERPReportOptions) {
101101
r.mu.Unlock()
102102
}
103103
nc := &netcheck.Client{
104-
PortMapper: portmapper.NewClient(tslogger.WithPrefix(ncLogf, "portmap: "), nil, nil),
104+
PortMapper: portmapper.NewClient(tslogger.WithPrefix(ncLogf, "portmap: "), nil),
105105
Logf: tslogger.WithPrefix(ncLogf, "netcheck: "),
106106
}
107107
r.Netcheck, r.NetcheckErr = nc.GetReport(ctx, opts.DERPMap)

‎go.mod

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ replace github.com/dlclark/regexp2 => github.com/dlclark/regexp2 v1.7.0
3636

3737
// There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here:
3838
// https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main
39-
replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20230419174344-108bab9314c6
39+
replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20230418202606-ed9307cf1b22
4040

4141
// Switch to our fork that imports fixes from http://github.com/tailscale/ssh.
4242
// See: https://github.com/coder/coder/issues/3371
@@ -128,7 +128,7 @@ require (
128128
github.com/pkg/sftp v1.13.6-0.20221018182125-7da137aa03f0
129129
github.com/prometheus/client_golang v1.14.0
130130
github.com/prometheus/client_model v0.3.0
131-
github.com/prometheus/common v0.41.0
131+
github.com/prometheus/common v0.40.0
132132
github.com/quasilyte/go-ruleguard/dsl v0.3.21
133133
github.com/robfig/cron/v3 v3.0.1
134134
github.com/spf13/afero v1.9.3
@@ -154,23 +154,23 @@ require (
154154
go4.org/netipx v0.0.0-20220725152314-7e7bdc8411bf
155155
golang.org/x/crypto v0.7.0
156156
golang.org/x/exp v0.0.0-20221205204356-47842c84f3db
157-
golang.org/x/mod v0.9.0
157+
golang.org/x/mod v0.8.0
158158
golang.org/x/oauth2 v0.5.0
159159
golang.org/x/sync v0.1.0
160160
golang.org/x/sys v0.7.0
161161
golang.org/x/term v0.6.0
162-
golang.org/x/tools v0.7.0
162+
golang.org/x/tools v0.6.0
163163
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
164164
golang.zx2c4.com/wireguard v0.0.0-20230223181233-21636207a675
165165
google.golang.org/api v0.108.0
166166
google.golang.org/grpc v1.54.0
167-
google.golang.org/protobuf v1.30.0
167+
google.golang.org/protobuf v1.28.2-0.20230118093459-a9481185b34d
168168
gopkg.in/natefinch/lumberjack.v2 v2.0.0
169169
gopkg.in/yaml.v3 v3.0.1
170-
gvisor.dev/gvisor v0.0.0-20230328175328-162ed5ef888d
170+
gvisor.dev/gvisor v0.0.0-20221203005347-703fd9b7fbc0
171171
nhooyr.io/websocket v1.8.7
172172
storj.io/drpc v0.0.33-0.20220622181519-9206537a4db7
173-
tailscale.com v1.38.4
173+
tailscale.com v1.32.2
174174
)
175175

176176
require (
@@ -190,18 +190,6 @@ require (
190190
github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74 // indirect
191191
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
192192
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
193-
github.com/aws/aws-sdk-go-v2 v1.17.3 // indirect
194-
github.com/aws/aws-sdk-go-v2/config v1.11.0 // indirect
195-
github.com/aws/aws-sdk-go-v2/credentials v1.6.4 // indirect
196-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.8.2 // indirect
197-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 // indirect
198-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 // indirect
199-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.2 // indirect
200-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.5.2 // indirect
201-
github.com/aws/aws-sdk-go-v2/service/ssm v1.35.0 // indirect
202-
github.com/aws/aws-sdk-go-v2/service/sso v1.6.2 // indirect
203-
github.com/aws/aws-sdk-go-v2/service/sts v1.11.1 // indirect
204-
github.com/aws/smithy-go v1.13.5 // indirect
205193
github.com/aymanbagabas/go-osc52 v1.2.1 // indirect
206194
github.com/aymerick/douceur v0.2.0 // indirect
207195
github.com/beorn7/perks v1.0.1 // indirect
@@ -265,11 +253,11 @@ require (
265253
github.com/illarion/gonotify v1.0.1 // indirect
266254
github.com/imdario/mergo v0.3.13 // indirect
267255
github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8 // indirect
268-
github.com/jmespath/go-jmespath v0.4.0 // indirect
269256
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
270257
github.com/josharian/intern v1.0.0 // indirect
271258
github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 // indirect
272259
github.com/jsimonetti/rtnetlink v1.1.2-0.20220408201609-d380b505068b // indirect
260+
github.com/json-iterator/go v1.1.12 // indirect
273261
github.com/juju/errors v1.0.0 // indirect
274262
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
275263
github.com/kortschak/wol v0.0.0-20200729010619-da482cc4850a // indirect
@@ -283,9 +271,9 @@ require (
283271
github.com/mattn/go-sqlite3 v1.14.15 // indirect
284272
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
285273
github.com/mdlayher/genetlink v1.2.0 // indirect
286-
github.com/mdlayher/netlink v1.7.1 // indirect
274+
github.com/mdlayher/netlink v1.6.2 // indirect
287275
github.com/mdlayher/sdnotify v1.0.0 // indirect
288-
github.com/mdlayher/socket v0.4.0 // indirect
276+
github.com/mdlayher/socket v0.2.3 // indirect
289277
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
290278
github.com/microcosm-cc/bluemonday v1.0.23 // indirect
291279
github.com/miekg/dns v1.1.45 // indirect
@@ -294,6 +282,8 @@ require (
294282
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
295283
github.com/mitchellh/reflectwalk v1.0.2 // indirect
296284
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
285+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
286+
github.com/modern-go/reflect2 v1.0.2 // indirect
297287
github.com/muesli/ansi v0.0.0-20221106050444-61f0cd9a192a // indirect
298288
github.com/muesli/cancelreader v0.2.2 // indirect
299289
github.com/muesli/termenv v0.14.0 // indirect
@@ -320,7 +310,7 @@ require (
320310
github.com/tailscale/golang-x-crypto v0.0.0-20221102133106-bc99ab8c2d17 // indirect
321311
github.com/tailscale/goupnp v1.0.1-0.20210804011211-c64d0f06ea05 // indirect
322312
github.com/tailscale/netlink v1.1.1-0.20211101221916-cabfb018fe85 // indirect
323-
github.com/tailscale/wireguard-go v0.0.0-20230410165232-af172621b4dd // indirect
313+
github.com/tailscale/wireguard-go v0.0.0-20221219190806-4fa124729667 // indirect
324314
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
325315
github.com/tcnksm/go-httpstat v0.2.0 // indirect
326316
github.com/tdewolff/parse/v2 v2.6.4 // indirect

0 commit comments

Comments
 (0)