From cb62847a4eb171d1380386864f8f9689500d67c7 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Fri, 10 Jun 2022 12:21:03 +0300 Subject: [PATCH] Use platform-independant path concatenation --- pkg/datasource/dscache.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/datasource/dscache.go b/pkg/datasource/dscache.go index 9c76bc9..480be08 100644 --- a/pkg/datasource/dscache.go +++ b/pkg/datasource/dscache.go @@ -5,7 +5,8 @@ import ( "encoding/hex" "encoding/json" "fmt" - "io/ioutil" + "os" + "path/filepath" "time" "github.com/grafana/grafana-plugin-sdk-go/backend" @@ -56,16 +57,16 @@ func (c *DSCache) Delete(request string) { func (c *DSCache) Save(request string, response interface{}) error { cacheKey := c.BuildDSCacheKey(request) - filename := fmt.Sprintf("%s/%s", c.dataDir, cacheKey) + filename := filepath.Join(c.dataDir, cacheKey) cacheLogger.Debug("Saving key to file", "key", request, "path", filename) - return ioutil.WriteFile(filename, []byte(response.(string)), 0644) + return os.WriteFile(filename, []byte(response.(string)), 0644) } func (c *DSCache) Load(request string) (string, error) { cacheKey := c.BuildDSCacheKey(request) - filename := fmt.Sprintf("%s/%s", c.dataDir, cacheKey) + filename := filepath.Join(c.dataDir, cacheKey) cacheLogger.Debug("Loading key from file", "key", request, "path", filename) - value, err := ioutil.ReadFile(filename) + value, err := os.ReadFile(filename) if err != nil { return "", err }