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

Commitf5eb3f5

Browse files
committed
chore: upgrade tailscale
1 parentfff2b1d commitf5eb3f5

File tree

4 files changed

+91
-92
lines changed

4 files changed

+91
-92
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: 22 additions & 12 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
@@ -128,7 +128,7 @@ require (
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
166166
google.golang.org/grpcv1.53.0
167-
google.golang.org/protobufv1.28.2-0.20230118093459-a9481185b34d
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
@@ -255,11 +267,11 @@ require (
255267
github.com/illarion/gonotifyv1.0.1// indirect
256268
github.com/imdario/mergov0.3.13// indirect
257269
github.com/insomniacslk/dhcpv0.0.0-20221215072855-de60144f33f8// indirect
270+
github.com/jmespath/go-jmespathv0.4.0// indirect
258271
github.com/joeshaw/multierrorv0.0.0-20140124173710-69b34d4ec901// indirect
259272
github.com/josharian/internv1.0.0// indirect
260273
github.com/josharian/nativev1.1.1-0.20230202152459-5c7d0dd6ab86// indirect
261274
github.com/jsimonetti/rtnetlinkv1.1.2-0.20220408201609-d380b505068b// indirect
262-
github.com/json-iterator/gov1.1.12// indirect
263275
github.com/juju/errorsv1.0.0// indirect
264276
github.com/kballard/go-shellquotev0.0.0-20180428030007-95032a82bc51// indirect
265277
github.com/kortschak/wolv0.0.0-20200729010619-da482cc4850a// indirect
@@ -273,9 +285,9 @@ require (
273285
github.com/mattn/go-sqlite3v1.14.15// indirect
274286
github.com/matttproud/golang_protobuf_extensionsv1.0.4// indirect
275287
github.com/mdlayher/genetlinkv1.2.0// indirect
276-
github.com/mdlayher/netlinkv1.6.2// indirect
288+
github.com/mdlayher/netlinkv1.7.1// indirect
277289
github.com/mdlayher/sdnotifyv1.0.0// indirect
278-
github.com/mdlayher/socketv0.2.3// indirect
290+
github.com/mdlayher/socketv0.4.0// indirect
279291
github.com/mgutz/ansiv0.0.0-20170206155736-9520e82c474b// indirect
280292
github.com/microcosm-cc/bluemondayv1.0.23// indirect
281293
github.com/miekg/dnsv1.1.45// indirect
@@ -284,8 +296,6 @@ require (
284296
github.com/mitchellh/go-testing-interfacev1.14.1// indirect
285297
github.com/mitchellh/reflectwalkv1.0.2// indirect
286298
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
289299
github.com/muesli/ansiv0.0.0-20221106050444-61f0cd9a192a// indirect
290300
github.com/muesli/cancelreaderv0.2.2// indirect
291301
github.com/muesli/termenvv0.14.0// indirect
@@ -312,7 +322,7 @@ require (
312322
github.com/tailscale/golang-x-cryptov0.0.0-20221102133106-bc99ab8c2d17// indirect
313323
github.com/tailscale/goupnpv1.0.1-0.20210804011211-c64d0f06ea05// indirect
314324
github.com/tailscale/netlinkv1.1.1-0.20211101221916-cabfb018fe85// indirect
315-
github.com/tailscale/wireguard-gov0.0.0-20221219190806-4fa124729667// indirect
325+
github.com/tailscale/wireguard-gov0.0.0-20230410165232-af172621b4dd// indirect
316326
github.com/tchap/go-patricia/v2v2.3.1// indirect
317327
github.com/tcnksm/go-httpstatv0.2.0// indirect
318328
github.com/tdewolff/parse/v2v2.6.4// indirect

0 commit comments

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