chore(deps): bump github.com/clambin/go-common/cache to v0.7.0

clambin · Aug 26, 2024 · 8b7a761 · 8b7a761
1 parent 4699dd3
commit 8b7a761
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.23.0
 
 require (
 	github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874
-	github.com/clambin/go-common/cache v0.6.0
+	github.com/clambin/go-common/cache v0.7.0
 	github.com/clambin/go-common/http v0.5.1
 	github.com/clambin/go-common/testutils v0.1.0
 	github.com/coreos/go-oidc/v3 v3.11.0

diff --git a/go.sum b/go.sum
@@ -8,8 +8,8 @@ github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
 github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/clambin/go-common/cache v0.6.0 h1:YJr9uEvjcsFHjyxJjXmAG/2YSNcYSseFR964IVrVyS8=
-github.com/clambin/go-common/cache v0.6.0/go.mod h1:HqYoCaIq9ckS3xiAQ5y8n3m4GmKSCku2+p/Cli614Sk=
+github.com/clambin/go-common/cache v0.7.0 h1:UFBZkDzdLI/QGOg5S+8DzDTtN0dguU+epo21JxDFFkA=
+github.com/clambin/go-common/cache v0.7.0/go.mod h1:HqYoCaIq9ckS3xiAQ5y8n3m4GmKSCku2+p/Cli614Sk=
 github.com/clambin/go-common/http v0.5.1 h1:TizxJvnpO4OvlTE6s/4YOCQmIglJ93av/pOylhHHYL8=
 github.com/clambin/go-common/http v0.5.1/go.mod h1:xf5UqbFEmU0pTvSdVu/LQDyWx6EWoDdIrLOc44NB40E=
 github.com/clambin/go-common/testutils v0.1.0 h1:/nGWaOCIhW+Ew1c2NU7GLY/YPb8dp9SV8+MTgWksAgk=

diff --git a/pkg/sessions/sessions.go b/pkg/sessions/sessions.go
@@ -80,8 +80,7 @@ func (s Sessions) Cookie(session Session, domain string) *http.Cookie {
 
 func (s Sessions) ActiveUsers() map[string]int {
 	activeUsers := make(map[string]int, s.sessions.Len())
-	for _, key := range s.sessions.Keys() {
-		activeSession, _ := s.sessions.Get(key)
+	for _, activeSession := range s.sessions.Iterate() {
 		if !activeSession.expired() {
 			activeUsers[activeSession.Email]++
 		}
@@ -90,9 +89,8 @@ func (s Sessions) ActiveUsers() map[string]int {
 }
 
 func (s Sessions) Contains(email string) bool {
-	for _, key := range s.sessions.Keys() {
-		sess, _ := s.sessions.Get(key)
-		if sess.Email == email {
+	for _, session := range s.sessions.Iterate() {
+		if session.Email == email {
 			return true
 		}
 	}