Skip to content

fix(deps): update module github.com/grafana/sqlds/v4 to v5 - autoclosed #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix(deps): update module github.com/grafana/sqlds/v4 to v5 - autoclosed #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/aws/smithy-go v1.23.1
github.com/google/go-cmp v0.7.0
github.com/grafana/grafana-plugin-sdk-go v0.281.0
github.com/grafana/sqlds/v4 v4.2.7
github.com/grafana/sqlds/v5 v5.0.3
github.com/jpillora/backoff v1.0.0
github.com/magefile/mage v1.15.0
github.com/stretchr/testify v1.11.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF
github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls=
github.com/grafana/pyroscope-go/godeltaprof v0.1.9 h1:c1Us8i6eSmkW+Ez05d3co8kasnuOY813tbMN8i/a3Og=
github.com/grafana/pyroscope-go/godeltaprof v0.1.9/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
github.com/grafana/sqlds/v4 v4.2.7 h1:sFQhsS7DBakNMdxa++yOfJ9BVvkZwFJ0B95o57K0/XA=
github.com/grafana/sqlds/v4 v4.2.7/go.mod h1:BQRjUG8rOqrBI4NAaeoWrIMuoNgfi8bdhCJ+5cgEfLU=
github.com/grafana/sqlds/v5 v5.0.3 h1:+yUMUxfa0WANQsmS9xtTFSRX1Q55Iv1B9EjlrW4VlBU=
github.com/grafana/sqlds/v5 v5.0.3/go.mod h1:GKeTTiC+GeR1X0z3f0Iee+hZnNgN62uQpj5XVMx5Uew=
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 h1:QGLs/O40yoNK9vmy4rhUGBVyMf1lISBGtXRpsu/Qu/o=
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0/go.mod h1:hM2alZsMUni80N33RBe6J0e423LB+odMj7d3EMP9l20=
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 h1:sGm2vDRFUrQJO/Veii4h4zG2vvqG6uWNkBHSTqXOZk0=
Expand Down
2 changes: 1 addition & 1 deletion pkg/awsds/asyncDatasource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana-plugin-sdk-go/data/sqlutil"
"github.com/grafana/grafana-plugin-sdk-go/experimental/errorsource"
"github.com/grafana/sqlds/v4"
"github.com/grafana/sqlds/v5"
)

const defaultKeySuffix = "default"
Expand Down Expand Up @@ -282,5 +282,5 @@

func queryAsync(ctx context.Context, conn *sql.DB, settings backend.DataSourceInstanceSettings, converters []sqlutil.Converter, fillMode *data.FillMissing, q *AsyncQuery, rowLimit int64) (data.Frames, error) {
query := sqlds.NewQuery(conn, settings, converters, fillMode, rowLimit)
return query.Run(ctx, &q.Query, sql.NamedArg{Name: "queryID", Value: q.QueryID})

Check failure on line 285 in pkg/awsds/asyncDatasource.go

View workflow job for this annotation

GitHub Actions / go-check 

cannot use sql.NamedArg{…} (value of struct type sql.NamedArg) as sqlds.QueryErrorMutator value in argument to query.Run: sql.NamedArg does not implement sqlds.QueryErrorMutator (missing method MutateQueryError)) (typecheck)

Check failure on line 285 in pkg/awsds/asyncDatasource.go

View workflow job for this annotation

GitHub Actions / go-check 

cannot use sql.NamedArg{…} (value of struct type sql.NamedArg) as sqlds.QueryErrorMutator value in argument to query.Run: sql.NamedArg does not implement sqlds.QueryErrorMutator (missing method MutateQueryError)) (typecheck)

Check failure on line 285 in pkg/awsds/asyncDatasource.go

View workflow job for this annotation

GitHub Actions / go-check 

cannot use sql.NamedArg{…} (value of struct type sql.NamedArg) as sqlds.QueryErrorMutator value in argument to query.Run: sql.NamedArg does not implement sqlds.QueryErrorMutator (missing method MutateQueryError) (typecheck)

Check failure on line 285 in pkg/awsds/asyncDatasource.go

View workflow job for this annotation

GitHub Actions / go-check 

cannot use sql.NamedArg{…} (value of struct type sql.NamedArg) as sqlds.QueryErrorMutator value in argument to query.Run: sql.NamedArg does not implement sqlds.QueryErrorMutator (missing method MutateQueryError)) (typecheck)
}
2 changes: 1 addition & 1 deletion pkg/awsds/asyncDatasource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/grafana/grafana-plugin-sdk-go/data/sqlutil"

"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/sqlds/v4"
"github.com/grafana/sqlds/v5"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/awsds/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"time"

"github.com/grafana/grafana-plugin-sdk-go/data/sqlutil"
"github.com/grafana/sqlds/v4"
"github.com/grafana/sqlds/v5"

"github.com/grafana/grafana-plugin-sdk-go/backend"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"errors"
"time"

"github.com/grafana/grafana-aws-sdk/pkg/awsds"

Check failure on line 8 in pkg/sql/api/api.go

View workflow job for this annotation

GitHub Actions / go-check 

could not import github.com/grafana/grafana-aws-sdk/pkg/awsds (-: # github.com/grafana/grafana-aws-sdk/pkg/awsds
"github.com/grafana/grafana-plugin-sdk-go/backend/log"
"github.com/grafana/sqlds/v4"
"github.com/grafana/sqlds/v5"
"github.com/jpillora/backoff"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/datasource/datasource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
asyncDriver "github.com/grafana/grafana-aws-sdk/pkg/sql/driver/async"
"github.com/grafana/grafana-aws-sdk/pkg/sql/models"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/sqlds/v4"
"github.com/grafana/sqlds/v5"
)

// AWSClient provides creation and caching of sessions, database connections, and API clients
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/datasource/datasource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
sqlDriver "github.com/grafana/grafana-aws-sdk/pkg/sql/driver"
"github.com/grafana/grafana-aws-sdk/pkg/sql/models"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/sqlds/v4"
"github.com/grafana/sqlds/v5"
)

type fakeLoader struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/datasource/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/sqlds/v4"
"github.com/grafana/sqlds/v5"
)

func connectionKey(id int64, args sqlds.Options) string {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/models/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package models

import (
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/sqlds/v4"
"github.com/grafana/sqlds/v5"
)

type Settings interface {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/routes/routes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/grafana/grafana-aws-sdk/pkg/sql/api"
"github.com/grafana/grafana-plugin-sdk-go/backend/log"
"github.com/grafana/sqlds/v4"
"github.com/grafana/sqlds/v5"
)

type ResourceHandler struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/routes/routes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
"github.com/grafana/sqlds/v4"
"github.com/grafana/sqlds/v5"
)

func TestWrite(t *testing.T) {
Expand Down
Loading