Update deps and changelog

CHANGELOG.md

@@ -1,3 +1,25 @@
+# Release 1.2.1
+
+## What's New
+
+* Bug fixes and continuing progress on controller HA
+
+## Component Updates and Bug Fixes
+
+* github.com/openziti/agent: [v1.0.19 -> v1.0.20](https://github.com/openziti/agent/compare/v1.0.19...v1.0.20)
+* github.com/openziti/channel/v3: [v3.0.10 -> v3.0.13](https://github.com/openziti/channel/compare/v3.0.10...v3.0.13)
+* github.com/openziti/foundation/v2: [v2.0.50 -> v2.0.52](https://github.com/openziti/foundation/compare/v2.0.50...v2.0.52)
+* github.com/openziti/identity: [v1.0.88 -> v1.0.90](https://github.com/openziti/identity/compare/v1.0.88...v1.0.90)
+* github.com/openziti/metrics: [v1.2.59 -> v1.2.61](https://github.com/openziti/metrics/compare/v1.2.59...v1.2.61)
+* github.com/openziti/runzmd: [v1.0.53 -> v1.0.55](https://github.com/openziti/runzmd/compare/v1.0.53...v1.0.55)
+* github.com/openziti/storage: [v0.3.2 -> v0.3.6](https://github.com/openziti/storage/compare/v0.3.2...v0.3.6)
+* github.com/openziti/transport/v2: [v2.0.150 -> v2.0.153](https://github.com/openziti/transport/compare/v2.0.150...v2.0.153)
+* github.com/openziti/ziti: [v1.2.0 -> v1.2.1](https://github.com/openziti/ziti/compare/v1.2.0...v1.2.1)
+    * [Issue #2532](https://github.com/openziti/ziti/issues/2532) - When adding an existing HA cluster member, remove/add if suffrage has changed
+    * [Issue #2217](https://github.com/openziti/ziti/issues/2217) - Controller list is empty until peers connect
+    * [Issue #2533](https://github.com/openziti/ziti/issues/2533) - Handle concurrent raft connections
+    * [Issue #2528](https://github.com/openziti/ziti/issues/2528) - Updated router costs are not use when evaluating current path cost in the context of smart rerouting
+
 # Release 1.2.0
 
 ## What's New

go.mod

@@ -49,19 +49,19 @@ require (
 	github.com/miekg/dns v1.1.62
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/natefinch/lumberjack v2.0.0+incompatible
-	github.com/openziti/agent v1.0.19
-	github.com/openziti/channel/v3 v3.0.10
+	github.com/openziti/agent v1.0.20
+	github.com/openziti/channel/v3 v3.0.13
 	github.com/openziti/cobra-to-md v1.0.1
 	github.com/openziti/edge-api v0.26.35
-	github.com/openziti/foundation/v2 v2.0.50
-	github.com/openziti/identity v1.0.88
+	github.com/openziti/foundation/v2 v2.0.52
+	github.com/openziti/identity v1.0.90
 	github.com/openziti/jwks v1.0.6
-	github.com/openziti/metrics v1.2.59
-	github.com/openziti/runzmd v1.0.53
+	github.com/openziti/metrics v1.2.61
+	github.com/openziti/runzmd v1.0.55
 	github.com/openziti/sdk-golang v0.23.44
 	github.com/openziti/secretstream v0.1.25
-	github.com/openziti/storage v0.3.4
-	github.com/openziti/transport/v2 v2.0.150
+	github.com/openziti/storage v0.3.6
+	github.com/openziti/transport/v2 v2.0.153
 	github.com/openziti/x509-claims v1.0.3
 	github.com/openziti/xweb/v2 v2.1.3
 	github.com/openziti/ziti-db-explorer v1.1.3
@@ -160,7 +160,7 @@ require (
 	github.com/openziti/dilithium v0.3.5 // indirect
 	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.3 // indirect
+	github.com/pion/dtls/v3 v3.0.4 // indirect
 	github.com/pion/logging v0.2.2 // indirect
 	github.com/pion/transport/v3 v3.0.7 // indirect
 	github.com/pkg/term v1.2.0-beta.2 // indirect

go.sum

@@ -569,34 +569,34 @@ 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.19 h1:KmaHlDj7rTQ8OEnbwXBVeXR4sOjv/naYgW/O8Cv8hxM=
-github.com/openziti/agent v1.0.19/go.mod h1:f+ZWrLgHWgBG7R0k5cJacd/pFQfXH7ZgsC1BB4kOZSQ=
-github.com/openziti/channel/v3 v3.0.10 h1:4wwb5ncuti/wDOJ6iaMil4vxt0aDNLCK4e1Z3k68WnY=
-github.com/openziti/channel/v3 v3.0.10/go.mod h1:sksAe5kaNTkxFjIPpE3lFUd5YsVZ/LjbqrWivEiFNfw=
+github.com/openziti/agent v1.0.20 h1:Anzbf+xLTdeeOTEpdUQOWu9Lq/zSLfChcyOpHYQRBhE=
+github.com/openziti/agent v1.0.20/go.mod h1:0MDpC5eu4NXpg84J6M2N3pWEOxbM8DJCqVMYRiIcHzs=
+github.com/openziti/channel/v3 v3.0.13 h1:nsbXLxbJpmMvrKDnEh6bStYg110HvMv8LMDligaELtI=
+github.com/openziti/channel/v3 v3.0.13/go.mod h1:eU/qMrSx+s4lt+EgkXMXQJ1pUWigSSfJxbCp3EyAfss=
 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.35 h1:32ILwMAPCQrf5ZVIR8IQO5AQwblIM60yD1+ABw48vXU=
 github.com/openziti/edge-api v0.26.35/go.mod h1:sYHVpm26Jr1u7VooNJzTb2b2nGSlmCHMnbGC8XfWSng=
-github.com/openziti/foundation/v2 v2.0.50 h1:DElep1hvEGWzyQbDgW7nxj2th5p1lNWbJODE8b5q2qc=
-github.com/openziti/foundation/v2 v2.0.50/go.mod h1:5JkVZC2o6kWdSGPQnP/FVGZ4kJwdRLNUe/Szt+/2mYA=
-github.com/openziti/identity v1.0.88 h1:7T9DDrRpZPHfAi8u2lvdsmCxvdQPP37oAqU88rxdxjU=
-github.com/openziti/identity v1.0.88/go.mod h1:aZfGeyW6zwUMN80k5VBflbvtyCGsv86Hs4cxM620Xy0=
+github.com/openziti/foundation/v2 v2.0.52 h1:MSsgFAr84Oi24qPGWBNnTH2bsicOX2kr24CNju0+pnM=
+github.com/openziti/foundation/v2 v2.0.52/go.mod h1:R7Z7zGVd3p3ETE3UCBwlbxp6ZFJcdOblszbB9bsSNZw=
+github.com/openziti/identity v1.0.90 h1:pZedbJ2HGhnKisi3K0q+TPqDCIhijxxWPkrli4ptMf8=
+github.com/openziti/identity v1.0.90/go.mod h1:HRDRSj44IkND9b4mj2Virpiw4t4A0vdu6TMIFJggIA8=
 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.59 h1:38ptLVHUr4XxPa9PStXs+hhZx9dTQVm4c08QsY+5XcU=
-github.com/openziti/metrics v1.2.59/go.mod h1:ruI60Q0DuD7qHZMgJ2+FP17HvvlxHd/NRyHH/8rb1iE=
-github.com/openziti/runzmd v1.0.53 h1:S7ih4OFaHxeFSZzp1mlq0UGhorMYczXfKAeniRwlIfE=
-github.com/openziti/runzmd v1.0.53/go.mod h1:WoIHpN+yaG29+1rHQqkc2VBze3kRGuAsaEV8dY+gcyg=
+github.com/openziti/metrics v1.2.61 h1:cslJD/ffKXX9mSFR7pfnCLZfWGD19ua/kz2AChQMm/k=
+github.com/openziti/metrics v1.2.61/go.mod h1:gVvptADA22VKYdlCCO+0iuK8SFtl9lOM+V11taM7ybs=
+github.com/openziti/runzmd v1.0.55 h1:GvccmgMCs2b2IGnp7fxygMWGgusGN8SD62VoNZedv9g=
+github.com/openziti/runzmd v1.0.55/go.mod h1:AWbxVzGyR1FLEdqBKnxApiBFp2Q43ZG8xn5pZLBxh1o=
 github.com/openziti/sdk-golang v0.23.44 h1:TzRO8dz6aAO2g0IXsKC6PvmT+cYyJpw2oJRUqhnPeCA=
 github.com/openziti/sdk-golang v0.23.44/go.mod h1:tJ8KXdqWRfAEekvbo/vJsN2PYydbPK/Gh2rAcc65+qE=
 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.4 h1:ByMicO5zDLO0ouZ0hcoA2rCb68uYW6fzTOViizU+mOY=
-github.com/openziti/storage v0.3.4/go.mod h1:jVeja+C8TvmNrpp3eDT9BQsX3Mk4FKiAcqD97hX4e8U=
-github.com/openziti/transport/v2 v2.0.150 h1:x7COR4GL0JDQZuxV4ObbOWErvZsWtJJSGmULY5RxARo=
-github.com/openziti/transport/v2 v2.0.150/go.mod h1:tx/ZaGRTsYNqrJrTvE4ykxwldY323c88zlK6129pyts=
+github.com/openziti/storage v0.3.6 h1:ZBEZTAQXS8Blm/r/nYKIRAcGYBk2k/kerW0SV9Y4GWw=
+github.com/openziti/storage v0.3.6/go.mod h1:eiuxpwDaT0MmO3rcsM9l+wwzWbL0tsHtF5q5fadCau8=
+github.com/openziti/transport/v2 v2.0.153 h1:KVlQlwPa+trnhTnwozJ737nU5yAeZqUwZHycnsDTiew=
+github.com/openziti/transport/v2 v2.0.153/go.mod h1:MOZ9W6hE0ssOggBKmTv0fXQMNBnI2p45HTpHDfYbl9w=
 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.1.3 h1:smHMs6BCdSF3LB3KMHvR8YcNYKESJjM9LBfHi958/2E=
@@ -614,8 +614,8 @@ github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/9
 github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
-github.com/pion/dtls/v3 v3.0.3 h1:j5ajZbQwff7Z8k3pE3S+rQ4STvKvXUdKsi/07ka+OWM=
-github.com/pion/dtls/v3 v3.0.3/go.mod h1:weOTUyIV4z0bQaVzKe8kpaP17+us3yAuiQsEAG1STMU=
+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/transport/v3 v3.0.7 h1:iRbMH05BzSNwhILHoBoAPxoB9xQgOaJk+591KC9P1o0=

zititest/go.mod

@@ -10,15 +10,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.19
-	github.com/openziti/channel/v3 v3.0.10
+	github.com/openziti/agent v1.0.20
+	github.com/openziti/channel/v3 v3.0.13
 	github.com/openziti/edge-api v0.26.35
 	github.com/openziti/fablab v0.5.72
-	github.com/openziti/foundation/v2 v2.0.50
-	github.com/openziti/identity v1.0.88
+	github.com/openziti/foundation/v2 v2.0.52
+	github.com/openziti/identity v1.0.90
 	github.com/openziti/sdk-golang v0.23.44
-	github.com/openziti/storage v0.3.2
-	github.com/openziti/transport/v2 v2.0.150
+	github.com/openziti/storage v0.3.6
+	github.com/openziti/transport/v2 v2.0.153
 	github.com/openziti/ziti v0.28.3
 	github.com/orcaman/concurrent-map/v2 v2.0.1
 	github.com/pkg/errors v0.9.1
@@ -27,7 +27,7 @@ require (
 	github.com/spf13/cobra v1.8.1
 	github.com/stretchr/testify v1.9.0
 	go.etcd.io/bbolt v1.3.11
-	golang.org/x/net v0.30.0
+	golang.org/x/net v0.31.0
 	google.golang.org/protobuf v1.35.1
 	gopkg.in/yaml.v2 v2.4.0
 )
@@ -50,7 +50,7 @@ require (
 	github.com/c-bata/go-prompt v0.2.6 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/coreos/go-iptables v0.8.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dgryski/dgoogauth v0.0.0-20190221195224-5a805980a5f3 // indirect
 	github.com/dineshappavoo/basex v0.0.0-20170425072625-481a6f6dc663 // indirect
@@ -65,7 +65,7 @@ require (
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa // indirect
 	github.com/gaissmai/extnetip v1.1.0 // indirect
-	github.com/go-acme/lego/v4 v4.19.2 // indirect
+	github.com/go-acme/lego/v4 v4.20.2 // indirect
 	github.com/go-jose/go-jose/v4 v4.0.4 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
@@ -80,7 +80,7 @@ require (
 	github.com/go-openapi/strfmt v0.23.0 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/go-openapi/validate v0.24.0 // indirect
-	github.com/go-resty/resty/v2 v2.15.3 // indirect
+	github.com/go-resty/resty/v2 v2.16.0 // indirect
 	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/gomarkdown/markdown v0.0.0-20230922112808-5421fefb8386 // indirect
@@ -142,8 +142,8 @@ require (
 	github.com/openziti/cobra-to-md v1.0.1 // indirect
 	github.com/openziti/dilithium v0.3.5 // indirect
 	github.com/openziti/jwks v1.0.6 // indirect
-	github.com/openziti/metrics v1.2.59 // indirect
-	github.com/openziti/runzmd v1.0.53 // indirect
+	github.com/openziti/metrics v1.2.61 // indirect
+	github.com/openziti/runzmd v1.0.55 // 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
@@ -190,15 +190,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.28.0 // indirect
+	golang.org/x/crypto v0.29.0 // indirect
 	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
 	golang.org/x/image v0.18.0 // indirect
 	golang.org/x/mod v0.21.0 // indirect
-	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.26.0 // indirect
-	golang.org/x/term v0.25.0 // indirect
-	golang.org/x/text v0.19.0 // indirect
+	golang.org/x/oauth2 v0.24.0 // indirect
+	golang.org/x/sync v0.9.0 // indirect
+	golang.org/x/sys v0.27.0 // indirect
+	golang.org/x/term v0.26.0 // indirect
+	golang.org/x/text v0.20.0 // indirect
 	golang.org/x/tools v0.26.0 // indirect
 	gopkg.in/AlecAivazis/survey.v1 v1.8.8 // indirect
 	gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect