Skip to content

Commit

Permalink
Merge pull request #2463 from openziti/update-deps-and-changelog
Browse files Browse the repository at this point in the history 
Update deps and changelog
  • Loading branch information
@plorenz
plorenz authored Oct 2, 2024
2 parents 852976e + 1b47d52 commit 0eec47c
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 37 deletions.
11 changes: 10 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,19 @@

## What's New

* Panic fix related to controller HA
* Bug fixes, enhancements and continuing progress on controller HA

## Component Updates and Bug Fixes

* github.com/openziti/channel/v3: [v3.0.3 -> v3.0.5](https://github.com/openziti/channel/compare/v3.0.3...v3.0.5)
* [Issue #146](https://github.com/openziti/channel/issues/146) - Transport options aren't being set in dialer
* [Issue #144](https://github.com/openziti/channel/issues/144) - Add ReadAdapter utility

* github.com/openziti/edge-api: [v0.26.31 -> v0.26.32](https://github.com/openziti/edge-api/compare/v0.26.31...v0.26.32)
* github.com/openziti/sdk-golang: [v0.23.42 -> v0.23.43](https://github.com/openziti/sdk-golang/compare/v0.23.42...v0.23.43)
* [Issue #629](https://github.com/openziti/sdk-golang/issues/629) - JWT session refresh interprets expiration date incorrectly

* github.com/openziti/secretstream: [v0.1.24 -> v0.1.25](https://github.com/openziti/secretstream/compare/v0.1.24...v0.1.25)
* github.com/openziti/ziti: [v1.1.14 -> v1.1.15](https://github.com/openziti/ziti/compare/v1.1.14...v1.1.15)
* [Issue #2460](https://github.com/openziti/ziti/issues/2460) - Panic on JWT token refresh

Expand Down
16 changes: 10 additions & 6 deletions controller/raft/mesh/mesh.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ type impl struct {
closeNotify chan struct{}
closed atomic.Bool
raftAccepts chan net.Conn
bindHandler channel.BindHandler
bindHandler concurrenz.AtomicValue[channel.BindHandler]
version versions.VersionProvider
versionEncoded []byte
readonly atomic.Bool
Expand All @@ -261,8 +261,8 @@ func (self *impl) RegisterClusterStateHandler(f func(state ClusterState)) {
}

func (self *impl) Init(bindHandler channel.BindHandler) {
if self.bindHandler == nil {
self.bindHandler = bindHandler
if self.bindHandler.Load() == nil {
self.bindHandler.Store(bindHandler)
}
}

Expand Down Expand Up @@ -354,10 +354,10 @@ func (self *impl) GetOrConnectPeer(address string, timeout time.Duration) (*Peer
}

bindHandler := channel.BindHandlerF(func(binding channel.Binding) error {
if self.bindHandler == nil {
if self.bindHandler.Load() == nil {
return errors.New("bindHandler not initialized, cannot initialize new channels")
}
if err := self.bindHandler.BindChannel(binding); err != nil {
if err = self.bindHandler.Load().BindChannel(binding); err != nil {
return err
}

Expand Down Expand Up @@ -594,7 +594,11 @@ func (self *impl) AcceptUnderlay(underlay channel.Underlay) error {
return errors.Errorf("connection didn't provide id '%v' or address '%v', closing connection", id, addr)
}

if err := binding.Bind(self.bindHandler); err != nil {
bh := self.bindHandler.Load()
if bh == nil {
return errors.New("bindHandler not initialized, can't accept controller connection")
}
if err = binding.Bind(bh); err != nil {
_ = ch.Close()
return errors.Wrapf(err, "error while binding channel from id '%v' or address '%v', closing connection", id, addr)
}
Expand Down
10 changes: 5 additions & 5 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@ require (
github.com/mitchellh/mapstructure v1.5.0
github.com/natefinch/lumberjack v2.0.0+incompatible
github.com/openziti/agent v1.0.18
github.com/openziti/channel/v3 v3.0.3
github.com/openziti/channel/v3 v3.0.5
github.com/openziti/cobra-to-md v1.0.1
github.com/openziti/edge-api v0.26.31
github.com/openziti/edge-api v0.26.32
github.com/openziti/foundation/v2 v2.0.49
github.com/openziti/identity v1.0.85
github.com/openziti/jwks v1.0.6
github.com/openziti/metrics v1.2.58
github.com/openziti/runzmd v1.0.51
github.com/openziti/sdk-golang v0.23.42
github.com/openziti/secretstream v0.1.24
github.com/openziti/sdk-golang v0.23.43
github.com/openziti/secretstream v0.1.25
github.com/openziti/storage v0.3.2
github.com/openziti/transport/v2 v2.0.146
github.com/openziti/x509-claims v1.0.3
Expand Down Expand Up @@ -186,7 +186,7 @@ require (
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.mongodb.org/mongo-driver v1.17.0 // indirect
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
go.mozilla.org/pkcs7 v0.9.0 // indirect
go.opentelemetry.io/otel v1.30.0 // indirect
go.opentelemetry.io/otel/metric v1.30.0 // indirect
go.opentelemetry.io/otel/trace v1.30.0 // indirect
Expand Down
20 changes: 10 additions & 10 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -570,14 +570,14 @@ github.com/openziti-incubator/cf v0.0.3 h1:JKs55DbaIxl87nI/Ra/3DHMiz5iaPpu8JjsuN
github.com/openziti-incubator/cf v0.0.3/go.mod h1:6abCY06bCjKmK2I9kohij+cp9uXIPFiFwSCNZPdMk8E=
github.com/openziti/agent v1.0.18 h1:+MP1AXGresJPcbhbsFdElpTWqrQW+VZOLya0V+/mGbE=
github.com/openziti/agent v1.0.18/go.mod h1:HET46hghk8ahnVt/3mfVjmnL4NLNVZGnqvrQC3PbIn8=
github.com/openziti/channel/v3 v3.0.3 h1:rmC/YtDgHQkcoLQOPygdg7QKuou6BrMubR/bsoH73js=
github.com/openziti/channel/v3 v3.0.3/go.mod h1:MiVIlcPpcErv8E/TLDpxWNV1fGh8lb0g7qMlQGFYTec=
github.com/openziti/channel/v3 v3.0.5 h1:Dfjjknaej5XZ6IqwJzmL6jpB8Y3P9ejBSuOvPI5J05U=
github.com/openziti/channel/v3 v3.0.5/go.mod h1:MiVIlcPpcErv8E/TLDpxWNV1fGh8lb0g7qMlQGFYTec=
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=
github.com/openziti/dilithium v0.3.5/go.mod h1:XONq1iK6te/WwNzkgZHfIDHordMPqb0hMwJ8bs9EfSk=
github.com/openziti/edge-api v0.26.31 h1:9XljIuZNhoPbiIicQYuxNyL7erpowZce3aOg1CkoxSo=
github.com/openziti/edge-api v0.26.31/go.mod h1:f5paewA+1G6JMZddYgXqA9Zp6BBXOJ1i4K42B+ET5ns=
github.com/openziti/edge-api v0.26.32 h1:32oJI97cuM/kRJPEOwH2pe9dqwj56IYdQgTjTJaaHaU=
github.com/openziti/edge-api v0.26.32/go.mod h1:sYHVpm26Jr1u7VooNJzTb2b2nGSlmCHMnbGC8XfWSng=
github.com/openziti/foundation/v2 v2.0.49 h1:aQ5I/lMhkHQ6urhRpLwrWP+7YtoeUitCfY/wub+nOqo=
github.com/openziti/foundation/v2 v2.0.49/go.mod h1:tFk7wg5WE/nDDur5jSVQTROugKDXQkFvmqRSV4pvWp0=
github.com/openziti/identity v1.0.85 h1:jphDHrUCXCJGdbVTMBqsdtS0Ei/vhDH337DMNMYzLro=
Expand All @@ -588,10 +588,10 @@ github.com/openziti/metrics v1.2.58 h1:AbHSTMKHP/o6r6fh7a08c486Y/5f5xjkZQbcyn3w1
github.com/openziti/metrics v1.2.58/go.mod h1:zGLMrLvVFOxo9tXUf8svcUsASxsPjhW9foW92FUzmDs=
github.com/openziti/runzmd v1.0.51 h1:Vz+2nfF9AyKQGyKwBUnpL2DH/4cL+3rOuLWj8lkNDBc=
github.com/openziti/runzmd v1.0.51/go.mod h1:TB2FZtxC6+jkZoJS21GY399j7Bo/05tGaULIyHO81s8=
github.com/openziti/sdk-golang v0.23.42 h1:27tkEQ58RrAjfVgUfUmC2HAbJdyO9WjnLfhOoQWj5Zk=
github.com/openziti/sdk-golang v0.23.42/go.mod h1:Nb9QU3zXtx4NoxZO/W7YhL+n46RY3p8sr5BR87kfcgo=
github.com/openziti/secretstream v0.1.24 h1:4MgfpoQ/jxdRMUrvi0MbXB4xw9Uu5A6e1TPrf9UaTWk=
github.com/openziti/secretstream v0.1.24/go.mod h1:7CZxW/G7AQ27G0K4v/hvzDN2pBHQmCvhao3Y70Q6Zy4=
github.com/openziti/sdk-golang v0.23.43 h1:n/Xaif9canea+T+VgNmfNhF2nNveXe4gdS35uUQgUIY=
github.com/openziti/sdk-golang v0.23.43/go.mod h1:6QsDMxGxX3Qsgpp4zVVHgBfr5XkXjIwRONS7onnaGvU=
github.com/openziti/secretstream v0.1.25 h1:40gHKcAcoXqKs0J7Tz1jTAmPoMXmMn4HP3Mg6scgJ5c=
github.com/openziti/secretstream v0.1.25/go.mod h1:zgBcyN7h/zLBIWeqSrWwlOGOMQW51oQGYYlkiArR6Ec=
github.com/openziti/storage v0.3.2 h1:etRAT2asJvV1gKgj/eRu3st7AO0TKgDagsEpDdIj/l0=
github.com/openziti/storage v0.3.2/go.mod h1:yTv6Rqs8Rk6nMPUD+96VXI5eWhOARTNLV0OPmgiK8I4=
github.com/openziti/transport/v2 v2.0.146 h1:Wdr4udri/fFpdj9GR9DR7/FKqt/2cMTgBdt3gfrqFaQ=
Expand Down Expand Up @@ -819,8 +819,8 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3
go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
go.mongodb.org/mongo-driver v1.17.0 h1:Hp4q2MCjvY19ViwimTs00wHi7G4yzxh4/2+nTx8r40k=
go.mongodb.org/mongo-driver v1.17.0/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4=
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 h1:CCriYyAfq1Br1aIYettdHZTy8mBTIPo7We18TuO/bak=
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk=
go.mozilla.org/pkcs7 v0.9.0 h1:yM4/HS9dYv7ri2biPtxt8ikvB37a980dg69/pKmS+eI=
go.mozilla.org/pkcs7 v0.9.0/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk=
go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
Expand Down
10 changes: 5 additions & 5 deletions zititest/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ require (
github.com/google/uuid v1.6.0
github.com/michaelquigley/pfxlog v0.6.10
github.com/openziti/agent v1.0.18
github.com/openziti/channel/v3 v3.0.3
github.com/openziti/edge-api v0.26.31
github.com/openziti/channel/v3 v3.0.5
github.com/openziti/edge-api v0.26.32
github.com/openziti/fablab v0.5.60
github.com/openziti/foundation/v2 v2.0.49
github.com/openziti/identity v1.0.85
github.com/openziti/sdk-golang v0.23.42
github.com/openziti/sdk-golang v0.23.43
github.com/openziti/storage v0.3.2
github.com/openziti/transport/v2 v2.0.146
github.com/openziti/ziti v0.28.3
Expand Down Expand Up @@ -144,7 +144,7 @@ require (
github.com/openziti/jwks v1.0.6 // indirect
github.com/openziti/metrics v1.2.58 // indirect
github.com/openziti/runzmd v1.0.51 // indirect
github.com/openziti/secretstream v0.1.24 // indirect
github.com/openziti/secretstream v0.1.25 // indirect
github.com/openziti/x509-claims v1.0.3 // indirect
github.com/openziti/xweb/v2 v2.1.3 // indirect
github.com/openziti/ziti-db-explorer v1.1.3 // indirect
Expand Down Expand Up @@ -183,7 +183,7 @@ require (
github.com/yusufpapurcu/wmi v1.2.4 // indirect
github.com/zitadel/oidc/v2 v2.12.2 // indirect
go.mongodb.org/mongo-driver v1.17.0 // indirect
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
go.mozilla.org/pkcs7 v0.9.0 // indirect
go.opentelemetry.io/otel v1.30.0 // indirect
go.opentelemetry.io/otel/metric v1.30.0 // indirect
go.opentelemetry.io/otel/trace v1.30.0 // indirect
Expand Down
20 changes: 10 additions & 10 deletions zititest/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -592,14 +592,14 @@ github.com/openziti-incubator/cf v0.0.3 h1:JKs55DbaIxl87nI/Ra/3DHMiz5iaPpu8JjsuN
github.com/openziti-incubator/cf v0.0.3/go.mod h1:6abCY06bCjKmK2I9kohij+cp9uXIPFiFwSCNZPdMk8E=
github.com/openziti/agent v1.0.18 h1:+MP1AXGresJPcbhbsFdElpTWqrQW+VZOLya0V+/mGbE=
github.com/openziti/agent v1.0.18/go.mod h1:HET46hghk8ahnVt/3mfVjmnL4NLNVZGnqvrQC3PbIn8=
github.com/openziti/channel/v3 v3.0.3 h1:rmC/YtDgHQkcoLQOPygdg7QKuou6BrMubR/bsoH73js=
github.com/openziti/channel/v3 v3.0.3/go.mod h1:MiVIlcPpcErv8E/TLDpxWNV1fGh8lb0g7qMlQGFYTec=
github.com/openziti/channel/v3 v3.0.5 h1:Dfjjknaej5XZ6IqwJzmL6jpB8Y3P9ejBSuOvPI5J05U=
github.com/openziti/channel/v3 v3.0.5/go.mod h1:MiVIlcPpcErv8E/TLDpxWNV1fGh8lb0g7qMlQGFYTec=
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=
github.com/openziti/dilithium v0.3.5/go.mod h1:XONq1iK6te/WwNzkgZHfIDHordMPqb0hMwJ8bs9EfSk=
github.com/openziti/edge-api v0.26.31 h1:9XljIuZNhoPbiIicQYuxNyL7erpowZce3aOg1CkoxSo=
github.com/openziti/edge-api v0.26.31/go.mod h1:f5paewA+1G6JMZddYgXqA9Zp6BBXOJ1i4K42B+ET5ns=
github.com/openziti/edge-api v0.26.32 h1:32oJI97cuM/kRJPEOwH2pe9dqwj56IYdQgTjTJaaHaU=
github.com/openziti/edge-api v0.26.32/go.mod h1:sYHVpm26Jr1u7VooNJzTb2b2nGSlmCHMnbGC8XfWSng=
github.com/openziti/fablab v0.5.60 h1:RsqrEb3LV6asK5N97uZKyNSDhcNOeDcAuT4OAD/hY9Y=
github.com/openziti/fablab v0.5.60/go.mod h1:B/ib+GOtozEIytv2aXSFl9+dL7AiGfbpGS/VjnNduU8=
github.com/openziti/foundation/v2 v2.0.49 h1:aQ5I/lMhkHQ6urhRpLwrWP+7YtoeUitCfY/wub+nOqo=
Expand All @@ -612,10 +612,10 @@ github.com/openziti/metrics v1.2.58 h1:AbHSTMKHP/o6r6fh7a08c486Y/5f5xjkZQbcyn3w1
github.com/openziti/metrics v1.2.58/go.mod h1:zGLMrLvVFOxo9tXUf8svcUsASxsPjhW9foW92FUzmDs=
github.com/openziti/runzmd v1.0.51 h1:Vz+2nfF9AyKQGyKwBUnpL2DH/4cL+3rOuLWj8lkNDBc=
github.com/openziti/runzmd v1.0.51/go.mod h1:TB2FZtxC6+jkZoJS21GY399j7Bo/05tGaULIyHO81s8=
github.com/openziti/sdk-golang v0.23.42 h1:27tkEQ58RrAjfVgUfUmC2HAbJdyO9WjnLfhOoQWj5Zk=
github.com/openziti/sdk-golang v0.23.42/go.mod h1:Nb9QU3zXtx4NoxZO/W7YhL+n46RY3p8sr5BR87kfcgo=
github.com/openziti/secretstream v0.1.24 h1:4MgfpoQ/jxdRMUrvi0MbXB4xw9Uu5A6e1TPrf9UaTWk=
github.com/openziti/secretstream v0.1.24/go.mod h1:7CZxW/G7AQ27G0K4v/hvzDN2pBHQmCvhao3Y70Q6Zy4=
github.com/openziti/sdk-golang v0.23.43 h1:n/Xaif9canea+T+VgNmfNhF2nNveXe4gdS35uUQgUIY=
github.com/openziti/sdk-golang v0.23.43/go.mod h1:6QsDMxGxX3Qsgpp4zVVHgBfr5XkXjIwRONS7onnaGvU=
github.com/openziti/secretstream v0.1.25 h1:40gHKcAcoXqKs0J7Tz1jTAmPoMXmMn4HP3Mg6scgJ5c=
github.com/openziti/secretstream v0.1.25/go.mod h1:zgBcyN7h/zLBIWeqSrWwlOGOMQW51oQGYYlkiArR6Ec=
github.com/openziti/storage v0.3.2 h1:etRAT2asJvV1gKgj/eRu3st7AO0TKgDagsEpDdIj/l0=
github.com/openziti/storage v0.3.2/go.mod h1:yTv6Rqs8Rk6nMPUD+96VXI5eWhOARTNLV0OPmgiK8I4=
github.com/openziti/transport/v2 v2.0.146 h1:Wdr4udri/fFpdj9GR9DR7/FKqt/2cMTgBdt3gfrqFaQ=
Expand Down Expand Up @@ -840,8 +840,8 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3
go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
go.mongodb.org/mongo-driver v1.17.0 h1:Hp4q2MCjvY19ViwimTs00wHi7G4yzxh4/2+nTx8r40k=
go.mongodb.org/mongo-driver v1.17.0/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4=
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 h1:CCriYyAfq1Br1aIYettdHZTy8mBTIPo7We18TuO/bak=
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk=
go.mozilla.org/pkcs7 v0.9.0 h1:yM4/HS9dYv7ri2biPtxt8ikvB37a980dg69/pKmS+eI=
go.mozilla.org/pkcs7 v0.9.0/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk=
go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
Expand Down

0 comments on commit 0eec47c

Please sign in to comment.