Skip to content

Commit 2331823

Browse files
committed
Remove depending on grafana/simplejson.
1 parent 062036d commit 2331823

File tree

10 files changed

+668
-16
lines changed

10 files changed

+668
-16
lines changed

go.mod

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module github.com/quickwit-oss/quickwit-datasource
33
go 1.19
44

55
require (
6-
github.com/grafana/grafana v6.1.6+incompatible
76
github.com/grafana/grafana-plugin-sdk-go v0.162.0
87
github.com/stretchr/testify v1.8.2
98
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc
@@ -13,7 +12,6 @@ require (
1312
github.com/BurntSushi/toml v1.2.1 // indirect
1413
github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
1514
github.com/beorn7/perks v1.0.1 // indirect
16-
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
1715
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
1816
github.com/cespare/xxhash/v2 v2.2.0 // indirect
1917
github.com/cheekybits/genny v1.0.0 // indirect

go.sum

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40/go.mod h1:Q7
4747
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
4848
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
4949
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
50-
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
51-
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
5250
github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
5351
github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4=
5452
github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
@@ -193,10 +191,6 @@ github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORR
193191
github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
194192
github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
195193
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
196-
github.com/grafana/grafana v6.1.6+incompatible h1:Eyeg3ifz220cWiu0hLoPjJJmle+nxR63ZEmSDgYDokg=
197-
github.com/grafana/grafana v6.1.6+incompatible/go.mod h1:U8QyUclJHj254BFcuw45p6sg7eeGYX44qn1ShYo5rGE=
198-
github.com/grafana/grafana-plugin-sdk-go v0.160.0 h1:jELbsqee5kRz9vD1hZeP8+984xMZDU/M6uGv0RhOR34=
199-
github.com/grafana/grafana-plugin-sdk-go v0.160.0/go.mod h1:dPhljkVno3Bg/ZYafMrR/BfYjtCRJD2hU2719Nl3QzM=
200194
github.com/grafana/grafana-plugin-sdk-go v0.162.0 h1:ij2ARWohf0IoK9yCVC1Wup4Gp6zwBq2AueVXRYsv/to=
201195
github.com/grafana/grafana-plugin-sdk-go v0.162.0/go.mod h1:dPhljkVno3Bg/ZYafMrR/BfYjtCRJD2hU2719Nl3QzM=
202196
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
@@ -239,8 +233,6 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
239233
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
240234
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
241235
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
242-
github.com/magefile/mage v1.14.0 h1:6QDX3g6z1YvJ4olPhT1wksUcSa/V0a1B+pJb73fBjyo=
243-
github.com/magefile/mage v1.14.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
244236
github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg=
245237
github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
246238
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=

pkg/quickwit/client/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/stretchr/testify/assert"
1414
"github.com/stretchr/testify/require"
1515

16-
"github.com/grafana/grafana/pkg/components/simplejson"
16+
"github.com/quickwit-oss/quickwit-datasource/pkg/quickwit/simplejson"
1717
)
1818

1919
func TestClient_ExecuteMultisearch(t *testing.T) {

pkg/quickwit/client/search_request_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/stretchr/testify/require"
99

10-
"github.com/grafana/grafana/pkg/components/simplejson"
10+
"github.com/quickwit-oss/quickwit-datasource/pkg/quickwit/simplejson"
1111
)
1212

1313
func TestSearchRequest(t *testing.T) {

pkg/quickwit/data_query.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88

99
"github.com/grafana/grafana-plugin-sdk-go/backend"
1010

11-
"github.com/grafana/grafana/pkg/components/simplejson"
1211
es "github.com/quickwit-oss/quickwit-datasource/pkg/quickwit/client"
12+
"github.com/quickwit-oss/quickwit-datasource/pkg/quickwit/simplejson"
1313
)
1414

1515
const (

pkg/quickwit/models.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package quickwit
33
import (
44
"time"
55

6-
"github.com/grafana/grafana/pkg/components/simplejson"
6+
"github.com/quickwit-oss/quickwit-datasource/pkg/quickwit/simplejson"
77
)
88

99
// Query represents the time series query model of the datasource

pkg/quickwit/parse_query.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package quickwit
33
import (
44
"github.com/grafana/grafana-plugin-sdk-go/backend"
55

6-
"github.com/grafana/grafana/pkg/components/simplejson"
6+
"github.com/quickwit-oss/quickwit-datasource/pkg/quickwit/simplejson"
77
)
88

99
func parseQuery(tsdbQuery []backend.DataQuery) ([]*Query, error) {

pkg/quickwit/response_parser.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"github.com/grafana/grafana-plugin-sdk-go/data"
1515
"golang.org/x/exp/slices"
1616

17-
"github.com/grafana/grafana/pkg/components/simplejson"
1817
es "github.com/quickwit-oss/quickwit-datasource/pkg/quickwit/client"
18+
"github.com/quickwit-oss/quickwit-datasource/pkg/quickwit/simplejson"
1919
)
2020

2121
const (

0 commit comments

Comments
 (0)