From 58e3b8cb9fd3bef3c7d8355e70431b50d9c62df3 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Tue, 11 Feb 2025 12:32:34 -0500 Subject: [PATCH 1/3] Shutdown raft when controller shuts down --- controller/controller.go | 6 ++++++ controller/raft/fsm.go | 4 ++++ controller/raft/mesh/mesh.go | 11 +++++++++++ controller/raft/raft.go | 38 +++++++++++++++++++++++++++++++++--- 4 files changed, 56 insertions(+), 3 deletions(-) diff --git a/controller/controller.go b/controller/controller.go index 4bebae03d..ecd77b8c7 100644 --- a/controller/controller.go +++ b/controller/controller.go @@ -479,6 +479,12 @@ func (c *Controller) Shutdown() { } go c.xweb.Shutdown() + + if c.raftController != nil { + if err := c.raftController.Shutdown(); err != nil { + pfxlog.Logger().WithError(err).Error("failed to shutdown raft") + } + } } } diff --git a/controller/raft/fsm.go b/controller/raft/fsm.go index c5221b15c..5d54f77e4 100644 --- a/controller/raft/fsm.go +++ b/controller/raft/fsm.go @@ -91,6 +91,10 @@ func (self *BoltDbFsm) Init() error { return nil } +func (self *BoltDbFsm) Close() error { + return self.db.Close() +} + func (self *BoltDbFsm) GetDb() boltz.Db { return self.db } diff --git a/controller/raft/mesh/mesh.go b/controller/raft/mesh/mesh.go index 2d828ad93..a02e1b55b 100644 --- a/controller/raft/mesh/mesh.go +++ b/controller/raft/mesh/mesh.go @@ -363,6 +363,13 @@ func (self *impl) Close() error { if self.closed.CompareAndSwap(false, true) { close(self.closeNotify) } + + for _, p := range self.GetPeers() { + if err := p.Channel.Close(); err != nil { + pfxlog.Logger().WithError(err).Error("failed to close ctrl mesh peer channel") + } + } + return nil } @@ -382,6 +389,10 @@ func (self *impl) Accept() (net.Conn, error) { } func (self *impl) Dial(address raft.ServerAddress, timeout time.Duration) (net.Conn, error) { + if self.closed.Load() { + return nil, errors.New("ctrl mesh is closed") + } + log := pfxlog.Logger().WithField("address", address) log.Info("dialing raft peer channel") peer, err := self.GetOrConnectPeer(string(address), timeout) diff --git a/controller/raft/raft.go b/controller/raft/raft.go index c7dd0cfed..160c97bb8 100644 --- a/controller/raft/raft.go +++ b/controller/raft/raft.go @@ -141,6 +141,7 @@ type Controller struct { Mesh mesh.Mesh Raft *raft.Raft Fsm *BoltDbFsm + raftStore *raftboltdb.BoltStore bootstrapped atomic.Bool clusterLock sync.Mutex closeNotify <-chan struct{} @@ -545,7 +546,8 @@ func (self *Controller) Init() error { // Create the log store and stable store. raftBoltFile := path.Join(raftConfig.DataDir, "raft.db") - boltDbStore, err := raftboltdb.NewBoltStore(raftBoltFile) + var err error + self.raftStore, err = raftboltdb.NewBoltStore(raftBoltFile) if err != nil { logrus.WithError(err).Error("failed to initialize raft bolt storage") return err @@ -578,7 +580,7 @@ func (self *Controller) Init() error { raftTransport := raft.NewNetworkTransportWithLogger(self.Mesh, 3, 10*time.Second, raftConfig.Logger) if raftConfig.Recover { - err := raft.RecoverCluster(conf, self.Fsm, boltDbStore, boltDbStore, snapshotStore, raftTransport, raft.Configuration{ + err := raft.RecoverCluster(conf, self.Fsm, self.raftStore, self.raftStore, snapshotStore, raftTransport, raft.Configuration{ Servers: []raft.Server{ {ID: conf.LocalID, Address: localAddr}, }, @@ -591,7 +593,7 @@ func (self *Controller) Init() error { os.Exit(0) } - r, err := raft.NewRaft(conf, self.Fsm, boltDbStore, boltDbStore, snapshotStore, raftTransport) + r, err := raft.NewRaft(conf, self.Fsm, self.raftStore, self.raftStore, snapshotStore, raftTransport) if err != nil { return errors.Wrap(err, "failed to initialise raft") } @@ -938,6 +940,36 @@ func (self *Controller) addEventsHandlers() { }) } +func (self *Controller) Shutdown() error { + var errs errorz.MultipleErrors + + if self.Raft != nil { + if err := self.Raft.Shutdown().Error(); err != nil { + errs = append(errs, err) + } + } + + if self.Fsm != nil { + if err := self.Fsm.Close(); err != nil { + errs = append(errs, err) + } + } + + if self.raftStore != nil { + if err := self.raftStore.Close(); err != nil { + errs = append(errs, err) + } + } + + if self.Mesh != nil { + if err := self.Mesh.Close(); err != nil { + errs = append(errs, err) + } + } + + return errs.ToError() +} + type MigrationManager interface { ValidateMigrationEnvironment() error TryInitializeRaftFromBoltDb() error From d84c0248a46b2583760cb1f92dcbf2f4ca602a6c Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Tue, 11 Feb 2025 13:41:02 -0500 Subject: [PATCH 2/3] Update deps and changelog --- CHANGELOG.md | 13 ++++++++----- go.mod | 26 ++++++++++++------------- go.sum | 51 +++++++++++++++++++++++++------------------------ zititest/go.mod | 24 +++++++++++------------ zititest/go.sum | 47 +++++++++++++++++++++++---------------------- 5 files changed, 83 insertions(+), 78 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6124ad724..f4828c179 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -178,11 +178,11 @@ file, enrollment should handle initializing the value appropriately. ## Component Updates and Bug Fixes -* github.com/openziti/agent: [v1.0.23 -> v1.0.24](https://github.com/openziti/agent/compare/v1.0.23...v1.0.24) -* github.com/openziti/channel/v3: [v3.0.26 -> v3.0.29](https://github.com/openziti/channel/compare/v3.0.26...v3.0.29) +* github.com/openziti/agent: [v1.0.23 -> v1.0.25](https://github.com/openziti/agent/compare/v1.0.23...v1.0.25) +* github.com/openziti/channel/v3: [v3.0.26 -> v3.0.31](https://github.com/openziti/channel/compare/v3.0.26...v3.0.31) * github.com/openziti/edge-api: [v0.26.38 -> v0.26.39](https://github.com/openziti/edge-api/compare/v0.26.38...v0.26.39) * github.com/openziti/foundation/v2: [v2.0.56 -> v2.0.57](https://github.com/openziti/foundation/compare/v2.0.56...v2.0.57) -* github.com/openziti/identity: [v1.0.94 -> v1.0.97](https://github.com/openziti/identity/compare/v1.0.94...v1.0.97) +* github.com/openziti/identity: [v1.0.94 -> v1.0.98](https://github.com/openziti/identity/compare/v1.0.94...v1.0.98) * github.com/openziti/metrics: [v1.2.65 -> v1.2.66](https://github.com/openziti/metrics/compare/v1.2.65...v1.2.66) * github.com/openziti/runzmd: [v1.0.59 -> v1.0.63](https://github.com/openziti/runzmd/compare/v1.0.59...v1.0.63) * github.com/openziti/sdk-golang: [v0.23.44 -> v0.24.1](https://github.com/openziti/sdk-golang/compare/v0.23.44...v0.24.1) @@ -190,14 +190,16 @@ file, enrollment should handle initializing the value appropriately. * [Issue #663](https://github.com/openziti/sdk-golang/issues/663) - Add API to allow controlling proxying connections to controllers and routers. * [Issue #659](https://github.com/openziti/sdk-golang/issues/659) - E2E encryption can encounter ordering issues with high-volume concurrent writes -* github.com/openziti/storage: [v0.3.15 -> v0.4.2](https://github.com/openziti/storage/compare/v0.3.15...v0.4.2) +* github.com/openziti/secretstream: [v0.1.28 -> v0.1.29](https://github.com/openziti/secretstream/compare/v0.1.28...v0.1.29) +* github.com/openziti/storage: [v0.3.15 -> v0.4.3](https://github.com/openziti/storage/compare/v0.3.15...v0.4.3) * [Issue #94](https://github.com/openziti/storage/issues/94) - Snapshots aren't working correctly -* github.com/openziti/transport/v2: [v2.0.159 -> v2.0.160](https://github.com/openziti/transport/compare/v2.0.159...v2.0.160) +* github.com/openziti/transport/v2: [v2.0.159 -> v2.0.162](https://github.com/openziti/transport/compare/v2.0.159...v2.0.162) * github.com/openziti/xweb/v2: [v2.1.3 -> v2.2.1](https://github.com/openziti/xweb/compare/v2.1.3...v2.2.1) * [Issue #18](https://github.com/openziti/xweb/issues/18) - verify advertised host/ip has a certificate defined in the identity block * github.com/openziti/ziti: [v1.3.3 -> v1.4.0](https://github.com/openziti/ziti/compare/v1.3.3...v1.4.0) + * [Issue #2774](https://github.com/openziti/ziti/issues/2774) - API Session Certificate SPIFFE IDs fail validation in Routers * [Issue #2672](https://github.com/openziti/ziti/issues/2672) - [Bug] Posture check PUT method doesn't update nested structures but works fine with PATCH * [Issue #2668](https://github.com/openziti/ziti/issues/2668) - [Feature Request] Filterable field for posture check type * [Issue #2681](https://github.com/openziti/ziti/issues/2681) - Support specifying which token to use on external jwt signers @@ -220,6 +222,7 @@ file, enrollment should handle initializing the value appropriately. * [Issue #2546](https://github.com/openziti/ziti/issues/2546) - Use consistent terminology for HA * [Issue #2713](https://github.com/openziti/ziti/issues/2713) - Routers with no edge components shouldn't subscribe to RDM updates + # Release 1.3.3 ## What's New diff --git a/go.mod b/go.mod index 4d5606cda..7d9c5c9da 100644 --- a/go.mod +++ b/go.mod @@ -52,19 +52,19 @@ require ( github.com/miekg/dns v1.1.63 github.com/mitchellh/mapstructure v1.5.0 github.com/natefinch/lumberjack v2.0.0+incompatible - github.com/openziti/agent v1.0.24 - github.com/openziti/channel/v3 v3.0.29 + github.com/openziti/agent v1.0.25 + github.com/openziti/channel/v3 v3.0.31 github.com/openziti/cobra-to-md v1.0.1 github.com/openziti/edge-api v0.26.39 github.com/openziti/foundation/v2 v2.0.57 - github.com/openziti/identity v1.0.97 + github.com/openziti/identity v1.0.98 github.com/openziti/jwks v1.0.6 github.com/openziti/metrics v1.2.66 github.com/openziti/runzmd v1.0.63 github.com/openziti/sdk-golang v0.24.1 - github.com/openziti/secretstream v0.1.28 - github.com/openziti/storage v0.4.2 - github.com/openziti/transport/v2 v2.0.160 + github.com/openziti/secretstream v0.1.29 + github.com/openziti/storage v0.4.3 + github.com/openziti/transport/v2 v2.0.162 github.com/openziti/x509-claims v1.0.3 github.com/openziti/xweb/v2 v2.2.1 github.com/openziti/ziti-db-explorer v1.1.3 @@ -83,15 +83,15 @@ require ( github.com/teris-io/shortid v0.0.0-20201117134242-e59966efd125 github.com/xeipuuv/gojsonschema v1.2.0 github.com/zitadel/oidc/v2 v2.12.2 - go.etcd.io/bbolt v1.3.11 + go.etcd.io/bbolt v1.4.0 go4.org v0.0.0-20180809161055-417644f6feb5 - golang.org/x/crypto v0.32.0 + golang.org/x/crypto v0.33.0 golang.org/x/exp v0.0.0-20241210194714-1829a127f884 - golang.org/x/net v0.34.0 + golang.org/x/net v0.35.0 golang.org/x/oauth2 v0.25.0 - golang.org/x/sync v0.10.0 + golang.org/x/sync v0.11.0 golang.org/x/sys v0.30.0 - golang.org/x/text v0.21.0 + golang.org/x/text v0.22.0 google.golang.org/protobuf v1.36.5 gopkg.in/AlecAivazis/survey.v1 v1.8.8 gopkg.in/go-jose/go-jose.v2 v2.6.3 @@ -138,7 +138,7 @@ require ( github.com/hashicorp/go-msgpack/v2 v2.1.2 // indirect github.com/hashicorp/golang-lru v0.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/iancoleman/strcase v0.1.3 // indirect + github.com/iancoleman/strcase v0.3.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/josharian/native v1.1.0 // indirect @@ -166,7 +166,7 @@ require ( github.com/parallaxsecond/parsec-client-go v0.0.0-20221025095442-f0a77d263cf9 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/pion/dtls/v3 v3.0.4 // indirect - github.com/pion/logging v0.2.2 // indirect + github.com/pion/logging v0.2.3 // indirect github.com/pion/transport/v3 v3.0.7 // indirect github.com/pkg/term v1.2.0-beta.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect diff --git a/go.sum b/go.sum index ee02865c4..e9814a5a3 100644 --- a/go.sum +++ b/go.sum @@ -407,8 +407,9 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174 h1:WlZsjVhE8Af9IcZDGgJGQpNflI3+MJSBhsgT5PCtzBQ= github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/iancoleman/strcase v0.1.3 h1:dJBk1m2/qjL1twPLf68JND55vvivMupZ4wIzE8CTdBw= github.com/iancoleman/strcase v0.1.3/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= +github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= +github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= @@ -584,10 +585,10 @@ github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b/go.mo github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openziti-incubator/cf v0.0.3 h1:JKs55DbaIxl87nI/Ra/3DHMiz5iaPpu8JjsuN8SnG7w= github.com/openziti-incubator/cf v0.0.3/go.mod h1:6abCY06bCjKmK2I9kohij+cp9uXIPFiFwSCNZPdMk8E= -github.com/openziti/agent v1.0.24 h1:TXcBipDjgfXutcbANckESzW7MhWlqaBO3lfYo1SEu1c= -github.com/openziti/agent v1.0.24/go.mod h1:RkFCcVEco6mpJ3uWh0IThiDRnL5E+SbXclrtDeZlGAs= -github.com/openziti/channel/v3 v3.0.29 h1:5PHhV579XIJmngdvfkkrKLeGiMxPrbhxHkvK6siiGtM= -github.com/openziti/channel/v3 v3.0.29/go.mod h1:zVPv4qC1N4WgIo0CxPBkwaVkPpjbPeykuqXIq1AH/Hs= +github.com/openziti/agent v1.0.25 h1:I9o74/ZK/czKblsJ0wZC/hT3iUfYxK0O65ArX8NcvTs= +github.com/openziti/agent v1.0.25/go.mod h1:RkFCcVEco6mpJ3uWh0IThiDRnL5E+SbXclrtDeZlGAs= +github.com/openziti/channel/v3 v3.0.31 h1:uBh/6LLUM8uDmhM1zINvagh0bWDA7spHxrAIiSkEnME= +github.com/openziti/channel/v3 v3.0.31/go.mod h1:qWoLFRt758cOS45Yo8Aq30DVIUOUOlStlaTHb+Q3G84= github.com/openziti/cobra-to-md v1.0.1 h1:WRinNoIRmwWUSJm+pSNXMjOrtU48oxXDZgeCYQfVXxE= github.com/openziti/cobra-to-md v1.0.1/go.mod h1:FjCpk/yzHF7/r28oSTNr5P57yN5VolpdAtS/g7KNi2c= github.com/openziti/dilithium v0.3.5 h1:+envGNzxc3OyVPiuvtxivQmCsOjdZjtOMLpQBeMz7eM= @@ -596,8 +597,8 @@ github.com/openziti/edge-api v0.26.39 h1:4hb1RqjgpaTJorvbWTL6f2QcjJDn4BXDbLwes8D github.com/openziti/edge-api v0.26.39/go.mod h1:sYHVpm26Jr1u7VooNJzTb2b2nGSlmCHMnbGC8XfWSng= github.com/openziti/foundation/v2 v2.0.57 h1:3++rDYyPuIimSaHh5TrKGLodmoCsGZ3fARTg4FECduo= github.com/openziti/foundation/v2 v2.0.57/go.mod h1:9pC2rMvKgCjiWmga6RFvYG8ck03yrTTsp0uDiwmHbMk= -github.com/openziti/identity v1.0.97 h1:hv2XkwlLEsiUxHqdIWoJlvrUvZsUMHjRk+9soe2wE+M= -github.com/openziti/identity v1.0.97/go.mod h1:go6gu/YIUOE4OGqQBjgyMqwsQsmor32pYxkxDt6blPk= +github.com/openziti/identity v1.0.98 h1:jm3m4Pr3QDEQeodljtQguzzMDe8quyCLcSrahsB1Mas= +github.com/openziti/identity v1.0.98/go.mod h1:go6gu/YIUOE4OGqQBjgyMqwsQsmor32pYxkxDt6blPk= github.com/openziti/jwks v1.0.6 h1:PR+9OVaMO8oHEoVQmHqeUBExWwLWyODEGJQK2DXHaqE= github.com/openziti/jwks v1.0.6/go.mod h1:t4xxq8vlXGsPn29kiQVnZBBDDnEoOFqtJoHibkJunQQ= github.com/openziti/metrics v1.2.66 h1:6GeIHEUODH3TW4PznmqX5GjPCN9ycJ4XxBnyUROZz6I= @@ -606,12 +607,12 @@ github.com/openziti/runzmd v1.0.63 h1:z3xdkK4Hiyio5OEFO+CAle28IzhzELafyj9j2kYlyA github.com/openziti/runzmd v1.0.63/go.mod h1:zhEjxml05u59wXyMOg7Wao8uyR2o0HpgYBLewm7ctaU= github.com/openziti/sdk-golang v0.24.1 h1:5b3BFRspkHWq0UAMQz4J4QbXDDIdWTRy7stqMhmlEJk= github.com/openziti/sdk-golang v0.24.1/go.mod h1:aYijpXHfoc6r5hFDl5lu3WV9ZTLg97QBhUdhI9c9kOo= -github.com/openziti/secretstream v0.1.28 h1:D+a5TcvbY3i7HOIecoTL0Pq8HJGnJqS0XmUyO1ohObg= -github.com/openziti/secretstream v0.1.28/go.mod h1:BESAWnpyIr9A+ditH4vk15ZVsnP8zdy6vGi8Qr1lgAg= -github.com/openziti/storage v0.4.2 h1:ztq1Xwaw3abKxDOUl5Ajo4a6y+FIk6Y8HQTUZ6Km5Q0= -github.com/openziti/storage v0.4.2/go.mod h1:MZcsJjY5tm9rFU+G3fiwxJ3kgv5Q1UWQDrkBaDn4XAs= -github.com/openziti/transport/v2 v2.0.160 h1:bYBBj8gqZ8DCF6aCJThq2v89h5ILwqTVaFkyfjFmHpk= -github.com/openziti/transport/v2 v2.0.160/go.mod h1:Hw4TIlDd97D5m8BrlxTZ3bqO01+hwddTDMSOOzz/4cs= +github.com/openziti/secretstream v0.1.29 h1:tceya6erPurArkpJ8F/0qWaLEJY4ckFGowffxK4aSEE= +github.com/openziti/secretstream v0.1.29/go.mod h1:k7l2SKqDYuKQBRXi/jvUgH/00unx+yxlUSX6k7XsYCQ= +github.com/openziti/storage v0.4.3 h1:aSJaYbMss1kqcnID4KagWPnHTzXo3gfXEabvGWUk0MA= +github.com/openziti/storage v0.4.3/go.mod h1:Rnvkgq2SlPpBTOEnSD5p0ikklLaNoO1z054E/SNZl18= +github.com/openziti/transport/v2 v2.0.162 h1:Pli/1b8NRkj3cfh7+0xfUgepaFYPZCaYtVyh5rdn+/I= +github.com/openziti/transport/v2 v2.0.162/go.mod h1:A8bQprFr8CBlyMuzHnUH1D8EXuYqjZhwhLDkmV4vIzQ= github.com/openziti/x509-claims v1.0.3 h1:HNdQ8Nf1agB3lBs1gahcO6zfkeS4S5xoQ2/PkY4HRX0= github.com/openziti/x509-claims v1.0.3/go.mod h1:Z0WIpBm6c4ecrpRKrou6Gk2wrLWxJO/+tuUwKh8VewE= github.com/openziti/xweb/v2 v2.2.1 h1:vPHASmyTlWB75GLIEIvWSSs2ZQgZDsr7do0IXeHf6Ww= @@ -631,8 +632,8 @@ github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pion/dtls/v3 v3.0.4 h1:44CZekewMzfrn9pmGrj5BNnTMDCFwr+6sLH+cCuLM7U= github.com/pion/dtls/v3 v3.0.4/go.mod h1:R373CsjxWqNPf6MEkfdy3aSe9niZvL/JaKlGeFphtMg= -github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= -github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= +github.com/pion/logging v0.2.3 h1:gHuf0zpoh1GW67Nr6Gj4cv5Z9ZscU7g/EaoC/Ke/igI= +github.com/pion/logging v0.2.3/go.mod h1:z8YfknkquMe1csOrxK5kc+5/ZPAzMxbKLX5aXpbpC90= github.com/pion/transport/v3 v3.0.7 h1:iRbMH05BzSNwhILHoBoAPxoB9xQgOaJk+591KC9P1o0= github.com/pion/transport/v3 v3.0.7/go.mod h1:YleKiTZ4vqNxVwh77Z0zytYi7rXHl7j6uPLGhhz9rwo= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -839,8 +840,8 @@ github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ github.com/zitadel/oidc/v2 v2.12.2 h1:3kpckg4rurgw7w7aLJrq7yvRxb2pkNOtD08RH42vPEs= github.com/zitadel/oidc/v2 v2.12.2/go.mod h1:vhP26g1g4YVntcTi0amMYW3tJuid70nxqxf+kb6XKgg= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0= -go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I= +go.etcd.io/bbolt v1.4.0 h1:TU77id3TnN/zKr7CO/uk+fBCwF2jGcMuw2B/FMAzYIk= +go.etcd.io/bbolt v1.4.0/go.mod h1:AsD+OCi/qPN1giOX1aiLAha3o1U8rAz65bvN4j0sRuk= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= @@ -897,8 +898,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= -golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= -golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= +golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= +golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -993,8 +994,8 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= -golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= +golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= +golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1024,8 +1025,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= +golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1120,8 +1121,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/zititest/go.mod b/zititest/go.mod index 264be5f3e..f2fcb9a0b 100644 --- a/zititest/go.mod +++ b/zititest/go.mod @@ -11,15 +11,15 @@ require ( github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.6.0 github.com/michaelquigley/pfxlog v0.6.10 - github.com/openziti/agent v1.0.24 - github.com/openziti/channel/v3 v3.0.29 + github.com/openziti/agent v1.0.25 + github.com/openziti/channel/v3 v3.0.31 github.com/openziti/edge-api v0.26.39 github.com/openziti/fablab v0.5.83 github.com/openziti/foundation/v2 v2.0.57 - github.com/openziti/identity v1.0.97 + github.com/openziti/identity v1.0.98 github.com/openziti/sdk-golang v0.24.1 - github.com/openziti/storage v0.4.2 - github.com/openziti/transport/v2 v2.0.160 + github.com/openziti/storage v0.4.3 + github.com/openziti/transport/v2 v2.0.162 github.com/openziti/ziti v0.28.3 github.com/orcaman/concurrent-map/v2 v2.0.1 github.com/pkg/errors v0.9.1 @@ -27,8 +27,8 @@ require ( github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.1 github.com/stretchr/testify v1.10.0 - go.etcd.io/bbolt v1.3.11 - golang.org/x/net v0.34.0 + go.etcd.io/bbolt v1.4.0 + golang.org/x/net v0.35.0 google.golang.org/protobuf v1.36.5 gopkg.in/yaml.v2 v2.4.0 ) @@ -98,7 +98,7 @@ require ( github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/raft v1.7.2 // indirect github.com/hashicorp/raft-boltdb v0.0.0-20220329195025-15018e9b97e0 // indirect - github.com/iancoleman/strcase v0.1.3 // indirect + github.com/iancoleman/strcase v0.3.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/influxdata/influxdb-client-go/v2 v2.14.0 // indirect github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d // indirect @@ -145,7 +145,7 @@ require ( github.com/openziti/jwks v1.0.6 // indirect github.com/openziti/metrics v1.2.66 // indirect github.com/openziti/runzmd v1.0.63 // indirect - github.com/openziti/secretstream v0.1.28 // indirect + github.com/openziti/secretstream v0.1.29 // indirect github.com/openziti/x509-claims v1.0.3 // indirect github.com/openziti/xweb/v2 v2.2.1 // indirect github.com/openziti/ziti-db-explorer v1.1.3 // indirect @@ -191,15 +191,15 @@ require ( go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.9.0 // indirect go4.org v0.0.0-20180809161055-417644f6feb5 // indirect - golang.org/x/crypto v0.32.0 // indirect + golang.org/x/crypto v0.33.0 // indirect golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect golang.org/x/image v0.18.0 // indirect golang.org/x/mod v0.22.0 // indirect golang.org/x/oauth2 v0.25.0 // indirect - golang.org/x/sync v0.10.0 // indirect + golang.org/x/sync v0.11.0 // indirect golang.org/x/sys v0.30.0 // indirect golang.org/x/term v0.29.0 // indirect - golang.org/x/text v0.21.0 // indirect + golang.org/x/text v0.22.0 // indirect golang.org/x/tools v0.28.0 // indirect gopkg.in/AlecAivazis/survey.v1 v1.8.8 // indirect gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect diff --git a/zititest/go.sum b/zititest/go.sum index d74cfc29a..76c637c99 100644 --- a/zititest/go.sum +++ b/zititest/go.sum @@ -404,8 +404,9 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174 h1:WlZsjVhE8Af9IcZDGgJGQpNflI3+MJSBhsgT5PCtzBQ= github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/iancoleman/strcase v0.1.3 h1:dJBk1m2/qjL1twPLf68JND55vvivMupZ4wIzE8CTdBw= github.com/iancoleman/strcase v0.1.3/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= +github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= +github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= @@ -600,10 +601,10 @@ github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b/go.mo github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openziti-incubator/cf v0.0.3 h1:JKs55DbaIxl87nI/Ra/3DHMiz5iaPpu8JjsuN8SnG7w= github.com/openziti-incubator/cf v0.0.3/go.mod h1:6abCY06bCjKmK2I9kohij+cp9uXIPFiFwSCNZPdMk8E= -github.com/openziti/agent v1.0.24 h1:TXcBipDjgfXutcbANckESzW7MhWlqaBO3lfYo1SEu1c= -github.com/openziti/agent v1.0.24/go.mod h1:RkFCcVEco6mpJ3uWh0IThiDRnL5E+SbXclrtDeZlGAs= -github.com/openziti/channel/v3 v3.0.29 h1:5PHhV579XIJmngdvfkkrKLeGiMxPrbhxHkvK6siiGtM= -github.com/openziti/channel/v3 v3.0.29/go.mod h1:zVPv4qC1N4WgIo0CxPBkwaVkPpjbPeykuqXIq1AH/Hs= +github.com/openziti/agent v1.0.25 h1:I9o74/ZK/czKblsJ0wZC/hT3iUfYxK0O65ArX8NcvTs= +github.com/openziti/agent v1.0.25/go.mod h1:RkFCcVEco6mpJ3uWh0IThiDRnL5E+SbXclrtDeZlGAs= +github.com/openziti/channel/v3 v3.0.31 h1:uBh/6LLUM8uDmhM1zINvagh0bWDA7spHxrAIiSkEnME= +github.com/openziti/channel/v3 v3.0.31/go.mod h1:qWoLFRt758cOS45Yo8Aq30DVIUOUOlStlaTHb+Q3G84= github.com/openziti/cobra-to-md v1.0.1 h1:WRinNoIRmwWUSJm+pSNXMjOrtU48oxXDZgeCYQfVXxE= github.com/openziti/cobra-to-md v1.0.1/go.mod h1:FjCpk/yzHF7/r28oSTNr5P57yN5VolpdAtS/g7KNi2c= github.com/openziti/dilithium v0.3.5 h1:+envGNzxc3OyVPiuvtxivQmCsOjdZjtOMLpQBeMz7eM= @@ -614,8 +615,8 @@ github.com/openziti/fablab v0.5.83 h1:O0GHGtYV56oziaPg0hPgbXcNfE+fyoKA+mmdb4xZ5/ github.com/openziti/fablab v0.5.83/go.mod h1:r1tz45RA2u8x1iF/tgKN+B6hSR5FBR61kaq/bCne4zc= github.com/openziti/foundation/v2 v2.0.57 h1:3++rDYyPuIimSaHh5TrKGLodmoCsGZ3fARTg4FECduo= github.com/openziti/foundation/v2 v2.0.57/go.mod h1:9pC2rMvKgCjiWmga6RFvYG8ck03yrTTsp0uDiwmHbMk= -github.com/openziti/identity v1.0.97 h1:hv2XkwlLEsiUxHqdIWoJlvrUvZsUMHjRk+9soe2wE+M= -github.com/openziti/identity v1.0.97/go.mod h1:go6gu/YIUOE4OGqQBjgyMqwsQsmor32pYxkxDt6blPk= +github.com/openziti/identity v1.0.98 h1:jm3m4Pr3QDEQeodljtQguzzMDe8quyCLcSrahsB1Mas= +github.com/openziti/identity v1.0.98/go.mod h1:go6gu/YIUOE4OGqQBjgyMqwsQsmor32pYxkxDt6blPk= github.com/openziti/jwks v1.0.6 h1:PR+9OVaMO8oHEoVQmHqeUBExWwLWyODEGJQK2DXHaqE= github.com/openziti/jwks v1.0.6/go.mod h1:t4xxq8vlXGsPn29kiQVnZBBDDnEoOFqtJoHibkJunQQ= github.com/openziti/metrics v1.2.66 h1:6GeIHEUODH3TW4PznmqX5GjPCN9ycJ4XxBnyUROZz6I= @@ -624,12 +625,12 @@ github.com/openziti/runzmd v1.0.63 h1:z3xdkK4Hiyio5OEFO+CAle28IzhzELafyj9j2kYlyA github.com/openziti/runzmd v1.0.63/go.mod h1:zhEjxml05u59wXyMOg7Wao8uyR2o0HpgYBLewm7ctaU= github.com/openziti/sdk-golang v0.24.1 h1:5b3BFRspkHWq0UAMQz4J4QbXDDIdWTRy7stqMhmlEJk= github.com/openziti/sdk-golang v0.24.1/go.mod h1:aYijpXHfoc6r5hFDl5lu3WV9ZTLg97QBhUdhI9c9kOo= -github.com/openziti/secretstream v0.1.28 h1:D+a5TcvbY3i7HOIecoTL0Pq8HJGnJqS0XmUyO1ohObg= -github.com/openziti/secretstream v0.1.28/go.mod h1:BESAWnpyIr9A+ditH4vk15ZVsnP8zdy6vGi8Qr1lgAg= -github.com/openziti/storage v0.4.2 h1:ztq1Xwaw3abKxDOUl5Ajo4a6y+FIk6Y8HQTUZ6Km5Q0= -github.com/openziti/storage v0.4.2/go.mod h1:MZcsJjY5tm9rFU+G3fiwxJ3kgv5Q1UWQDrkBaDn4XAs= -github.com/openziti/transport/v2 v2.0.160 h1:bYBBj8gqZ8DCF6aCJThq2v89h5ILwqTVaFkyfjFmHpk= -github.com/openziti/transport/v2 v2.0.160/go.mod h1:Hw4TIlDd97D5m8BrlxTZ3bqO01+hwddTDMSOOzz/4cs= +github.com/openziti/secretstream v0.1.29 h1:tceya6erPurArkpJ8F/0qWaLEJY4ckFGowffxK4aSEE= +github.com/openziti/secretstream v0.1.29/go.mod h1:k7l2SKqDYuKQBRXi/jvUgH/00unx+yxlUSX6k7XsYCQ= +github.com/openziti/storage v0.4.3 h1:aSJaYbMss1kqcnID4KagWPnHTzXo3gfXEabvGWUk0MA= +github.com/openziti/storage v0.4.3/go.mod h1:Rnvkgq2SlPpBTOEnSD5p0ikklLaNoO1z054E/SNZl18= +github.com/openziti/transport/v2 v2.0.162 h1:Pli/1b8NRkj3cfh7+0xfUgepaFYPZCaYtVyh5rdn+/I= +github.com/openziti/transport/v2 v2.0.162/go.mod h1:A8bQprFr8CBlyMuzHnUH1D8EXuYqjZhwhLDkmV4vIzQ= github.com/openziti/x509-claims v1.0.3 h1:HNdQ8Nf1agB3lBs1gahcO6zfkeS4S5xoQ2/PkY4HRX0= github.com/openziti/x509-claims v1.0.3/go.mod h1:Z0WIpBm6c4ecrpRKrou6Gk2wrLWxJO/+tuUwKh8VewE= github.com/openziti/xweb/v2 v2.2.1 h1:vPHASmyTlWB75GLIEIvWSSs2ZQgZDsr7do0IXeHf6Ww= @@ -854,8 +855,8 @@ github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ github.com/zitadel/oidc/v2 v2.12.2 h1:3kpckg4rurgw7w7aLJrq7yvRxb2pkNOtD08RH42vPEs= github.com/zitadel/oidc/v2 v2.12.2/go.mod h1:vhP26g1g4YVntcTi0amMYW3tJuid70nxqxf+kb6XKgg= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0= -go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I= +go.etcd.io/bbolt v1.4.0 h1:TU77id3TnN/zKr7CO/uk+fBCwF2jGcMuw2B/FMAzYIk= +go.etcd.io/bbolt v1.4.0/go.mod h1:AsD+OCi/qPN1giOX1aiLAha3o1U8rAz65bvN4j0sRuk= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= @@ -913,8 +914,8 @@ golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= -golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= +golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= +golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1012,8 +1013,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= -golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= +golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= +golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1044,8 +1045,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= +golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1149,8 +1150,8 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From c35290e63a20cc73a8b502f813f8e5b3c0520839 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Tue, 11 Feb 2025 14:23:52 -0500 Subject: [PATCH 3/3] Fix deprecations --- controller/db/api_session_store.go | 3 ++- controller/raft/fsm.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/controller/db/api_session_store.go b/controller/db/api_session_store.go index c05bdfaaf..f3c7ab462 100644 --- a/controller/db/api_session_store.go +++ b/controller/db/api_session_store.go @@ -26,6 +26,7 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" "go.etcd.io/bbolt" + bolterrors "go.etcd.io/bbolt/errors" "strings" "time" ) @@ -174,7 +175,7 @@ func (store *apiSessionStoreImpl) cleanupSessions(db boltz.Db, name string, apiS indexPath := []string{RootBucket, boltz.IndexesBucket, EntityTypeApiSessions, EntityTypeSessions} if bucket := boltz.Path(ctx.Tx(), indexPath...); bucket != nil { if err := bucket.DeleteBucket(apiSessionId); err != nil { - if !errors.Is(err, bbolt.ErrBucketNotFound) { + if !errors.Is(err, bolterrors.ErrBucketNotFound) { logger.WithError(err). Error("error deleting for api session index associated to an api session during onEventualDelete") } diff --git a/controller/raft/fsm.go b/controller/raft/fsm.go index 5d54f77e4..fb229d35e 100644 --- a/controller/raft/fsm.go +++ b/controller/raft/fsm.go @@ -30,6 +30,7 @@ import ( event2 "github.com/openziti/ziti/controller/event" "github.com/sirupsen/logrus" "go.etcd.io/bbolt" + bbolterrors "go.etcd.io/bbolt/errors" "io" "os" "path" @@ -159,7 +160,7 @@ func (self *BoltDbFsm) storeConfigurationInRaft(index uint64, servers []raft.Ser func (self *BoltDbFsm) storeServers(tx *bbolt.Tx, servers []raft.Server) error { raftBucket := boltz.GetOrCreatePath(tx, db.RootBucket, db.MetadataBucket) if err := raftBucket.DeleteBucket([]byte(ServersBucket)); err != nil { - if !errors.Is(err, bbolt.ErrBucketNotFound) { + if !errors.Is(err, bbolterrors.ErrBucketNotFound) { return err } }