Merge pull request #2564 from openziti/fix-last-joined-at

Handle nil lastJoinedAt in controller
openziti · Nov 23, 2024 · 9a83ca8 · 9a83ca8
2 parents 30a042d + 47d864f
commit 9a83ca8
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# Release 1.2.2
+
+## What's New
+
+* Bug fixes and continuing progress on controller HA
+
+## Component Updates and Bug Fixes
+
+* github.com/openziti/secretstream: [v0.1.25 -> v0.1.26](https://github.com/openziti/secretstream/compare/v0.1.25...v0.1.26)
+* github.com/openziti/storage: [v0.3.6 -> v0.3.8](https://github.com/openziti/storage/compare/v0.3.6...v0.3.8)
+    * [Issue #87](https://github.com/openziti/storage/issues/87) - negative URL filter returns incorrect results
+
+* github.com/openziti/ziti: [v1.2.1 -> v1.2.2](https://github.com/openziti/ziti/compare/v1.2.1...v1.2.2)
+    * [Issue #2559](https://github.com/openziti/ziti/issues/2559) - expired JWTs are allowed to enroll
+    * [Issue #2543](https://github.com/openziti/ziti/issues/2543) - Support adding adding an uninitialized node to a cluster (rather than the reverse)
+
+
 # Release 1.2.1
 
 ## What's New

diff --git a/controller/db/controller_store.go b/controller/db/controller_store.go
@@ -105,7 +105,7 @@ func (store *controllerStoreImpl) FillEntity(entity *Controller, bucket *boltz.T
 	entity.CertPem = bucket.GetStringOrError(FieldControllerCertPem)
 	entity.Fingerprint = bucket.GetStringOrError(FieldControllerFingerprint)
 	entity.IsOnline = bucket.GetBoolWithDefault(FieldControllerIsOnline, false)
-	entity.LastJoinedAt = bucket.GetTimeOrError(FieldControllerLastJoinedAt)
+	entity.LastJoinedAt = bucket.GetTimeOrDefault(FieldControllerLastJoinedAt, time.Time{})
 	entity.ApiAddresses = map[string][]ApiAddress{}
 
 	apiListBucket := bucket.GetBucket(FieldControllerApiAddresses)

diff --git a/go.mod b/go.mod
@@ -59,8 +59,8 @@ require (
 	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.6
+	github.com/openziti/secretstream v0.1.26
+	github.com/openziti/storage v0.3.8
 	github.com/openziti/transport/v2 v2.0.153
 	github.com/openziti/x509-claims v1.0.3
 	github.com/openziti/xweb/v2 v2.1.3

diff --git a/go.sum b/go.sum
@@ -591,10 +591,10 @@ github.com/openziti/runzmd v1.0.55 h1:GvccmgMCs2b2IGnp7fxygMWGgusGN8SD62VoNZedv9
 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.6 h1:ZBEZTAQXS8Blm/r/nYKIRAcGYBk2k/kerW0SV9Y4GWw=
-github.com/openziti/storage v0.3.6/go.mod h1:eiuxpwDaT0MmO3rcsM9l+wwzWbL0tsHtF5q5fadCau8=
+github.com/openziti/secretstream v0.1.26 h1:/76u2iMh6rryK4kbvcUgrQfr3Ul1q5GGoiKiyil5SZA=
+github.com/openziti/secretstream v0.1.26/go.mod h1:xFa2cSl58zHvLVjphB2D5cYcocQLoLrFQG3IVx8DF8c=
+github.com/openziti/storage v0.3.8 h1:5MWrxXPzFtpsBpWWWdYRRWNAnK0JuSg/x1IPMB+XZdw=
+github.com/openziti/storage v0.3.8/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=

diff --git a/zititest/go.mod b/zititest/go.mod
@@ -17,7 +17,7 @@ require (
 	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.6
+	github.com/openziti/storage v0.3.8
 	github.com/openziti/transport/v2 v2.0.153
 	github.com/openziti/ziti v0.28.3
 	github.com/orcaman/concurrent-map/v2 v2.0.1
@@ -144,7 +144,7 @@ require (
 	github.com/openziti/jwks v1.0.6 // 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/secretstream v0.1.26 // 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

diff --git a/zititest/go.sum b/zititest/go.sum
@@ -615,10 +615,10 @@ github.com/openziti/runzmd v1.0.55 h1:GvccmgMCs2b2IGnp7fxygMWGgusGN8SD62VoNZedv9
 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.6 h1:ZBEZTAQXS8Blm/r/nYKIRAcGYBk2k/kerW0SV9Y4GWw=
-github.com/openziti/storage v0.3.6/go.mod h1:eiuxpwDaT0MmO3rcsM9l+wwzWbL0tsHtF5q5fadCau8=
+github.com/openziti/secretstream v0.1.26 h1:/76u2iMh6rryK4kbvcUgrQfr3Ul1q5GGoiKiyil5SZA=
+github.com/openziti/secretstream v0.1.26/go.mod h1:xFa2cSl58zHvLVjphB2D5cYcocQLoLrFQG3IVx8DF8c=
+github.com/openziti/storage v0.3.8 h1:5MWrxXPzFtpsBpWWWdYRRWNAnK0JuSg/x1IPMB+XZdw=
+github.com/openziti/storage v0.3.8/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=