merge

Author: slorello89

.github/workflows/ci.yml

@@ -1,7 +1,7 @@
 name: CI
 
 on: [push, pull_request]
- 
+
 jobs:
  build:
  runs-on: ubuntu-latest
@@ -57,7 +57,7 @@ jobs:
  if: steps.check-for-backend.outputs.has-backend == 'true'
  uses: actions/setup-go@v2
  with:
- go-version: "1.16"
+ go-version: "1.19"
 
  - name: Test backend
  if: steps.check-for-backend.outputs.has-backend == 'true'

data/dump.rdb

@@ -2,8 +2,7 @@ version: '3.4'
 
 services:
  redis:
- container_name: redismod
- image: redislabs/redismod:latest
+ image: redis/redis-stack-server:latest
  ports:
  - '6379:6379'
 

docker-compose.yml

@@ -2,8 +2,7 @@ version: '3.4'
 
 services:
  redis:
- container_name: redismod
- image: redislabs/redismod:latest
+ image: redis/redis-stack-server
  ports:
  - '6379:6379'
  volumes:

docker-compose/dev.yml

@@ -2,8 +2,7 @@ version: '3.4'
 
 services:
  redis:
- container_name: redismod
- image: redislabs/redismod:latest
+ image: redis/redis-stack-server
  ports:
  - '6379:6379'
  volumes:

docker-compose/master.yml

@@ -2,9 +2,8 @@ version: '3.4'
 
 services:
  redis:
- container_name: redis-test
- image: redislabs/redismod:latest
+ image: redis/redis-stack-server
  ports:
- - '63790:6379'
+ - '6379:6379'
  volumes:
  - '../data:/data/:rw'

docker-compose/test.yml

@@ -4,33 +4,10 @@ go 1.14
 
 require (
 bitbucket.org/creachadair/shell v0.0.6
-github.com/apache/arrow/go/arrow v0.0.0-20211104181228-706a1d1e1879 // indirect
-github.com/cespare/xxhash/v2 v2.1.2 // indirect
-github.com/fatih/color v1.13.0 // indirect
-github.com/grafana/grafana-plugin-sdk-go v0.114.0
-github.com/hashicorp/go-hclog v1.0.0 // indirect
-github.com/hashicorp/go-plugin v1.4.3 // indirect
-github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
+github.com/grafana/grafana-plugin-sdk-go v0.164.0
 github.com/jhump/protoreflect v1.10.1 // indirect
-github.com/json-iterator/go v1.1.12 // indirect
-github.com/klauspost/compress v1.13.6 // indirect
-github.com/kr/text v0.2.0 // indirect
-github.com/magefile/mage v1.11.0
-github.com/mattn/go-colorable v0.1.11 // indirect
+github.com/magefile/mage v1.14.0
 github.com/mattn/go-runewidth v0.0.13 // indirect
 github.com/mediocregopher/radix/v3 v3.8.1
-github.com/mitchellh/go-testing-interface v1.14.1 // indirect
-github.com/oklog/run v1.1.0 // indirect
-github.com/pierrec/lz4/v4 v4.1.10 // indirect
-github.com/prometheus/common v0.32.1 // indirect
-github.com/prometheus/procfs v0.7.3 // indirect
-github.com/stretchr/objx v0.3.0 // indirect
-github.com/stretchr/testify v1.7.0
-golang.org/x/net v0.0.0-20211104170005-ce137452f963 // indirect
-golang.org/x/sys v0.0.0-20211103235746-7861aae1554b // indirect
-golang.org/x/text v0.3.7 // indirect
-google.golang.org/genproto v0.0.0-20211102202547-e9cf271f7f2c // indirect
-google.golang.org/grpc v1.42.0 // indirect
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+github.com/stretchr/testify v1.8.2
 )

go.mod

@@ -9,8 +9,11 @@
  "@types/enzyme": "^3.10.11",
  "@types/enzyme-adapter-react-16": "^1.0.6",
  "@types/lodash": "4.14.178",
+ "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
  "enzyme": "^3.11.0",
- "enzyme-adapter-react-16": "^1.15.5"
+ "enzyme-adapter-react-16": "^1.15.5",
+ "@types/react-dom": "18.0.11",
+ "sinon": "^15.1.0"
  },
  "engines": {
  "node": ">=14"

go.sum

@@ -52,7 +52,7 @@ func (ds *redisDatasource) QueryData(ctx context.Context, req *backend.QueryData
 log.DefaultLogger.Debug("QueryData", "request", req)
 
 // Get Instance
-client, err := ds.getInstance(req.PluginContext)
+client, err := ds.getInstance(ctx, req.PluginContext)
 if err != nil {
 return nil, err
 }
@@ -137,7 +137,7 @@ func (ds *redisDatasource) CheckHealth(ctx context.Context, req *backend.CheckHe
 message := "Data Source health is yet to become known."
 
 // Get Instance
-client, err := ds.getInstance(req.PluginContext)
+client, err := ds.getInstance(ctx, req.PluginContext)
 
 if err != nil {
 status = backend.HealthStatusError
@@ -165,8 +165,8 @@ func (ds *redisDatasource) CheckHealth(ctx context.Context, req *backend.CheckHe
 /**
  * Return Instance
  */
-func (ds *redisDatasource) getInstance(ctx backend.PluginContext) (redisClient, error) {
-s, err := ds.im.Get(ctx)
+func (ds *redisDatasource) getInstance(ctx context.Context, pluginContext backend.PluginContext) (redisClient, error) {
+s, err := ds.im.Get(ctx, pluginContext)
 
 if err != nil {
 return nil, err