Skip to content

Add ResponseLimitMiddleware to the datasource #559

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.

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

Merged
merged 4 commits into from
Aug 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
# Changelog

## 2.3.0

- Add ResponseLimitMiddleware to the datasource in [#559](https://github.com/grafana/redshift-datasourcce/pull/559)
- Bump github.com/aws/aws-sdk-go-v2 from 1.37.1 to 1.37.2 in [#565](https://github.com/grafana/redshift-datasourcce/pull/565)
- Bump github.com/aws/aws-sdk-go-v2/service/secretsmanager from 1.36.0 to 1.36.1 in [#564](https://github.com/grafana/redshift-datasourcce/pull/564)
- Bump github.com/aws/aws-sdk-go-v2/service/redshiftserverless from 1.27.5 to 1.28.1 in [#562](https://github.com/grafana/redshift-datasourcce/pull/562)
- Bump github.com/aws/aws-sdk-go-v2/service/redshift from 1.54.7 to 1.55.1 in [#561](https://github.com/grafana/redshift-datasourcce/pull/561)
- Bump github.com/aws/aws-sdk-go-v2/service/redshiftdata from 1.33.4 to 1.34.1 in [#560](https://github.com/grafana/redshift-datasourcce/pull/560)
- Bump github.com/aws/aws-sdk-go-v2/service/secretsmanager from 1.35.8 to 1.36.0 in [#555](https://github.com/grafana/redshift-datasourcce/pull/555)
- Bump github.com/aws/aws-sdk-go-v2 from 1.36.6 to 1.37.0 in [#554](https://github.com/grafana/redshift-datasourcce/pull/554)
- Bump @typescript-eslint/eslint-plugin from 8.37.0 to 8.38.0 in [#551](https://github.com/grafana/redshift-datasourcce/pull/551)
- Bump @grafana/plugin-e2e from 2.1.7 to 2.1.8 in [#550](https://github.com/grafana/redshift-datasourcce/pull/550)
- Bump @typescript-eslint/parser from 8.37.0 to 8.38.0 in [#549](https://github.com/grafana/redshift-datasourcce/pull/549)
- Bump jest-environment-jsdom from 30.0.4 to 30.0.5 in [#548](https://github.com/grafana/redshift-datasourcce/pull/548)
- Bump @playwright/test from 1.54.1 to 1.54.2 in [#547](https://github.com/grafana/redshift-datasourcce/pull/547)
- Bump github.com/aws/aws-sdk-go-v2/service/redshift from 1.54.6 to 1.54.7 in [#546](https://github.com/grafana/redshift-datasourcce/pull/546)
- Bump eslint-plugin-prettier from 5.5.1 to 5.5.3 in [#545](https://github.com/grafana/redshift-datasourcce/pull/545)
- Bump jest from 30.0.4 to 30.0.5 in [#544](https://github.com/grafana/redshift-datasourcce/pull/544)
- Bump github.com/grafana/sqlds/v4 from 4.2.6 to 4.2.7 in [#542](https://github.com/grafana/redshift-datasourcce/pull/542)
- Bump github.com/grafana/grafana-aws-sdk from 1.0.5 to 1.1.0 in [#543](https://github.com/grafana/redshift-datasourcce/pull/543)
- Bump github.com/aws/aws-sdk-go-v2/service/redshiftserverless from 1.27.4 to 1.27.5 in [#541](https://github.com/grafana/redshift-datasourcce/pull/541)

## 2.2.0

- Set the default format to table in [#527](https://github.com/grafana/redshift-datasource/pull/527)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "grafana-redshift-datasource",
"version": "2.2.0",
"version": "2.3.0",
"description": "Use Amazon Redshift in Grafana",
"scripts": {
"build": "webpack -c ./.config/webpack/webpack.config.ts --env production",
Expand Down
4 changes: 4 additions & 0 deletions pkg/redshift/api/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ func New(ctx context.Context, settings awsModels.Settings) (api.AWSAPI, error) {
httpClientProvider := sdkhttpclient.NewProvider()
// TODO: Context needs to be added, see https://github.com/grafana/oss-plugin-partnerships/issues/648
httpClientOptions, err := redshiftSettings.Config.HTTPClientOptions(ctx)

cfg := backend.GrafanaConfigFromContext(ctx)
httpClientOptions.Middlewares = append(httpClientOptions.Middlewares, sdkhttpclient.ResponseLimitMiddleware(cfg.ResponseLimit()))

if err != nil {
backend.Logger.Error("failed to create HTTP client options", "error", err.Error())
return nil, err
Expand Down
Loading