Update to latest dskit commit (#9546)

Specifically, this pulls in grafana/dskit#591 which adds new `.Set()` and `.Add()` methods to cache interfaces and clients. Signed-off-by: Nick Pillitteri <[email protected]>
grafana · Oct 7, 2024 · 432a4f4 · 432a4f4
1 parent e78254e
commit 432a4f4
Show file tree

Hide file tree

Showing 13 changed files with 251 additions and 31 deletions.
diff --git a/go.mod b/go.mod
@@ -22,7 +22,7 @@ require (
 	github.com/golang/snappy v0.0.4
 	github.com/google/gopacket v1.1.19
 	github.com/gorilla/mux v1.8.1
-	github.com/grafana/dskit v0.0.0-20241004235212-a711ce30731c
+	github.com/grafana/dskit v0.0.0-20241007163720-de20fd2fe818
 	github.com/grafana/e2e v0.1.2-0.20240118170847-db90b84177fc
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/json-iterator/go v1.1.12

diff --git a/go.sum b/go.sum
@@ -1256,8 +1256,8 @@ github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc h1:PXZQA2WCxe85T
 github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc/go.mod h1:AHHlOEv1+GGQ3ktHMlhuTUwo3zljV3QJbC0+8o2kn+4=
 github.com/grafana/alerting v0.0.0-20240926144415-27f4e81b4b6b h1:UO4mv94pG1kzKCgBKh20TXdACBCAK2vYjV3Q2MlcpEQ=
 github.com/grafana/alerting v0.0.0-20240926144415-27f4e81b4b6b/go.mod h1:GMLi6d09Xqo96fCVUjNk//rcjP5NKEdjOzfWIffD5r4=
-github.com/grafana/dskit v0.0.0-20241004235212-a711ce30731c h1:AMJ+saiPDxwi2sDj/tPP+RMH6xF63Lrib0l2aLJuuDI=
-github.com/grafana/dskit v0.0.0-20241004235212-a711ce30731c/go.mod h1:SPLNCARd4xdjCkue0O6hvuoveuS1dGJjDnfxYe405YQ=
+github.com/grafana/dskit v0.0.0-20241007163720-de20fd2fe818 h1:VPMurXtl+ONN13d9ge1TGTJDBsJNr9Vb1pNQHpQ/aro=
+github.com/grafana/dskit v0.0.0-20241007163720-de20fd2fe818/go.mod h1:SPLNCARd4xdjCkue0O6hvuoveuS1dGJjDnfxYe405YQ=
 github.com/grafana/e2e v0.1.2-0.20240118170847-db90b84177fc h1:BW+LjKJDz0So5LI8UZfW5neWeKpSkWqhmGjQFzcFfLM=
 github.com/grafana/e2e v0.1.2-0.20240118170847-db90b84177fc/go.mod h1:JVmqPBe8A/pZWwRoJW5ZjyALeY5OXMzPl7LrVXOdZAI=
 github.com/grafana/franz-go v0.0.0-20241003081803-835b5cb1ddcf h1:g6lIXOJlt9LMbx9fUJ+2RoO155txAtpPmM/8mdFq/B0=

diff --git a/pkg/storegateway/indexcache/remote_test.go b/pkg/storegateway/indexcache/remote_test.go
@@ -944,6 +944,20 @@ func (c *mockedRemoteCacheClient) SetMultiAsync(data map[string][]byte, _ time.D
 	}
 }
 
+func (c *mockedRemoteCacheClient) Set(_ context.Context, key string, value []byte, _ time.Duration) error {
+	c.cache[key] = value
+	return nil
+}
+
+func (c *mockedRemoteCacheClient) Add(_ context.Context, key string, value []byte, _ time.Duration) error {
+	if _, ok := c.cache[key]; ok {
+		return cache.ErrNotStored
+	}
+
+	c.cache[key] = value
+	return nil
+}
+
 func (c *mockedRemoteCacheClient) Delete(_ context.Context, key string) error {
 	delete(c.cache, key)
 

diff --git a/vendor/github.com/grafana/dskit/cache/cache.go b/vendor/github.com/grafana/dskit/cache/cache.go
diff --git a/vendor/github.com/grafana/dskit/cache/client.go b/vendor/github.com/grafana/dskit/cache/client.go
diff --git a/vendor/github.com/grafana/dskit/cache/compression.go b/vendor/github.com/grafana/dskit/cache/compression.go
diff --git a/vendor/github.com/grafana/dskit/cache/lru.go b/vendor/github.com/grafana/dskit/cache/lru.go
diff --git a/vendor/github.com/grafana/dskit/cache/memcached_client.go b/vendor/github.com/grafana/dskit/cache/memcached_client.go
diff --git a/vendor/github.com/grafana/dskit/cache/mock.go b/vendor/github.com/grafana/dskit/cache/mock.go