From b2967fbb3747a32a4548eebc4a6fba580f2fa7d3 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 11 Mar 2019 10:44:16 +0100
Subject: [PATCH] avoid exposing cache client directly

---
 pkg/infra/remotecache/remotecache.go      | 20 ++++++++++++++++----
 pkg/infra/remotecache/remotecache_test.go |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkg/infra/remotecache/remotecache.go b/pkg/infra/remotecache/remotecache.go
index 761a2b3d337..1b9d67b9358 100644
--- a/pkg/infra/remotecache/remotecache.go
+++ b/pkg/infra/remotecache/remotecache.go
@@ -31,7 +31,7 @@ type CacheStorage interface {
 	// Get reads object from Cache
 	Get(key string) (interface{}, error)
 
-	// Set sets an object into the cache
+	// Set sets an object into the cache. if `expire` is set to zero it never expires.
 	Set(key string, value interface{}, expire time.Duration) error
 
 	// Delete object from cache
@@ -41,16 +41,28 @@ type CacheStorage interface {
 // RemoteCache allows Grafana to cache data outside its own process
 type RemoteCache struct {
 	log      log.Logger
-	Client   CacheStorage
+	client   CacheStorage
 	SQLStore *sqlstore.SqlStore `inject:""`
 	Cfg      *setting.Cfg       `inject:""`
 }
 
+func (ds *RemoteCache) Get(key string) (interface{}, error) {
+	return ds.client.Get(key)
+}
+
+func (ds *RemoteCache) Set(key string, value interface{}, expire time.Duration) error {
+	return ds.client.Set(key, value, expire)
+}
+
+func (ds *RemoteCache) Delete(key string) error {
+	return ds.client.Delete(key)
+}
+
 // Init initializes the service
 func (ds *RemoteCache) Init() error {
 	ds.log = log.New("cache.remote")
 
-	ds.Client = createClient(ds.Cfg.RemoteCacheOptions, ds.SQLStore)
+	ds.client = createClient(ds.Cfg.RemoteCacheOptions, ds.SQLStore)
 
 	return nil
 }
@@ -58,7 +70,7 @@ func (ds *RemoteCache) Init() error {
 // Run start the backend processes for cache clients
 func (ds *RemoteCache) Run(ctx context.Context) error {
 	//create new interface if more clients need GC jobs
-	backgroundjob, ok := ds.Client.(registry.BackgroundService)
+	backgroundjob, ok := ds.client.(registry.BackgroundService)
 	if ok {
 		return backgroundjob.Run(ctx)
 	}
diff --git a/pkg/infra/remotecache/remotecache_test.go b/pkg/infra/remotecache/remotecache_test.go
index 8887686c3a1..ac22607ee70 100644
--- a/pkg/infra/remotecache/remotecache_test.go
+++ b/pkg/infra/remotecache/remotecache_test.go
@@ -34,7 +34,7 @@ func createTestClient(t *testing.T, opts *setting.RemoteCacheOptions, sqlstore *
 		t.Fatalf("failed to init client for test. error: %v", err)
 	}
 
-	return dc.Client
+	return dc.client
 }
 
 func TestCachedBasedOnConfig(t *testing.T) {