feat(cache): GetKeys() -> Keys()

clambin · Aug 24, 2024 · c8f6523 · c8f6523
1 parent b613b00
commit c8f6523
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/cache/cache.go b/cache/cache.go
@@ -107,14 +107,20 @@ func (c *Cache[K, V]) GetAndRemove(key K) (V, bool) {
 }
 
 // GetKeys returns all keys in the cache.
+//
+// Deprecated: use Keys() instead
 func (c *Cache[K, V]) GetKeys() (keys []K) {
+	return c.Keys()
+}
+
+func (c *Cache[K, V]) Keys() []K {
 	c.lock.RLock()
 	defer c.lock.RUnlock()
-
+	keys := make([]K, 0, len(c.values))
 	for key := range c.values {
 		keys = append(keys, key)
 	}
-	return
+	return keys
 }
 
 // Size returns the current size of the cache. Expired items are counted

diff --git a/cache/go.mod b/cache/go.mod
@@ -1,3 +1,5 @@
 module github.com/clambin/go-common/cache
 
-go 1.21
+go 1.22
+
+toolchain go1.22.6
diff --git a/http/go.mod b/http/go.mod
@@ -5,7 +5,7 @@ go 1.21
 require (
 	github.com/clambin/go-common/cache v0.5.0
 	github.com/clambin/go-common/testutils v0.1.0
-	github.com/prometheus/client_golang v1.20.1
+	github.com/prometheus/client_golang v1.20.2
 	golang.org/x/sync v0.8.0
 )
 

diff --git a/http/go.sum b/http/go.sum
@@ -16,6 +16,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/prometheus/client_golang v1.20.1 h1:IMJXHOD6eARkQpxo8KkhgEVFlBNm+nkrFUyGlIu7Na8=
 github.com/prometheus/client_golang v1.20.1/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
+github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg=
+github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
 github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=