Chore/dependencies update for CVE (#134)

* dependencies update

* struct re-arranges

Author: shelldandy

completion_test.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -109,7 +108,7 @@ func TestCompletable(t *testing.T) {
 			sqlds := &SQLDatasource{}
 			sqlds.Completable = test.fakeImpl
 
-			b := ioutil.NopCloser(bytes.NewReader([]byte(test.reqBody)))
+			b := io.NopCloser(bytes.NewReader([]byte(test.reqBody)))
 			sqlds.getResources(test.method)(w, &http.Request{Body: b})
 			resp := w.Result()
 			body, _ := io.ReadAll(resp.Body)
@@ -151,7 +150,7 @@ func Test_registerRoutes(t *testing.T) {
 		}
 		mux.ServeHTTP(resp, req)
 
-		respByte, err := ioutil.ReadAll(resp.Body)
+		respByte, err := io.ReadAll(resp.Body)
 		if err != nil {
 			t.Fatalf("unexpected error %v", err)
 		}
@@ -176,10 +175,10 @@ func Test_registerRoutes(t *testing.T) {
 
 func TestParseOptions(t *testing.T) {
 	tests := []struct {
+		err         error
+		result      Options
 		description string
 		input       json.RawMessage
-		result      Options
-		err         error
 	}{
 		{
 			description: "parses input",

datasource.go

@@ -45,14 +45,11 @@ type dbConnection struct {
 
 type SQLDatasource struct {
 	Completable
-	connector *Connector
 	backend.CallResourceHandler
-	CustomRoutes map[string]func(http.ResponseWriter, *http.Request)
-	// Enabling multiple connections may cause that concurrent connection limits
-	// are hit. The datasource enabling this should make sure connections are cached
-	// if necessary.
-	EnableMultipleConnections bool
+	connector                 *Connector
+	CustomRoutes              map[string]func(http.ResponseWriter, *http.Request)
 	metrics                   Metrics
+	EnableMultipleConnections bool
 }
 
 // NewDatasource creates a new `SQLDatasource`.

datasource_connect_test.go

@@ -35,12 +35,12 @@ func Test_getDBConnectionFromQuery(t *testing.T) {
 	db3 := &sql.DB{}
 	d := &fakeDriver{openDBfn: func(msg json.RawMessage) (*sql.DB, error) { return db3, nil }}
 	tests := []struct {
+		existingDB  *sql.DB
+		expectedDB  *sql.DB
 		desc        string
 		dsUID       string
 		args        string
-		existingDB  *sql.DB
 		expectedKey string
-		expectedDB  *sql.DB
 	}{
 		{
 			desc:        "it should return the default db with no args",

driver.go

@@ -13,11 +13,11 @@ import (
 )
 
 type DriverSettings struct {
-	Timeout        time.Duration
 	FillMode       *data.FillMissing
+	RetryOn        []string
+	Timeout        time.Duration
 	Retries        int
 	Pause          int
-	RetryOn        []string
 	ForwardHeaders bool
 	Errors         bool
 }

go.mod

@@ -5,12 +5,12 @@ go 1.23
 toolchain go1.23.0
 
 require (
-	github.com/go-sql-driver/mysql v1.4.0
+	github.com/go-sql-driver/mysql v1.8.1
 	github.com/google/go-cmp v0.6.0
-	github.com/grafana/dataplane/sdata v0.0.7
-	github.com/grafana/grafana-plugin-sdk-go v0.245.0
-	github.com/mithrandie/csvq-driver v1.6.8
-	github.com/prometheus/client_golang v1.20.0
+	github.com/grafana/dataplane/sdata v0.0.9
+	github.com/grafana/grafana-plugin-sdk-go v0.251.0
+	github.com/mithrandie/csvq-driver v1.7.0
+	github.com/prometheus/client_golang v1.20.4
 	github.com/stretchr/testify v1.9.0
 )
 
@@ -45,23 +45,24 @@ require (
 	github.com/zeebo/xxh3 v1.0.2 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0 // indirect
-	go.opentelemetry.io/contrib/propagators/jaeger v1.28.0 // indirect
-	go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0 // indirect
-	go.opentelemetry.io/otel v1.28.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
+	go.opentelemetry.io/contrib/propagators/jaeger v1.29.0 // indirect
+	go.opentelemetry.io/contrib/samplers/jaegerremote v0.23.0 // indirect
+	go.opentelemetry.io/otel v1.29.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
-	go.opentelemetry.io/otel/metric v1.28.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.28.0 // indirect
-	go.opentelemetry.io/otel/trace v1.28.0 // indirect
+	go.opentelemetry.io/otel/metric v1.29.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.29.0 // indirect
+	go.opentelemetry.io/otel/trace v1.29.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
 	golang.org/x/mod v0.17.0 // indirect
 	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
 	gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
 )
 
 require (
+	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/apache/arrow/go/v15 v15.0.2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -84,11 +85,11 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
-	github.com/mitchellh/go-homedir v1.0.0 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
-	github.com/mithrandie/csvq v1.17.10 // indirect
+	github.com/mithrandie/csvq v1.18.1 // indirect
 	github.com/mithrandie/go-file/v2 v2.1.0 // indirect
-	github.com/mithrandie/go-text v1.5.4 // indirect
+	github.com/mithrandie/go-text v1.6.0 // indirect
 	github.com/mithrandie/ternary v1.1.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -100,16 +101,15 @@ require (
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.55.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
-	golang.org/x/crypto v0.26.0 // indirect
+	golang.org/x/crypto v0.27.0 // indirect
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
-	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
-	golang.org/x/term v0.23.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/term v0.24.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/grpc v1.65.0 // indirect
+	google.golang.org/grpc v1.66.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )