Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfe94f3c

Browse files
committed
chore: upgrade tailscale
1 parentfff2b1d commitfe94f3c

File tree

4 files changed

+108
-442
lines changed

4 files changed

+108
-442
lines changed

‎coderd/healthcheck/derp.go‎

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

‎go.mod‎

Lines changed: 27 additions & 18 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-
replacetailscale.com =>github.com/coder/tailscalev1.1.1-0.20230418202606-ed9307cf1b22
39+
replacetailscale.com =>github.com/coder/tailscalev1.1.1-0.20230419174344-108bab9314c6
4040

4141
// Switch to our fork that imports fixes from http://github.com/tailscale/ssh.
4242
// See: https://github.com/coder/coder/issues/3371
@@ -90,7 +90,7 @@ require (
9090
github.com/go-chi/httpratev0.7.1
9191
github.com/go-chi/renderv1.0.1
9292
github.com/go-jose/go-jose/v3v3.0.0
93-
github.com/go-logr/logrv1.2.3
93+
github.com/go-logr/logrv1.2.4
9494
github.com/go-ping/pingv1.1.0
9595
github.com/go-playground/validator/v10v10.12.0
9696
github.com/gofrs/flockv0.8.1
@@ -120,15 +120,15 @@ require (
120120
github.com/mitchellh/mapstructurev1.5.0
121121
github.com/moby/mobyv20.10.23+incompatible
122122
github.com/muesli/reflowv0.3.0
123-
github.com/open-policy-agent/opav0.44.0
123+
github.com/open-policy-agent/opav0.51.0
124124
github.com/ory/dockertest/v3v3.9.1
125125
github.com/pion/udpv0.1.2
126126
github.com/pkg/browserv0.0.0-20210911075715-681adbf594b8
127127
github.com/pkg/diffv0.0.0-20210226163009-20ebb0f2a09e
128128
github.com/pkg/sftpv1.13.6-0.20221018182125-7da137aa03f0
129129
github.com/prometheus/client_golangv1.14.0
130130
github.com/prometheus/client_modelv0.3.0
131-
github.com/prometheus/commonv0.40.0
131+
github.com/prometheus/commonv0.41.0
132132
github.com/quasilyte/go-ruleguard/dslv0.3.21
133133
github.com/robfig/cron/v3v3.0.1
134134
github.com/spf13/aferov1.9.3
@@ -154,20 +154,20 @@ require (
154154
go4.org/netipxv0.0.0-20220725152314-7e7bdc8411bf
155155
golang.org/x/cryptov0.7.0
156156
golang.org/x/expv0.0.0-20221205204356-47842c84f3db
157-
golang.org/x/modv0.8.0
157+
golang.org/x/modv0.9.0
158158
golang.org/x/oauth2v0.5.0
159159
golang.org/x/syncv0.1.0
160160
golang.org/x/sysv0.7.0
161161
golang.org/x/termv0.6.0
162-
golang.org/x/toolsv0.6.0
162+
golang.org/x/toolsv0.7.0
163163
golang.org/x/xerrorsv0.0.0-20220907171357-04be3eba64a2
164164
golang.zx2c4.com/wireguardv0.0.0-20230223181233-21636207a675
165165
google.golang.org/apiv0.108.0
166-
google.golang.org/grpcv1.53.0
167-
google.golang.org/protobufv1.28.2-0.20230118093459-a9481185b34d
166+
google.golang.org/grpcv1.54.0
167+
google.golang.org/protobufv1.30.0
168168
gopkg.in/natefinch/lumberjack.v2v2.0.0
169169
gopkg.in/yaml.v3v3.0.1
170-
gvisor.dev/gvisorv0.0.0-20221203005347-703fd9b7fbc0
170+
gvisor.dev/gvisorv0.0.0-20230328175328-162ed5ef888d
171171
k8s.io/utilsv0.0.0-20220728103510-ee6ede2d64ed
172172
nhooyr.io/websocketv1.8.7
173173
storj.io/drpcv0.0.33-0.20220622181519-9206537a4db7
@@ -191,6 +191,18 @@ require (
191191
github.com/alexbrainman/sspiv0.0.0-20210105120005-909beea2cc74// indirect
192192
github.com/anmitsu/go-shlexv0.0.0-20200514113438-38f4b401e2be// indirect
193193
github.com/apparentlymart/go-textseg/v13v13.0.0// indirect
194+
github.com/aws/aws-sdk-go-v2v1.17.3// indirect
195+
github.com/aws/aws-sdk-go-v2/configv1.11.0// indirect
196+
github.com/aws/aws-sdk-go-v2/credentialsv1.6.4// indirect
197+
github.com/aws/aws-sdk-go-v2/feature/ec2/imdsv1.8.2// indirect
198+
github.com/aws/aws-sdk-go-v2/internal/configsourcesv1.1.27// indirect
199+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2v2.4.21// indirect
200+
github.com/aws/aws-sdk-go-v2/internal/iniv1.3.2// indirect
201+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-urlv1.5.2// indirect
202+
github.com/aws/aws-sdk-go-v2/service/ssmv1.35.0// indirect
203+
github.com/aws/aws-sdk-go-v2/service/ssov1.6.2// indirect
204+
github.com/aws/aws-sdk-go-v2/service/stsv1.11.1// indirect
205+
github.com/aws/smithy-gov1.13.5// indirect
194206
github.com/aymanbagabas/go-osc52v1.2.1// indirect
195207
github.com/aymerick/douceurv0.2.0// indirect
196208
github.com/beorn7/perksv1.0.1// indirect
@@ -204,7 +216,6 @@ require (
204216
github.com/containerd/continuityv0.3.0// indirect
205217
github.com/coreos/go-iptablesv0.6.0// indirect
206218
github.com/davecgh/go-spewv1.1.1// indirect
207-
github.com/dgraph-io/badger/v3v3.2103.5// indirect
208219
github.com/dlclark/regexp2v1.8.1// indirect
209220
github.com/docker/cliv20.10.17+incompatible// indirect
210221
github.com/docker/dockerv20.10.24+incompatible// indirect
@@ -230,7 +241,7 @@ require (
230241
github.com/gogo/protobufv1.3.2// indirect
231242
github.com/golang/glogv1.0.0// indirect
232243
github.com/golang/groupcachev0.0.0-20210331224755-41bb18bfe9da// indirect
233-
github.com/golang/protobufv1.5.2// indirect
244+
github.com/golang/protobufv1.5.3// indirect
234245
github.com/google/btreev1.1.2// indirect
235246
github.com/google/flatbuffersv23.1.21+incompatible// indirect
236247
github.com/google/go-cmpv0.5.9// indirect
@@ -255,11 +266,11 @@ require (
255266
github.com/illarion/gonotifyv1.0.1// indirect
256267
github.com/imdario/mergov0.3.13// indirect
257268
github.com/insomniacslk/dhcpv0.0.0-20221215072855-de60144f33f8// indirect
269+
github.com/jmespath/go-jmespathv0.4.0// indirect
258270
github.com/joeshaw/multierrorv0.0.0-20140124173710-69b34d4ec901// indirect
259271
github.com/josharian/internv1.0.0// indirect
260272
github.com/josharian/nativev1.1.1-0.20230202152459-5c7d0dd6ab86// indirect
261273
github.com/jsimonetti/rtnetlinkv1.1.2-0.20220408201609-d380b505068b// indirect
262-
github.com/json-iterator/gov1.1.12// indirect
263274
github.com/juju/errorsv1.0.0// indirect
264275
github.com/kballard/go-shellquotev0.0.0-20180428030007-95032a82bc51// indirect
265276
github.com/kortschak/wolv0.0.0-20200729010619-da482cc4850a// indirect
@@ -273,9 +284,9 @@ require (
273284
github.com/mattn/go-sqlite3v1.14.15// indirect
274285
github.com/matttproud/golang_protobuf_extensionsv1.0.4// indirect
275286
github.com/mdlayher/genetlinkv1.2.0// indirect
276-
github.com/mdlayher/netlinkv1.6.2// indirect
287+
github.com/mdlayher/netlinkv1.7.1// indirect
277288
github.com/mdlayher/sdnotifyv1.0.0// indirect
278-
github.com/mdlayher/socketv0.2.3// indirect
289+
github.com/mdlayher/socketv0.4.0// indirect
279290
github.com/mgutz/ansiv0.0.0-20170206155736-9520e82c474b// indirect
280291
github.com/microcosm-cc/bluemondayv1.0.23// indirect
281292
github.com/miekg/dnsv1.1.45// indirect
@@ -284,16 +295,14 @@ require (
284295
github.com/mitchellh/go-testing-interfacev1.14.1// indirect
285296
github.com/mitchellh/reflectwalkv1.0.2// indirect
286297
github.com/moby/termv0.0.0-20210619224110-3f7ff695adc6// indirect
287-
github.com/modern-go/concurrentv0.0.0-20180306012644-bacd9c7ef1dd// indirect
288-
github.com/modern-go/reflect2v1.0.2// indirect
289298
github.com/muesli/ansiv0.0.0-20221106050444-61f0cd9a192a// indirect
290299
github.com/muesli/cancelreaderv0.2.2// indirect
291300
github.com/muesli/termenvv0.14.0// indirect
292301
github.com/niklasfasching/go-orgv1.6.5// indirect
293302
github.com/nu7hatch/gouuidv0.0.0-20131221200532-179d4d0c4d8d// indirect
294303
github.com/olekukonko/tablewriterv0.0.5// indirect
295304
github.com/opencontainers/go-digestv1.0.0// indirect
296-
github.com/opencontainers/image-specv1.0.3-0.20220114050600-8b9d41f48198// indirect
305+
github.com/opencontainers/image-specv1.1.0-rc2// indirect
297306
github.com/opencontainers/runcv1.1.5// indirect
298307
github.com/pelletier/go-toml/v2v2.0.6// indirect
299308
github.com/pion/transportv0.14.1// indirect
@@ -312,7 +321,7 @@ require (
312321
github.com/tailscale/golang-x-cryptov0.0.0-20221102133106-bc99ab8c2d17// indirect
313322
github.com/tailscale/goupnpv1.0.1-0.20210804011211-c64d0f06ea05// indirect
314323
github.com/tailscale/netlinkv1.1.1-0.20211101221916-cabfb018fe85// indirect
315-
github.com/tailscale/wireguard-gov0.0.0-20221219190806-4fa124729667// indirect
324+
github.com/tailscale/wireguard-gov0.0.0-20230410165232-af172621b4dd// indirect
316325
github.com/tchap/go-patricia/v2v2.3.1// indirect
317326
github.com/tcnksm/go-httpstatv0.2.0// indirect
318327
github.com/tdewolff/parse/v2v2.6.4// indirect

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp