Prepare release 2.3.2 (#702)

Author: kevinwcyu

.github/workflows/publish.yaml

@@ -41,6 +41,7 @@ jobs:
       scopes: ${{ github.event.inputs.environment == 'cloud (recommended)' && 'grafana_cloud' || github.event.inputs.environment == 'on-prem (for emergencies fix to On Prem customers)' && 'universal' }}
       go-version: '1.24'
       golangci-lint-version: '2.1.6'
+      run-playwright-with-skip-grafana-dev-image: true
       playwright-secrets: |
         ACCESS_KEY=e2e:accessKey
         SECRET_KEY=e2e:secretKey

.github/workflows/push.yaml

@@ -18,6 +18,7 @@ jobs:
     with:
       plugin-version-suffix: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || '' }}
       golangci-lint-version: '2.1.6'
+      run-playwright-with-skip-grafana-dev-image: true
       playwright-secrets: |
         ACCESS_KEY=e2e:accessKey
         SECRET_KEY=e2e:secretKey

CHANGELOG.md

@@ -1,5 +1,106 @@
 # Changelog
 
+## 2.3.2
+
+- Bump github.com/grafana/grafana-plugin-sdk-go from 0.282.0 to 0.283.0 in [#706](https://github.com/grafana/redshift-datasource/pull/706)
+- Bump the aws-sdk-go-v2 group with 3 updates in [#705](https://github.com/grafana/redshift-datasource/pull/705)
+- Bump github.com/grafana/grafana-plugin-sdk-go from 0.281.0 to 0.282.0 in [#701](https://github.com/grafana/redshift-datasource/pull/701)
+- Bump the aws-sdk-go-v2 group with 4 updates in [#700](https://github.com/grafana/redshift-datasource/pull/700)
+- Bump the aws-sdk-go-v2 group with 5 updates in [#698](https://github.com/grafana/redshift-datasource/pull/698)
+- Bump the aws-sdk-go-v2 group with 5 updates in [#697](https://github.com/grafana/redshift-datasource/pull/697)
+- Publish to every environment on Cloud and Add On-Prem promotion in [#694](https://github.com/grafana/redshift-datasource/pull/694)
+- Bump @typescript-eslint/parser from 8.44.1 to 8.46.1 in [#693](https://github.com/grafana/redshift-datasource/pull/693)
+- Bump the npm-patch-dev-dependencies group with 3 updates in [#691](https://github.com/grafana/redshift-datasource/pull/691)
+- Bump the aws-sdk-go-v2 group with 5 updates in [#690](https://github.com/grafana/redshift-datasource/pull/690)
+- Bump actions/setup-node from 4 to 6 in [#668](https://github.com/grafana/redshift-datasource/pull/668)
+- Bump actions/checkout from 4 to 5 in [#571](https://github.com/grafana/redshift-datasource/pull/571)
+- Bump @eslint/js from 9.36.0 to 9.37.0 in [#689](https://github.com/grafana/redshift-datasource/pull/689)
+- Bump the aws-sdk-go-v2 group with 2 updates in [#688](https://github.com/grafana/redshift-datasource/pull/688)
+- Bump eslint from 9.36.0 to 9.37.0 in [#687](https://github.com/grafana/redshift-datasource/pull/687)
+- Bump @types/node from 22.18.11 to 22.18.12 in the npm-patch-dev-dependencies group in [#686](https://github.com/grafana/redshift-datasource/pull/686)
+- Bump @grafana/aws-sdk from 0.7.2 to 0.8.2 in [#684](https://github.com/grafana/redshift-datasource/pull/684)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshiftserverless from 1.31.9 to 1.31.10 in the aws-sdk-go-v2 group in [#683](https://github.com/grafana/redshift-datasource/pull/683)
+- Bump the npm-patch-dev-dependencies group with 3 updates in [#682](https://github.com/grafana/redshift-datasource/pull/682)
+- Bump github.com/grafana/grafana-aws-sdk from 1.3.0 to 1.3.1 in [#681](https://github.com/grafana/redshift-datasource/pull/681)
+- Bump the aws-sdk-go-v2 group with 5 updates in [#680](https://github.com/grafana/redshift-datasource/pull/680)
+- Bump the grafana-dependencies group with 4 updates in [#679](https://github.com/grafana/redshift-datasource/pull/679)
+- Bump golang.org/x/net from 0.45.0 to 0.46.0 in [#678](https://github.com/grafana/redshift-datasource/pull/678)
+- Bump @grafana/plugin-e2e from 2.1.14 to 2.2.3 in [#671](https://github.com/grafana/redshift-datasource/pull/671)
+- Bump golang.org/x/net from 0.44.0 to 0.45.0 in [#669](https://github.com/grafana/redshift-datasource/pull/669)
+- Bump github.com/grafana/grafana-plugin-sdk-go from 0.280.0 to 0.281.0 in [#670](https://github.com/grafana/redshift-datasource/pull/670)
+- Bump @types/node from 22.18.9 to 22.18.10 in the npm-patch-dev-dependencies group in [#666](https://github.com/grafana/redshift-datasource/pull/666)
+- Bump @types/node from 22.18.8 to 22.18.9 in the npm-patch-dev-dependencies group in [#665](https://github.com/grafana/redshift-datasource/pull/665)
+- Bump @testing-library/jest-dom from 6.9.0 to 6.9.1 in the npm-patch-dev-dependencies group in [#664](https://github.com/grafana/redshift-datasource/pull/664)
+- Bump @testing-library/jest-dom from 6.6.4 to 6.9.0 in [#662](https://github.com/grafana/redshift-datasource/pull/662)
+- Bump jest from 30.1.3 to 30.2.0 in [#660](https://github.com/grafana/redshift-datasource/pull/660)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshift from 1.58.4 to 1.59.0 in the aws-sdk-go-v2 group in [#659](https://github.com/grafana/redshift-datasource/pull/659)
+- Bump typescript from 5.9.2 to 5.9.3 in the npm-patch-dev-dependencies group in [#658](https://github.com/grafana/redshift-datasource/pull/658)
+- Bump typescript from 5.8.3 to 5.9.2 in [#656](https://github.com/grafana/redshift-datasource/pull/656)
+- Update gitignore for yarn files in [#655](https://github.com/grafana/redshift-datasource/pull/655)
+- Bump the npm-patch-dev-dependencies group with 2 updates in [#654](https://github.com/grafana/redshift-datasource/pull/654)
+- Bump the npm-patch-dev-dependencies group with 4 updates in [#652](https://github.com/grafana/redshift-datasource/pull/652)
+- Upgrade yarn to v4.10.3 in [#647](https://github.com/grafana/redshift-datasource/pull/647)
+- Chore: Move docs to docs/sources to enable publishing to website in [#648](https://github.com/grafana/redshift-datasource/pull/648)
+- Bump github.com/grafana/grafana-aws-sdk from 1.2.0 to 1.3.0 in [#651](https://github.com/grafana/redshift-datasource/pull/651)
+- Bump the aws-sdk-go-v2 group with 4 updates in [#650](https://github.com/grafana/redshift-datasource/pull/650)
+- Bump github.com/grafana/grafana-plugin-sdk-go from 0.279.0 to 0.280.0 in [#649](https://github.com/grafana/redshift-datasource/pull/649)
+- CD: Publish Github release directly, skipping draft step in [#646](https://github.com/grafana/redshift-datasource/pull/646)
+- Bump the aws-sdk-go-v2 group with 5 updates in [#645](https://github.com/grafana/redshift-datasource/pull/645)
+- Bump @grafana/plugin-e2e from 2.1.13 to 2.1.14 in the npm-patch-dev-dependencies group in [#643](https://github.com/grafana/redshift-datasource/pull/643)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshiftserverless from 1.31.5 to 1.31.6 in the aws-sdk-go-v2 group in [#642](https://github.com/grafana/redshift-datasource/pull/642)
+- Bump @typescript-eslint/parser from 8.38.0 to 8.43.0 in [#641](https://github.com/grafana/redshift-datasource/pull/641)
+- Update workflows and templates in [#623](https://github.com/grafana/redshift-datasource/pull/623)
+- Bump @types/node from 22.18.5 to 22.18.6 in the npm-patch-dev-dependencies group in [#640](https://github.com/grafana/redshift-datasource/pull/640)
+- Bump @types/node from 22.18.4 to 22.18.5 in the npm-patch-dev-dependencies group in [#639](https://github.com/grafana/redshift-datasource/pull/639)
+- Bump the npm-patch-dev-dependencies group with 8 updates in [#638](https://github.com/grafana/redshift-datasource/pull/638)
+- Update dependabot groups in [#622](https://github.com/grafana/redshift-datasource/pull/622)
+- Bump golang.org/x/net from 0.43.0 to 0.44.0 in [#637](https://github.com/grafana/redshift-datasource/pull/637)
+- Bump eslint from 9.34.0 to 9.35.0 in [#633](https://github.com/grafana/redshift-datasource/pull/633)
+- Bump @types/node from 22.17.2 to 22.18.1 in [#632](https://github.com/grafana/redshift-datasource/pull/632)
+- Bump jest from 30.0.5 to 30.1.3 in [#631](https://github.com/grafana/redshift-datasource/pull/631)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshiftserverless from 1.31.4 to 1.31.5 in [#630](https://github.com/grafana/redshift-datasource/pull/630)
+- Bump github.com/aws/aws-sdk-go-v2/service/secretsmanager from 1.39.3 to 1.39.4 in [#629](https://github.com/grafana/redshift-datasource/pull/629)
+- Bump dotenv from 17.2.1 to 17.2.2 in [#628](https://github.com/grafana/redshift-datasource/pull/628)
+- Bump jest-environment-jsdom from 30.0.5 to 30.1.2 in [#627](https://github.com/grafana/redshift-datasource/pull/627)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshiftserverless from 1.31.3 to 1.31.4 in [#626](https://github.com/grafana/redshift-datasource/pull/626)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshiftdata from 1.37.3 to 1.37.4 in [#625](https://github.com/grafana/redshift-datasource/pull/625)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshift from 1.58.2 to 1.58.3 in [#624](https://github.com/grafana/redshift-datasource/pull/624)
+- Bump eslint from 9.32.0 to 9.34.0 in [#604](https://github.com/grafana/redshift-datasource/pull/604)
+- Bump sass from 1.89.2 to 1.92.0 in [#621](https://github.com/grafana/redshift-datasource/pull/621)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshiftserverless from 1.31.2 to 1.31.3 in [#620](https://github.com/grafana/redshift-datasource/pull/620)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshift from 1.58.1 to 1.58.2 in [#619](https://github.com/grafana/redshift-datasource/pull/619)
+- Bump github.com/aws/aws-sdk-go-v2/service/secretsmanager from 1.39.2 to 1.39.3 in [#618](https://github.com/grafana/redshift-datasource/pull/618)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshiftdata from 1.37.2 to 1.37.3 in [#617](https://github.com/grafana/redshift-datasource/pull/617)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshift from 1.58.0 to 1.58.1 in [#616](https://github.com/grafana/redshift-datasource/pull/616)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshiftserverless from 1.31.1 to 1.31.2 in [#615](https://github.com/grafana/redshift-datasource/pull/615)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshift from 1.57.2 to 1.58.0 in [#614](https://github.com/grafana/redshift-datasource/pull/614)
+- Bump github.com/aws/aws-sdk-go-v2/service/secretsmanager from 1.39.1 to 1.39.2 in [#613](https://github.com/grafana/redshift-datasource/pull/613)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshiftdata from 1.37.0 to 1.37.2 in [#605](https://github.com/grafana/redshift-datasource/pull/605)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshiftserverless from 1.30.2 to 1.31.1 in [#610](https://github.com/grafana/redshift-datasource/pull/610)
+- Bump github.com/aws/aws-sdk-go-v2/service/secretsmanager from 1.38.2 to 1.39.1 in [#609](https://github.com/grafana/redshift-datasource/pull/609)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshiftdata from 1.36.2 to 1.37.0 in [#603](https://github.com/grafana/redshift-datasource/pull/603)
+- Bump github.com/grafana/grafana-aws-sdk from 1.1.1 to 1.2.0 in [#600](https://github.com/grafana/redshift-datasource/pull/600)
+- Bump github.com/aws/aws-sdk-go-v2 from 1.38.1 to 1.38.3 in [#602](https://github.com/grafana/redshift-datasource/pull/602)
+- Bump github.com/stretchr/testify from 1.11.0 to 1.11.1 in [#599](https://github.com/grafana/redshift-datasource/pull/599)
+- Bump @grafana/plugin-ui from 0.10.9 to 0.10.10 in [#595](https://github.com/grafana/redshift-datasource/pull/595)
+- Bump lefthook from 1.12.2 to 1.12.3 in [#596](https://github.com/grafana/redshift-datasource/pull/596)
+- Bump @eslint/js from 9.32.0 to 9.33.0 in [#594](https://github.com/grafana/redshift-datasource/pull/594)
+- Bump github.com/grafana/grafana-plugin-sdk-go from 0.278.0 to 0.279.0 in [#592](https://github.com/grafana/redshift-datasource/pull/592)
+- Bump github.com/stretchr/testify from 1.10.0 to 1.11.0 in [#593](https://github.com/grafana/redshift-datasource/pull/593)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshiftserverless from 1.30.0 to 1.30.2 in [#591](https://github.com/grafana/redshift-datasource/pull/591)
+- Bump @types/node from 22.17.0 to 22.17.2 in [#578](https://github.com/grafana/redshift-datasource/pull/578)
+- Bump webpack from 5.100.2 to 5.101.2 in [#590](https://github.com/grafana/redshift-datasource/pull/590)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshift from 1.57.0 to 1.57.2 in [#589](https://github.com/grafana/redshift-datasource/pull/589)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshiftdata from 1.36.1 to 1.36.2 in [#588](https://github.com/grafana/redshift-datasource/pull/588)
+- Bump github.com/aws/aws-sdk-go-v2/service/secretsmanager from 1.38.0 to 1.38.2 in [#587](https://github.com/grafana/redshift-datasource/pull/587)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshiftserverless from 1.29.0 to 1.30.0 in [#582](https://github.com/grafana/redshift-datasource/pull/582)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshiftdata from 1.36.0 to 1.36.1 in [#584](https://github.com/grafana/redshift-datasource/pull/584)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshift from 1.55.1 to 1.57.0 in [#580](https://github.com/grafana/redshift-datasource/pull/580)
+- Bump github.com/aws/aws-sdk-go-v2/service/secretsmanager from 1.37.0 to 1.38.0 in [#581](https://github.com/grafana/redshift-datasource/pull/581)
+- Bump golang.org/x/net from 0.42.0 to 0.43.0 in [#577](https://github.com/grafana/redshift-datasource/pull/577)
+- Bump github.com/aws/aws-sdk-go-v2/service/redshiftdata from 1.34.1 to 1.36.0 in [#579](https://github.com/grafana/redshift-datasource/pull/579)
+- Bump github.com/aws/aws-sdk-go-v2/service/secretsmanager from 1.36.1 to 1.37.0 in [#575](https://github.com/grafana/redshift-datasource/pull/575)
+
 ## 2.3.1
 
 - Bump @eslint/js from 9.31.0 to 9.32.0 by @dependabot[bot] in https://github.com/grafana/redshift-datasource/pull/553

package.json

@@ -1,6 +1,6 @@
 {
   "name": "grafana-redshift-datasource",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "Use Amazon Redshift in Grafana",
   "scripts": {
     "build": "webpack -c ./.config/webpack/webpack.config.ts --env production",
@@ -22,11 +22,11 @@
   "dependencies": {
     "@emotion/css": "11.13.5",
     "@grafana/async-query-data": "0.4.2",
-    "@grafana/data": "^12.2.1",
+    "@grafana/data": "12.3.0",
     "@grafana/plugin-ui": "^0.10.10",
-    "@grafana/runtime": "^12.2.1",
-    "@grafana/schema": "^12.2.1",
-    "@grafana/ui": "^12.2.1",
+    "@grafana/runtime": "12.3.0",
+    "@grafana/schema": "12.3.0",
+    "@grafana/ui": "12.3.0",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-router-dom": "^6.22.0",
@@ -44,7 +44,7 @@
     "@grafana/tsconfig": "^2.0.1",
     "@playwright/test": "1.54.2",
     "@stylistic/eslint-plugin-ts": "^4.4.1",
-    "@swc/core": "^1.13.21",
+    "@swc/core": "^1.14.0",
     "@swc/helpers": "^0.5.17",
     "@swc/jest": "^0.2.39",
     "@testing-library/jest-dom": "6.9.1",

tests/annotationQueryEditor.spec.ts

@@ -9,6 +9,6 @@ test('should successfully create an annotation', async ({ annotationEditPage, gr
   await page.keyboard.insertText('SELECT * FROM public.events');
   await expect(annotationEditPage.runQuery()).toBeOK();
   if (gte(grafanaVersion, '11.0.0')) {
-    await expect(annotationEditPage).toHaveAlert('success', { hasText: '8 events (from 4 fields)' });
+    await expect(annotationEditPage).toHaveAlert('success', { hasText: '8 events (from 4 fields)', timeout: 15_000 });
   }
 });

tests/queryEditor.spec.ts

@@ -1,6 +1,7 @@
 import { test, expect } from '@grafana/plugin-e2e';
 
-test('should return data when a valid query is successfully run', async ({ page, panelEditPage, selectors }) => {
+test('should provide autosuggestions', async ({ page, panelEditPage, selectors }) => {
+  test.slow();
   await panelEditPage.datasource.set('AWS Redshift E2E');
   await panelEditPage.timeRange.set({ from: '2008-01-01 19:00:00', to: '2008-01-02 19:00:00' });
   await panelEditPage.setVisualization('Table');
@@ -18,27 +19,34 @@ test('should return data when a valid query is successfully run', async ({ page,
   await page.keyboard.press('Enter');
   await expect(editor.getByLabel('FROM')).toBeVisible();
   await page.keyboard.press('Enter');
-  await expect(editor.getByLabel('catalog_history')).toBeVisible();
+  await expect(editor.getByLabel('catalog_history')).toBeVisible({ timeout: 15_000 });
   await page.keyboard.press('p');
   await page.keyboard.press('u');
-  await expect(editor.getByLabel('public')).toBeVisible();
+  await expect(editor.getByLabel('public')).toBeVisible({ timeout: 15_000 });
   await page.keyboard.press('Enter');
-  await expect(editor.getByLabel('average_temperature')).toBeVisible();
+  await expect(editor.getByLabel('average_temperature')).toBeVisible({ timeout: 15_000 });
   await page.keyboard.press('Enter');
   await expect(editor.getByLabel('GROUP BY')).toBeVisible();
   await page.keyboard.press('Enter');
-  await expect(editor.getByLabel('berlin')).toBeVisible();
+  await expect(editor.getByLabel('berlin')).toBeVisible({ timeout: 15_000 });
   await page.keyboard.press('Enter');
   await expect(editor).toContainText('SELECT * FROM public.average_temperature GROUP BY berlin');
+});
 
-  // Clear the query and perform a query that uses the `$__timeFilter` macro
+test('should return data when a valid query is successfully run', async ({ page, panelEditPage, selectors }) => {
+  await panelEditPage.datasource.set('AWS Redshift E2E');
+  await panelEditPage.timeRange.set({ from: '2008-01-01 19:00:00', to: '2008-01-02 19:00:00' });
+  await panelEditPage.setVisualization('Table');
+
+  await page.waitForFunction(() => window.monaco);
+  const editor = panelEditPage.getByGrafanaSelector(selectors.components.CodeEditor.container);
   await editor.click();
   await page.keyboard.press('ControlOrMeta+A');
   await page.keyboard.insertText(
     `select saletime as time, commission as commission from sales where $__timeFilter(time)`
   );
   await expect(panelEditPage.refreshPanel()).toBeOK();
-  await expect(panelEditPage.panel.fieldNames).toHaveText(['time', 'commission']);
+  await expect(panelEditPage.panel.fieldNames).toHaveText(['time', 'commission'], { timeout: 15_000 });
   await expect(panelEditPage.panel.data).toContainText([
     /\d{4}(-\d{2}){2} \d{2}(:\d{2}){2}/ /* matches this pattern '2008-01-01 19:12:50' */,
     /^\d*(\.\d+)?$/ /* matches integers and decimals */,

tests/variableQueryEditor.spec.ts

@@ -9,17 +9,8 @@ test('should successfully create a variable', async ({ variableEditPage, page, s
   const queryDataRequest = variableEditPage.waitForQueryDataRequest();
   await variableEditPage.runQuery();
   await queryDataRequest;
-  await expect(variableEditPage).toDisplayPreviews([
-    'Classical',
-    'Jazz',
-    'MLB',
-    'MLS',
-    'Musicals',
-    'NBA',
-    'NFL',
-    'NHL',
-    'Opera',
-    'Plays',
-    'Pop',
-  ]);
+  await expect(variableEditPage).toDisplayPreviews(
+    ['Classical', 'Jazz', 'MLB', 'MLS', 'Musicals', 'NBA', 'NFL', 'NHL', 'Opera', 'Plays', 'Pop'],
+    { timeout: 15_000 }
+  );
 });