Update sqlds to v5 (#359)

Author: njvrzm

.github/workflows/dependabot-reviewer.yml

@@ -7,5 +7,5 @@ jobs:
   call-workflow-passing-data:
     uses: grafana/security-github-actions/.github/workflows/dependabot-automerge.yaml@main
     with:
-      packages-minor-autoupdate: '["github.com/aws/aws-sdk-go","github.com/aws/aws-sdk-go-v2","github.com/aws/aws-sdk-go-v2/config","github.com/aws/aws-sdk-go-v2/credentials","github.com/aws/aws-sdk-go-v2/feature/ec2/imds","github.com/aws/aws-sdk-go-v2/service/sts","github.com/aws/smithy-go","github.com/google/go-cmp","github.com/grafana/grafana-plugin-sdk-go","github.com/grafana/sqlds/v4","github.com/jpillora/backoff","github.com/magefile/mage","github.com/stretchr/testify"]'
+      packages-minor-autoupdate: '["github.com/aws/aws-sdk-go","github.com/aws/aws-sdk-go-v2","github.com/aws/aws-sdk-go-v2/config","github.com/aws/aws-sdk-go-v2/credentials","github.com/aws/aws-sdk-go-v2/feature/ec2/imds","github.com/aws/aws-sdk-go-v2/service/sts","github.com/aws/smithy-go","github.com/google/go-cmp","github.com/grafana/grafana-plugin-sdk-go","github.com/grafana/sqlds/v5","github.com/jpillora/backoff","github.com/magefile/mage","github.com/stretchr/testify"]'
       repository-merge-method: "squash"

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.3.2
+- Update sqlds to v5 [#359](https://github.com/grafana/grafana-aws-sdk/pull/359)
+- Add AWS/NetworkManager namespace metrics and dimensions [#358](https://github.com/grafana/grafana-aws-sdk/pull/358)
+- fix bedrock metrics with split namespaces [#356](https://github.com/grafana/grafana-aws-sdk/pull/356)
+- Add missing ap-southeast-6 opt in region [#355](https://github.com/grafana/grafana-aws-sdk/pull/355)
+- Dependabot updates:
+  - Bump the aws-sdk-go-v2 group with 5 updates [#354](https://github.com/grafana/grafana-aws-sdk/pull/354)
+
 ## 1.3.1
 
 - Update bedrock support with new metrics and dimensions in [#350](https://github.com/grafana/grafana-aws-sdk/pull/350)

go.mod

@@ -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

go.sum

@@ -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=

pkg/awsds/asyncDatasource.go

@@ -13,7 +13,7 @@ import (
 	"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"
@@ -282,5 +282,5 @@ func (ds *AsyncAWSDatasource) handleAsyncQuery(ctx context.Context, req backend.
 
 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})
+	return query.Run(ctx, &q.Query, nil, sql.NamedArg{Name: "queryID", Value: q.QueryID})
 }

pkg/awsds/asyncDatasource_test.go

@@ -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"
 )

pkg/awsds/types.go

@@ -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"
 )

pkg/sql/api/api.go

@@ -7,7 +7,7 @@ import (
 
 	"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"
 )
 

pkg/sql/datasource/datasource.go

@@ -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

pkg/sql/datasource/datasource_test.go

@@ -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 {