Skip to content

Commit a2ef15f

Browse files
committed
go.mod: update tlsutil to commit 3ea572deb22b
Update parameter order, no functional change. Also remove patch number from the Go version.
1 parent 69941c0 commit a2ef15f

File tree

3 files changed

+19
-17
lines changed

3 files changed

+19
-17
lines changed

cmd/go-cache-plugin/setup.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ func initRevProxy(env *command.Env, s3c *s3util.Client, g *taskgroup.Group) (htt
199199
// initServerCert creates a signed certificate advertising the specified host
200200
// names, for use in creating a TLS server.
201201
func initServerCert(env *command.Env, hosts []string) (tls.Certificate, error) {
202-
ca, err := tlsutil.NewSigningCert(&x509.Certificate{
202+
ca, err := tlsutil.NewSigningCert(24*time.Hour, &x509.Certificate{
203203
Subject: pkix.Name{Organization: []string{"Tailscale build automation"}},
204-
}, 24*time.Hour)
204+
})
205205
if err != nil {
206206
return tls.Certificate{}, fmt.Errorf("generate signing cert: %w", err)
207207
}
@@ -214,10 +214,10 @@ func initServerCert(env *command.Env, hosts []string) (tls.Certificate, error) {
214214
// This is OK for ephemeral build/CI workers, though.
215215
}
216216

217-
sc, err := tlsutil.NewServerCert(&x509.Certificate{
217+
sc, err := tlsutil.NewServerCert(24*time.Hour, ca, &x509.Certificate{
218218
Subject: pkix.Name{Organization: []string{"Go cache plugin reverse proxy"}},
219219
DNSNames: hosts,
220-
}, 24*time.Hour, ca)
220+
})
221221
if err != nil {
222222
return tls.Certificate{}, fmt.Errorf("generate server cert: %w", err)
223223
}

go.mod

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/tailscale/go-cache-plugin
22

3-
go 1.23.1
3+
go 1.23
4+
5+
toolchain go1.23.1
46

57
require (
68
github.com/aws/aws-sdk-go-v2/config v1.27.28
@@ -10,10 +12,10 @@ require (
1012
github.com/creachadair/flax v0.0.1
1113
github.com/creachadair/gocache v0.0.0-20240904225701-6c4617815112
1214
github.com/creachadair/mds v0.19.2
13-
github.com/creachadair/mhttp v0.0.0-20240904023549-156b88d21c62
14-
github.com/creachadair/scheddle v0.0.0-20240907053453-f3bdd9f33c58
15-
github.com/creachadair/taskgroup v0.9.1
16-
github.com/creachadair/tlsutil v0.0.0-20240901051800-c769f173a559
15+
github.com/creachadair/mhttp v0.0.0-20240907154916-d408c0542750
16+
github.com/creachadair/scheddle v0.0.0-20240907154456-46e5c8f476f4
17+
github.com/creachadair/taskgroup v0.9.3
18+
github.com/creachadair/tlsutil v0.0.0-20240907154432-0ca1e46ff43d
1719
github.com/goproxy/goproxy v0.17.2
1820
golang.org/x/sync v0.8.0
1921
golang.org/x/sys v0.22.0

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ github.com/creachadair/gocache v0.0.0-20240904225701-6c4617815112 h1:FSlFO2eztBG
5050
github.com/creachadair/gocache v0.0.0-20240904225701-6c4617815112/go.mod h1:vkGW73GdzBPQZJdFlPBZVzFcG7lTxIgDY0+U30mp3xs=
5151
github.com/creachadair/mds v0.19.2 h1:I5OdjsrG2jqGklMcyv50Iqo6gTrwUSIpIJVSnlVw85c=
5252
github.com/creachadair/mds v0.19.2/go.mod h1:4b//mUiL8YldH6TImXjmW45myzTLNS1LLjOmrk888eg=
53-
github.com/creachadair/mhttp v0.0.0-20240904023549-156b88d21c62 h1:6OEfFAgnbvhEDAR83DBUbvImn68DH2NpqcXrwID9Vbs=
54-
github.com/creachadair/mhttp v0.0.0-20240904023549-156b88d21c62/go.mod h1:Vito16r0HqXVEcwjz5Z9PLdFEbX016lCOV6iVgH06tc=
53+
github.com/creachadair/mhttp v0.0.0-20240907154916-d408c0542750 h1:fJzQV75gKAfx1Od7EiQI9rn0wTvO7Uc/YgQW54y77dQ=
54+
github.com/creachadair/mhttp v0.0.0-20240907154916-d408c0542750/go.mod h1:WDSdP3YUQE4YJNxq77RUCZRIvh1l2o8y58bbHsBffo4=
5555
github.com/creachadair/msync v0.2.1 h1:nBrUkGnk+vhEO+fe6fEMcT6Reo/C9Oc4s62bL4Bj/Wo=
5656
github.com/creachadair/msync v0.2.1/go.mod h1:fMAB2Ihnsojvz5nRxqzEEUmHgW2/CEKY64VPP4VskSY=
57-
github.com/creachadair/scheddle v0.0.0-20240907053453-f3bdd9f33c58 h1:ZH2lplzOAJitYaaf427wVWo8tijhPZedhvbNXGwnTAs=
58-
github.com/creachadair/scheddle v0.0.0-20240907053453-f3bdd9f33c58/go.mod h1:/IRMmOFNVSrAMzgcOYcdGOFJf4RU4UurRHvMykHEzJc=
59-
github.com/creachadair/taskgroup v0.9.1 h1:oam4POtt6PpmUr4us+ycUUfb2mPWc0RmIycte2oWoWw=
60-
github.com/creachadair/taskgroup v0.9.1/go.mod h1:9oDDPt/5QPS4iylvPMC81GRlj+1je8AFDbjUh4zaQWo=
61-
github.com/creachadair/tlsutil v0.0.0-20240901051800-c769f173a559 h1:8hlU8ebt2lI//6sFj6ICE6mN6c6Uvj4588XilSqpmu8=
62-
github.com/creachadair/tlsutil v0.0.0-20240901051800-c769f173a559/go.mod h1:q4s/lgXyN9Cn3nwDvFKbVy65nWNv7mPSYnDM1ShRfjo=
57+
github.com/creachadair/scheddle v0.0.0-20240907154456-46e5c8f476f4 h1:Va80vtx4UE/f9zUj9Yy2rDlDmcfbiDlYJVWuI4GQPIU=
58+
github.com/creachadair/scheddle v0.0.0-20240907154456-46e5c8f476f4/go.mod h1:4Xfyc3F8gDPEq3VHBiUfFiBoLSweBoftjaUDj116Gao=
59+
github.com/creachadair/taskgroup v0.9.3 h1:PGvqKo+gvzckr/IL69Lj4aKzOSwY5cJBMZFlvW5eidU=
60+
github.com/creachadair/taskgroup v0.9.3/go.mod h1:9oDDPt/5QPS4iylvPMC81GRlj+1je8AFDbjUh4zaQWo=
61+
github.com/creachadair/tlsutil v0.0.0-20240907154432-0ca1e46ff43d h1:euNk+jFY3ytIBBMtXY80gbMK0pA4bXTYHbkxwEUgnKU=
62+
github.com/creachadair/tlsutil v0.0.0-20240907154432-0ca1e46ff43d/go.mod h1:QMYeSCtv6WYPxroqKtL1/5p4vG2SdWiBYiTxo4y0FMc=
6363
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
6464
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
6565
github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=

0 commit comments

Comments
 (0)