From a4044202adad4474b593b212156f1716ca2ead01 Mon Sep 17 00:00:00 2001 From: Martin Hutchinson Date: Fri, 14 Apr 2023 16:26:34 +0100 Subject: [PATCH] Bumped etcd deps from v3.5.7 to v3.5.8 Of course this came with a breaking API change but it was trivial to fix --- go.mod | 24 ++++++++++++------------ go.sum | 25 +++++++++++++++++++++++++ testonly/integration/etcd/etcd.go | 10 +++++----- 3 files changed, 42 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index a913bba4ca..04189e4a51 100644 --- a/go.mod +++ b/go.mod @@ -22,10 +22,10 @@ require ( github.com/prometheus/client_model v0.3.0 github.com/pseudomuto/protoc-gen-doc v1.5.1 github.com/transparency-dev/merkle v0.0.1 - go.etcd.io/etcd/client/v3 v3.5.7 - go.etcd.io/etcd/etcdctl/v3 v3.5.7 - go.etcd.io/etcd/server/v3 v3.5.7 - go.etcd.io/etcd/v3 v3.5.7 + go.etcd.io/etcd/client/v3 v3.5.8 + go.etcd.io/etcd/etcdctl/v3 v3.5.8 + go.etcd.io/etcd/server/v3 v3.5.8 + go.etcd.io/etcd/v3 v3.5.8 go.opencensus.io v0.24.0 golang.org/x/crypto v0.8.0 golang.org/x/sync v0.1.0 @@ -130,14 +130,14 @@ require ( github.com/urfave/cli v1.22.7 // indirect github.com/xanzy/ssh-agent v0.2.1 // indirect github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect - go.etcd.io/bbolt v1.3.6 // indirect - go.etcd.io/etcd/api/v3 v3.5.7 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect - go.etcd.io/etcd/client/v2 v2.305.7 // indirect - go.etcd.io/etcd/etcdutl/v3 v3.5.7 // indirect - go.etcd.io/etcd/pkg/v3 v3.5.7 // indirect - go.etcd.io/etcd/raft/v3 v3.5.7 // indirect - go.etcd.io/etcd/tests/v3 v3.5.7 // indirect + go.etcd.io/bbolt v1.3.7 // indirect + go.etcd.io/etcd/api/v3 v3.5.8 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.5.8 // indirect + go.etcd.io/etcd/client/v2 v2.305.8 // indirect + go.etcd.io/etcd/etcdutl/v3 v3.5.8 // indirect + go.etcd.io/etcd/pkg/v3 v3.5.8 // indirect + go.etcd.io/etcd/raft/v3 v3.5.8 // indirect + go.etcd.io/etcd/tests/v3 v3.5.8 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 // indirect go.opentelemetry.io/otel v1.6.1 // indirect go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.1 // indirect diff --git a/go.sum b/go.sum index 880dc75301..7021514e18 100644 --- a/go.sum +++ b/go.sum @@ -257,6 +257,7 @@ github.com/cockroachdb/cockroach-go/v2 v2.3.3/go.mod h1:1wNJ45eSXW9AnOc3skntW9ZU github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= github.com/cockroachdb/datadriven v1.0.1-0.20220214170620-9913f5bc19b7 h1:GCR5egmFNSTyGOv9IvMh636aELybEhZOlpPlW2NtuiU= +github.com/cockroachdb/datadriven v1.0.2 h1:H9MtNqVoVhvd9nCBwOyDjUEdZCREqbIdCJD93PBm/jA= github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= github.com/cockroachdb/errors v1.9.0 h1:B48dYem5SlAY7iU8AKsgedb4gH6mo+bDkbtLIvM/a88= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= @@ -1323,36 +1324,60 @@ go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= +go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= +go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/api/v3 v3.5.7 h1:sbcmosSVesNrWOJ58ZQFitHMdncusIifYcrBfwrlJSY= go.etcd.io/etcd/api/v3 v3.5.7/go.mod h1:9qew1gCdDDLu+VwmeG+iFpL+QlpHTo7iubavdVDgCAA= +go.etcd.io/etcd/api/v3 v3.5.8 h1:Zf44zJszoU7zRV0X/nStPenegNXoFDWcB/MwrJbA+L4= +go.etcd.io/etcd/api/v3 v3.5.8/go.mod h1:uyAal843mC8uUVSLWz6eHa/d971iDGnCRpmKd2Z+X8k= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/pkg/v3 v3.5.7 h1:y3kf5Gbp4e4q7egZdn5T7W9TSHUvkClN6u+Rq9mEOmg= go.etcd.io/etcd/client/pkg/v3 v3.5.7/go.mod h1:o0Abi1MK86iad3YrWhgUsbGx1pmTS+hrORWc2CamuhY= +go.etcd.io/etcd/client/pkg/v3 v3.5.8 h1:tPp9YRn/UBFAHdhOQUII9eUs7aOK35eulpMhX4YBd+M= +go.etcd.io/etcd/client/pkg/v3 v3.5.8/go.mod h1:y+CzeSmkMpWN2Jyu1npecjB9BBnABxGM4pN8cGuJeL4= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= go.etcd.io/etcd/client/v2 v2.305.7 h1:AELPkjNR3/igjbO7CjyF1fPuVPjrblliiKj+Y6xSGOU= go.etcd.io/etcd/client/v2 v2.305.7/go.mod h1:GQGT5Z3TBuAQGvgPfhR7VPySu/SudxmEkRq9BgzFU6s= +go.etcd.io/etcd/client/v2 v2.305.8 h1:IGp9Ozt8awy3qRTXSIYJd/o/cr4oUyrm9MF1RJ2dr/c= +go.etcd.io/etcd/client/v2 v2.305.8/go.mod h1:ZlAsxDK5/10I6xVHhFo9zinCMr/DDLKFetDDXlzKwqE= go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= go.etcd.io/etcd/client/v3 v3.5.7 h1:u/OhpiuCgYY8awOHlhIhmGIGpxfBU/GZBUP3m/3/Iz4= go.etcd.io/etcd/client/v3 v3.5.7/go.mod h1:sOWmj9DZUMyAngS7QQwCyAXXAL6WhgTOPLNS/NabQgw= +go.etcd.io/etcd/client/v3 v3.5.8 h1:B6ngTKZSWWowHEoaucOKHQR/AtZKaoHLiUpWxOLG4l4= +go.etcd.io/etcd/client/v3 v3.5.8/go.mod h1:idZYIPVkttBJBiRigkB5EM0MmEyx8jcl18zCV3F5noc= go.etcd.io/etcd/etcdctl/v3 v3.5.7 h1:v0bOrKaKmA7JRvrU2+voOV90Hpy5gnZ4fFAG4wWYEOA= go.etcd.io/etcd/etcdctl/v3 v3.5.7/go.mod h1:emnFRPD8CL8kQUJ4M5fBL0OFJRYLIMifwnfPLa3YMiI= +go.etcd.io/etcd/etcdctl/v3 v3.5.8 h1:Hc+yvk0e1VOKSzNNA0ZyNqzOQf/jrAZarx/IFd6KcPk= +go.etcd.io/etcd/etcdctl/v3 v3.5.8/go.mod h1:ur5LRmFUo1Rcnwe8i71YVtH5y4RjsW/6YNmTQlz1N8E= go.etcd.io/etcd/etcdutl/v3 v3.5.7 h1:sgMHVB9GU/BwLXALns/UqSltPnckz+KTVfwbwVWNdMw= go.etcd.io/etcd/etcdutl/v3 v3.5.7/go.mod h1:uVbop2kowo1R1mRdETgLfYE5QTIU2h341d9OQwpHupo= +go.etcd.io/etcd/etcdutl/v3 v3.5.8 h1:KTVdvP+9unMtYifGPcIQRMOhsbhek78W8DiCoAbYbQE= +go.etcd.io/etcd/etcdutl/v3 v3.5.8/go.mod h1:ttDqxIhpW9PqQdw+jJhUpLF+f37TnnSRJpkJSkCikts= go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod h1:UzJGatBQ1lXChBkQF0AuAtkRQMYnHubxAEYIrC3MSsE= go.etcd.io/etcd/pkg/v3 v3.5.7 h1:obOzeVwerFwZ9trMWapU/VjDcYUJb5OfgC1zqEGWO/0= go.etcd.io/etcd/pkg/v3 v3.5.7/go.mod h1:kcOfWt3Ov9zgYdOiJ/o1Y9zFfLhQjylTgL4Lru8opRo= +go.etcd.io/etcd/pkg/v3 v3.5.8 h1:hz6w5Cb4p7dbt642m8Y35Ts9yWPWUCymc3v4Z/aiGEU= +go.etcd.io/etcd/pkg/v3 v3.5.8/go.mod h1:C17MJkZHJIyJV+wWWx6Jz6YS6BfdkOnUkSwT9uuEO7s= go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc= go.etcd.io/etcd/raft/v3 v3.5.7 h1:aN79qxLmV3SvIq84aNTliYGmjwsW6NqJSnqmI1HLJKc= go.etcd.io/etcd/raft/v3 v3.5.7/go.mod h1:TflkAb/8Uy6JFBxcRaH2Fr6Slm9mCPVdI2efzxY96yU= +go.etcd.io/etcd/raft/v3 v3.5.8 h1:wM4IAfiY1+vrCAkUicIOzkyjpV9MawnAul2KvxeMgy4= +go.etcd.io/etcd/raft/v3 v3.5.8/go.mod h1:W6P5WxtOMfYNdLSEJX3vc8Pg6LOt+ewI9UCFKcnIexA= go.etcd.io/etcd/server/v3 v3.5.0/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4= go.etcd.io/etcd/server/v3 v3.5.7 h1:BTBD8IJUV7YFgsczZMHhMTS67XuA4KpRquL0MFOJGRk= go.etcd.io/etcd/server/v3 v3.5.7/go.mod h1:gxBgT84issUVBRpZ3XkW1T55NjOb4vZZRI4wVvNhf4A= +go.etcd.io/etcd/server/v3 v3.5.8 h1:eK9fU6Pd6IJD1k0u4zAq1NZsSsEOOimlP3kIkpcQrho= +go.etcd.io/etcd/server/v3 v3.5.8/go.mod h1:1y2ahPOrlE4pzVV5+rBCDur7QQcEP0MNUPO2dyzwjso= go.etcd.io/etcd/tests/v3 v3.5.7 h1:eX/xbQD1J3rZIqb9RIWzt1rQBaHDO8MA+pQsdTfU3V8= go.etcd.io/etcd/tests/v3 v3.5.7/go.mod h1:Os+GplvoOoHZOWd0Es8IK6NAt+R+VJwJXC4i09Bzqco= +go.etcd.io/etcd/tests/v3 v3.5.8 h1:jrWlrEJfFuvI9nqMGFZNLc+OCdtyBdw8mSfp8ZwLIWs= +go.etcd.io/etcd/tests/v3 v3.5.8/go.mod h1:KFgEgZWwXZILKsOX3f3VyGmUHQgbG/yM9edQNTkXsdE= go.etcd.io/etcd/v3 v3.5.7 h1:tG2xYVAo8f8Y+XQOv5VdUjiRhnW2oI8vI2zlRuuY2ow= go.etcd.io/etcd/v3 v3.5.7/go.mod h1:nbA6aj//5x/YOj/+oTOXtC5Qf2uJZEq6BqzKcnzkh1o= +go.etcd.io/etcd/v3 v3.5.8 h1:AQF+i8f8jLeli9Cmf6SIs3KNryFPnzlIzI7weyK784g= +go.etcd.io/etcd/v3 v3.5.8/go.mod h1:vptUbt0q/yZF9X3xyZ0Q7XHoYJ8okR64FCRpZjz4Zyg= go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg= go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng= go.mongodb.org/mongo-driver v1.8.3/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY= diff --git a/testonly/integration/etcd/etcd.go b/testonly/integration/etcd/etcd.go index 3a0eb2fbdd..29dbffa498 100644 --- a/testonly/integration/etcd/etcd.go +++ b/testonly/integration/etcd/etcd.go @@ -86,7 +86,7 @@ func StartEtcd() (e *embed.Etcd, c *clientv3.Client, cleanup func(), err error) } c, err = clientv3.New(clientv3.Config{ - Endpoints: []string{e.Config().LCUrls[0].String()}, + Endpoints: []string{e.Config().ListenClientUrls[0].String()}, DialTimeout: defaultTimeout, }) if err != nil { @@ -114,10 +114,10 @@ func tryStartEtcd(dir string) (*embed.Etcd, error) { cfg := embed.NewConfig() cfg.Dir = dir - cfg.LCUrls = []url.URL{*clientURL} // listen client URLS - cfg.ACUrls = []url.URL{*clientURL} // advertise client URLS - cfg.LPUrls = []url.URL{*peerURL} // listen peer URLS - cfg.APUrls = []url.URL{*peerURL} // advertise peer URLS + cfg.ListenClientUrls = []url.URL{*clientURL} + cfg.AdvertiseClientUrls = []url.URL{*clientURL} + cfg.ListenPeerUrls = []url.URL{*peerURL} + cfg.AdvertisePeerUrls = []url.URL{*peerURL} cfg.InitialCluster = fmt.Sprintf("default=%v", peerURL) cfg.Logger = "zap"