Skip to content

Commit 1bbe37a

Browse files
coadlercoadler
authored
chore: update tailscale (#4903)
1 parent 8e743d2 commit 1bbe37a

File tree

3 files changed

+26
-32
lines changed

3 files changed

+26
-32
lines changed

‎cli/speedtest.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,13 @@ func speedtest() *cobra.Command {
101101
}
102102
tableWriter := cliui.Table()
103103
tableWriter.AppendHeader(table.Row{"Interval", "Transfer", "Bandwidth"})
104+
startTime := results[0].IntervalStart
104105
for _, r := range results {
105106
if r.Total {
106107
tableWriter.AppendSeparator()
107108
}
108109
tableWriter.AppendRow(table.Row{
109-
fmt.Sprintf("%.2f-%.2f sec", r.IntervalStart.Seconds(), r.IntervalEnd.Seconds()),
110+
fmt.Sprintf("%.2f-%.2f sec", r.IntervalStart.Sub(startTime).Seconds(), r.IntervalEnd.Sub(startTime).Seconds()),
110111
fmt.Sprintf("%.4f MBits", r.MegaBits()),
111112
fmt.Sprintf("%.4f Mbits/sec", r.MBitsPerSecond()),
112113
})

‎go.mod

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ replace github.com/tcnksm/go-httpstat => github.com/kylecarbs/go-httpstat v0.0.0
4040

4141
// There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here:
4242
// https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main
43-
replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20221015033036-5861cbbf7bf5
43+
replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20221104170440-ef53dca69a41
4444

4545
// Switch to our fork that imports fixes from http://github.com/tailscale/ssh.
4646
// See: https://github.com/coder/coder/issues/3371
@@ -54,13 +54,16 @@ replace github.com/gliderlabs/ssh => github.com/coder/ssh v0.0.0-20220811105153-
5454
require (
5555
cdr.dev/slog v1.4.2-0.20220525200111-18dce5c2cd5f
5656
cloud.google.com/go/compute v1.12.1 // indirect
57+
cloud.google.com/go/compute/metadata v0.2.1
5758
github.com/AlecAivazis/survey/v2 v2.3.5
59+
github.com/adrg/xdg v0.4.0
5860
github.com/andybalholm/brotli v1.0.4
5961
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2
6062
github.com/awalterschulze/gographviz v2.0.3+incompatible
6163
github.com/bgentry/speakeasy v0.1.0
6264
github.com/bramvdbogaerde/go-scp v1.2.0
6365
github.com/briandowns/spinner v1.18.1
66+
github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5
6467
github.com/charmbracelet/charm v0.12.1
6568
github.com/charmbracelet/lipgloss v0.6.0
6669
github.com/cli/safeexec v1.0.0
@@ -80,6 +83,7 @@ require (
8083
github.com/go-chi/chi/v5 v5.0.7
8184
github.com/go-chi/httprate v0.7.0
8285
github.com/go-chi/render v1.0.1
86+
github.com/go-logr/logr v1.2.3
8387
github.com/go-ping/ping v1.1.0
8488
github.com/go-playground/validator/v10 v10.11.0
8589
github.com/gofrs/flock v0.8.1
@@ -99,6 +103,7 @@ require (
99103
github.com/hashicorp/yamux v0.0.0-20220718163420-dd80a7ee44ce
100104
github.com/imulab/go-scim/pkg/v2 v2.2.0
101105
github.com/jedib0t/go-pretty/v6 v6.4.0
106+
github.com/jmoiron/sqlx v1.3.5
102107
github.com/justinas/nosurf v1.1.1
103108
github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f
104109
github.com/klauspost/compress v1.15.9
@@ -119,11 +124,13 @@ require (
119124
github.com/spf13/afero v1.9.2
120125
github.com/spf13/cobra v1.6.1
121126
github.com/spf13/pflag v1.0.5
127+
github.com/spf13/viper v1.13.0
122128
github.com/stretchr/testify v1.8.0
123129
github.com/tabbed/pqtype v0.1.1
124130
github.com/u-root/u-root v0.10.0
125131
github.com/unrolled/secure v1.13.0
126132
go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1
133+
go.nhat.io/otelsql v0.7.0
127134
go.opentelemetry.io/otel v1.11.1
128135
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.1
129136
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.1
@@ -132,6 +139,7 @@ require (
132139
go.opentelemetry.io/otel/trace v1.11.1
133140
go.uber.org/atomic v1.10.0
134141
go.uber.org/goleak v1.2.0
142+
go4.org/netipx v0.0.0-20220725152314-7e7bdc8411bf
135143
golang.org/x/crypto v0.1.0
136144
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
137145
golang.org/x/mod v0.6.0
@@ -145,32 +153,16 @@ require (
145153
golang.zx2c4.com/wireguard v0.0.0-20220920152132-bb719d3a6e2c
146154
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20220504211119-3d4a969bb56b
147155
google.golang.org/api v0.100.0
156+
google.golang.org/grpc v1.50.1
148157
google.golang.org/protobuf v1.28.1
149158
gopkg.in/natefinch/lumberjack.v2 v2.0.0
159+
gopkg.in/square/go-jose.v2 v2.6.0
150160
gopkg.in/yaml.v3 v3.0.1
151161
gvisor.dev/gvisor v0.0.0-20220817001344-846276b3dbc5
152162
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
153163
nhooyr.io/websocket v1.8.7
154164
storj.io/drpc v0.0.33-0.20220622181519-9206537a4db7
155-
tailscale.com v1.30.0
156-
)
157-
158-
require github.com/jmoiron/sqlx v1.3.5
159-
160-
require (
161-
cloud.google.com/go/compute/metadata v0.2.1
162-
github.com/adrg/xdg v0.4.0
163-
github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5
164-
github.com/spf13/viper v1.13.0
165-
go.nhat.io/otelsql v0.7.0
166-
)
167-
168-
require (
169-
github.com/fsnotify/fsnotify v1.6.0 // indirect
170-
github.com/magiconair/properties v1.8.6 // indirect
171-
github.com/pelletier/go-toml v1.9.5 // indirect
172-
github.com/subosito/gotenv v1.4.1 // indirect
173-
gopkg.in/ini.v1 v1.67.0 // indirect
165+
tailscale.com v1.32.2
174166
)
175167

176168
require (
@@ -204,10 +196,10 @@ require (
204196
github.com/docker/go-connections v0.4.0 // indirect
205197
github.com/docker/go-units v0.4.0 // indirect
206198
github.com/elastic/go-windows v1.0.0 // indirect
199+
github.com/fsnotify/fsnotify v1.6.0 // indirect
207200
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
208201
github.com/ghodss/yaml v1.0.0 // indirect
209202
github.com/gin-gonic/gin v1.7.0 // indirect
210-
github.com/go-logr/logr v1.2.3
211203
github.com/go-logr/stdr v1.2.2 // indirect
212204
github.com/go-ole/go-ole v1.2.6 // indirect
213205
github.com/go-playground/locales v0.14.0 // indirect
@@ -226,7 +218,7 @@ require (
226218
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
227219
github.com/hashicorp/errwrap v1.1.0 // indirect
228220
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
229-
github.com/hashicorp/go-multierror v1.1.1 // indirect
221+
github.com/hashicorp/go-multierror v1.1.1
230222
github.com/hashicorp/hcl v1.0.0 // indirect
231223
github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 // indirect
232224
github.com/imdario/mergo v0.3.12 // indirect
@@ -240,6 +232,7 @@ require (
240232
github.com/kr/fs v0.1.0 // indirect
241233
github.com/leodido/go-urn v1.2.1 // indirect
242234
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
235+
github.com/magiconair/properties v1.8.6 // indirect
243236
github.com/mattn/go-colorable v0.1.12 // indirect
244237
github.com/mattn/go-runewidth v0.0.13 // indirect
245238
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
@@ -259,6 +252,7 @@ require (
259252
github.com/opencontainers/go-digest v1.0.0 // indirect
260253
github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198 // indirect
261254
github.com/opencontainers/runc v1.1.2 // indirect
255+
github.com/pelletier/go-toml v1.9.5 // indirect
262256
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
263257
github.com/pion/transport v0.13.1 // indirect
264258
github.com/pkg/errors v0.9.1 // indirect
@@ -272,9 +266,10 @@ require (
272266
github.com/sirupsen/logrus v1.9.0 // indirect
273267
github.com/spf13/cast v1.5.0 // indirect
274268
github.com/spf13/jwalterweatherman v1.1.0 // indirect
269+
github.com/subosito/gotenv v1.4.1 // indirect
275270
github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af // indirect
276271
github.com/tailscale/certstore v0.1.1-0.20220316223106-78d6e1c49d8d // indirect
277-
github.com/tailscale/golang-x-crypto v0.0.0-20220428210705-0b941c09a5e1 // indirect
272+
github.com/tailscale/golang-x-crypto v0.0.0-20221102133106-bc99ab8c2d17 // indirect
278273
github.com/tailscale/goupnp v1.0.1-0.20210804011211-c64d0f06ea05 // indirect
279274
github.com/tailscale/netlink v1.1.1-0.20211101221916-cabfb018fe85 // indirect
280275
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
@@ -297,15 +292,13 @@ require (
297292
go.opentelemetry.io/otel/metric v0.33.0 // indirect
298293
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
299294
go4.org/mem v0.0.0-20210711025021-927187094b94 // indirect
300-
go4.org/netipx v0.0.0-20220725152314-7e7bdc8411bf
301295
golang.org/x/net v0.1.0 // indirect
302296
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
303297
golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 // indirect
304298
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
305299
google.golang.org/appengine v1.6.7 // indirect
306300
google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e // indirect
307-
google.golang.org/grpc v1.50.1
308-
gopkg.in/square/go-jose.v2 v2.6.0
301+
gopkg.in/ini.v1 v1.67.0 // indirect
309302
gopkg.in/yaml.v2 v2.4.0 // indirect
310303
howett.net/plist v1.0.0 // indirect
311304
)

‎go.sum

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,8 @@ github.com/coder/retry v1.3.0 h1:5lAAwt/2Cm6lVmnfBY7sOMXcBOwcwJhmV5QGSELIVWY=
355355
github.com/coder/retry v1.3.0/go.mod h1:tXuRgZgWjUnU5LZPT4lJh4ew2elUhexhlnXzrJWdyFY=
356356
github.com/coder/ssh v0.0.0-20220811105153-fcea99919338 h1:tN5GKFT68YLVzJoA8AHuiMNJ0qlhoD3pGN3JY9gxSko=
357357
github.com/coder/ssh v0.0.0-20220811105153-fcea99919338/go.mod h1:ZSS+CUoKHDrqVakTfTWUlKSr9MtMFkC4UvtQKD7O914=
358-
github.com/coder/tailscale v1.1.1-0.20221015033036-5861cbbf7bf5 h1:WVH6e/qK3Wpl0wbmpORD2oQ1qLJborF3fsFHyO1ps0Y=
359-
github.com/coder/tailscale v1.1.1-0.20221015033036-5861cbbf7bf5/go.mod h1:5amxy08qijEa8bcTW2SeIy4MIqcmd7LMsuOxqOlj2Ak=
358+
github.com/coder/tailscale v1.1.1-0.20221104170440-ef53dca69a41 h1:/mjNjfUarvH8BdmvDVLvtIIENoe3PevqCyZQmAlILuw=
359+
github.com/coder/tailscale v1.1.1-0.20221104170440-ef53dca69a41/go.mod h1:lkCb74eSJwxeNq8YwyILoHD5vtHktiZnTOxBxo3tbNc=
360360
github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
361361
github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
362362
github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=
@@ -1727,8 +1727,8 @@ github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af h1:6yITBqGTE2lEeTPG0
17271727
github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af/go.mod h1:4F09kP5F+am0jAwlQLddpoMDM+iewkxxt6nxUQ5nq5o=
17281728
github.com/tailscale/certstore v0.1.1-0.20220316223106-78d6e1c49d8d h1:K3j02b5j2Iw1xoggN9B2DIEkhWGheqFOeDkdJdBrJI8=
17291729
github.com/tailscale/certstore v0.1.1-0.20220316223106-78d6e1c49d8d/go.mod h1:2P+hpOwd53e7JMX/L4f3VXkv1G+33ES6IWZSrkIeWNs=
1730-
github.com/tailscale/golang-x-crypto v0.0.0-20220428210705-0b941c09a5e1 h1:vsFV6BKSIgjRd8m8UfrGW4r+cc28fRF71K6IRo46rKs=
1731-
github.com/tailscale/golang-x-crypto v0.0.0-20220428210705-0b941c09a5e1/go.mod h1:95n9fbUCixVSI4QXLEvdKJjnYK2eUlkTx9+QwLPXFKU=
1730+
github.com/tailscale/golang-x-crypto v0.0.0-20221102133106-bc99ab8c2d17 h1:cSm67hIDABvL13S0n9TNoVhzYwjb24M46znbABLll18=
1731+
github.com/tailscale/golang-x-crypto v0.0.0-20221102133106-bc99ab8c2d17/go.mod h1:95n9fbUCixVSI4QXLEvdKJjnYK2eUlkTx9+QwLPXFKU=
17321732
github.com/tailscale/goupnp v1.0.1-0.20210804011211-c64d0f06ea05 h1:4chzWmimtJPxRs2O36yuGRW3f9SYV+bMTTvMBI0EKio=
17331733
github.com/tailscale/goupnp v1.0.1-0.20210804011211-c64d0f06ea05/go.mod h1:PdCqy9JzfWMJf1H5UJW2ip33/d4YkoKN0r67yKH1mG8=
17341734
github.com/tailscale/netlink v1.1.1-0.20211101221916-cabfb018fe85 h1:zrsUcqrG2uQSPhaUPjUQwozcRdDdSxxqhNgNZ3drZFk=
@@ -2776,7 +2776,7 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
27762776
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
27772777
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
27782778
honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY=
2779-
honnef.co/go/tools v0.4.0-0.dev.0.20220404092545-59d7a2877f83 h1:lZ9GIYaU+o5+X6ST702I/Ntyq9Y2oIMZ42rBQpem64A=
2779+
honnef.co/go/tools v0.4.0-0.dev.0.20220517111757-f4a2f64ce238 h1:8Vr1KP9OTjoKQSSeLefzibQgDV4s2ujJElKHqMi7nsA=
27802780
howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM=
27812781
howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
27822782
k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo=

0 commit comments

Comments
 (0)