Merge branch 'main' into kevinwcyu/yarn-v4

Author: kevinwcyu

.github/workflows/publish-npm.yml

@@ -13,7 +13,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-       # id-token: write required for get-vault-secrets
+      # id-token: write required for get-vault-secrets and trusted publishing
       id-token: write
     outputs:
       new_version: ${{ steps.version_check.outputs.version }}
@@ -46,6 +46,9 @@ jobs:
           node-version-file: '.nvmrc'
           registry-url: 'https://registry.npmjs.org'
 
+      - name: Install npm version ^11.5.1 # npm trusted publishing requires version ^11.5.1
+        run: npm install -g npm@^11.5.1
+
       - name: Install dependencies
         if: steps.version_check.outputs.changed == 'true'
         run: yarn
@@ -54,18 +57,9 @@ jobs:
         if: steps.version_check.outputs.changed == 'true'
         run: yarn build
 
-      - name: Get secrets from vault
-        id: get-secrets
-        uses: grafana/shared-workflows/actions/get-vault-secrets@main
-        with:
-          repo_secrets: |
-            NPM_TOKEN=npm-release:npm_token
-
       - name: Publish package to NPM
         if: steps.version_check.outputs.changed == 'true'
         run: npm publish --access public --scope grafana
-        env:
-          NODE_AUTH_TOKEN: ${{ env.NPM_TOKEN }}
 
       - name: Setup .npmrc file for GitHub Packages
         if: steps.version_check.outputs.changed == 'true'
@@ -96,7 +90,7 @@ jobs:
       - name: Create Release Notes
         uses: actions/[email protected]
         env:
-          TAG_NAME: "v${{ needs.npm-publish.outputs.new_version }}"
+          TAG_NAME: 'v${{ needs.npm-publish.outputs.new_version }}'
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

CHANGELOG.md

@@ -2,6 +2,139 @@
 
 All notable changes to this project will be documented in this file.
 
+## v0.7.2
+- Feat: add amazonprometheus to grafana assume role support list [#299](https://github.com/grafana/grafana-aws-sdk-react/pull/299)
+- Add support for auto-merging dependabot updates [#151](https://github.com/grafana/grafana-aws-sdk-react/pull/151)
+- Remove pr_commands [#154](https://github.com/grafana/grafana-aws-sdk-react/pull/154)
+- Chore: Migrate to actions for CI [#153](https://github.com/grafana/grafana-aws-sdk-react/pull/153)
+- Update workflows and templates [#275](https://github.com/grafana/grafana-aws-sdk-react/pull/275)
+- Tweak dependabot schedule [#205](https://github.com/grafana/grafana-aws-sdk-react/pull/205)
+- Add missing regions [#149](https://github.com/grafana/grafana-aws-sdk-react/pull/149)
+- Update dependabot groups [#274](https://github.com/grafana/grafana-aws-sdk-react/pull/274)
+- Fix dependabot ignore location for npm dependencies [#207](https://github.com/grafana/grafana-aws-sdk-react/pull/207)
+- Dependency updates:
+- Bump rollup from 4.50.2 to 4.51.0 [#301](https://github.com/grafana/grafana-aws-sdk-react/pull/301)
+- Bump the npm-patch-dev-dependencies group with 2 updates [#296](https://github.com/grafana/grafana-aws-sdk-react/pull/296)
+- Bump @typescript-eslint/eslint-plugin from 8.43.0 to 8.44.0 [#295](https://github.com/grafana/grafana-aws-sdk-react/pull/295)
+- Bump @typescript-eslint/parser in the npm-patch-dev-dependencies group [#294](https://github.com/grafana/grafana-aws-sdk-react/pull/294)
+- Bump @typescript-eslint/parser from 8.43.0 to 8.44.0 [#293](https://github.com/grafana/grafana-aws-sdk-react/pull/293)
+- Bump lefthook in the npm-patch-dev-dependencies group [#292](https://github.com/grafana/grafana-aws-sdk-react/pull/292)
+- Bump lefthook in the npm-patch-dev-dependencies group [#291](https://github.com/grafana/grafana-aws-sdk-react/pull/291)
+- Bump lefthook from 1.12.4 to 1.13.0 [#289](https://github.com/grafana/grafana-aws-sdk-react/pull/289)
+- Bump the npm-patch-dev-dependencies group with 2 updates [#288](https://github.com/grafana/grafana-aws-sdk-react/pull/288)
+- Bump @types/node in the npm-patch-dev-dependencies group [#287](https://github.com/grafana/grafana-aws-sdk-react/pull/287)
+- Bump the grafana-dependencies group with 3 updates [#286](https://github.com/grafana/grafana-aws-sdk-react/pull/286)
+- Bump @typescript-eslint/eslint-plugin from 8.42.0 to 8.43.0 [#285](https://github.com/grafana/grafana-aws-sdk-react/pull/285)
+- Bump @typescript-eslint/parser from 8.42.0 to 8.43.0 [#284](https://github.com/grafana/grafana-aws-sdk-react/pull/284)
+- Bump @types/node from 22.18.3 to 22.18.4 [#283](https://github.com/grafana/grafana-aws-sdk-react/pull/283)
+- Bump rollup from 4.50.1 to 4.50.2 [#281](https://github.com/grafana/grafana-aws-sdk-react/pull/281)
+- Bump @types/node from 22.18.1 to 22.18.3 [#279](https://github.com/grafana/grafana-aws-sdk-react/pull/279)
+- Bump eslint from 9.34.0 to 9.35.0 [#278](https://github.com/grafana/grafana-aws-sdk-react/pull/278)
+- Bump actions/checkout from 4 to 5 [#223](https://github.com/grafana/grafana-aws-sdk-react/pull/223)
+- Bump actions/stale from 9 to 10 [#262](https://github.com/grafana/grafana-aws-sdk-react/pull/262)
+- Bump actions/setup-node from 4 to 5 [#263](https://github.com/grafana/grafana-aws-sdk-react/pull/263)
+- Bump @typescript-eslint/eslint-plugin from 8.41.0 to 8.42.0 [#276](https://github.com/grafana/grafana-aws-sdk-react/pull/276)
+- Bump rollup from 4.50.0 to 4.50.1 [#273](https://github.com/grafana/grafana-aws-sdk-react/pull/273)
+- Bump @typescript-eslint/parser from 8.41.0 to 8.42.0 [#272](https://github.com/grafana/grafana-aws-sdk-react/pull/272)
+- Bump lefthook from 1.12.3 to 1.12.4 [#271](https://github.com/grafana/grafana-aws-sdk-react/pull/271)
+- Bump rollup from 4.49.0 to 4.50.0 [#270](https://github.com/grafana/grafana-aws-sdk-react/pull/270)
+- Bump jest from 30.1.1 to 30.1.3 [#269](https://github.com/grafana/grafana-aws-sdk-react/pull/269)
+- Bump @types/node from 22.18.0 to 22.18.1 [#268](https://github.com/grafana/grafana-aws-sdk-react/pull/268)
+- Bump rollup-plugin-node-externals from 8.1.0 to 8.1.1 [#265](https://github.com/grafana/grafana-aws-sdk-react/pull/265)
+- Bump rollup from 4.48.1 to 4.49.0 [#264](https://github.com/grafana/grafana-aws-sdk-react/pull/264)
+- Bump jest-environment-jsdom from 30.1.0 to 30.1.2 [#261](https://github.com/grafana/grafana-aws-sdk-react/pull/261)
+- Bump jest from 30.0.5 to 30.1.1 [#260](https://github.com/grafana/grafana-aws-sdk-react/pull/260)
+- Bump @typescript-eslint/eslint-plugin from 8.40.0 to 8.41.0 [#258](https://github.com/grafana/grafana-aws-sdk-react/pull/258)
+- Bump jest-environment-jsdom from 30.0.5 to 30.1.0 [#257](https://github.com/grafana/grafana-aws-sdk-react/pull/257)
+- Bump @typescript-eslint/parser from 8.40.0 to 8.41.0 [#256](https://github.com/grafana/grafana-aws-sdk-react/pull/256)
+- Bump @types/node from 22.17.2 to 22.18.0 [#255](https://github.com/grafana/grafana-aws-sdk-react/pull/255)
+- Bump rollup from 4.47.1 to 4.48.1 [#254](https://github.com/grafana/grafana-aws-sdk-react/pull/254)
+- Bump cspell from 9.2.0 to 9.2.1 [#253](https://github.com/grafana/grafana-aws-sdk-react/pull/253)
+- Bump eslint from 9.33.0 to 9.34.0 [#252](https://github.com/grafana/grafana-aws-sdk-react/pull/252)
+- Bump rollup-plugin-node-externals from 8.0.1 to 8.1.0 [#250](https://github.com/grafana/grafana-aws-sdk-react/pull/250)
+- Bump rollup from 4.46.4 to 4.47.1 [#249](https://github.com/grafana/grafana-aws-sdk-react/pull/249)
+- Bump @testing-library/jest-dom from 6.7.0 to 6.8.0 [#248](https://github.com/grafana/grafana-aws-sdk-react/pull/248)
+- Bump @typescript-eslint/eslint-plugin from 8.39.1 to 8.40.0 [#247](https://github.com/grafana/grafana-aws-sdk-react/pull/247)
+- Bump @typescript-eslint/parser from 8.39.1 to 8.40.0 [#245](https://github.com/grafana/grafana-aws-sdk-react/pull/245)
+- Bump @swc/core from 1.13.4 to 1.13.5 [#244](https://github.com/grafana/grafana-aws-sdk-react/pull/244)
+- Bump @grafana/plugin-ui from 0.10.9 to 0.10.10 [#242](https://github.com/grafana/grafana-aws-sdk-react/pull/242)
+- Bump @swc/core from 1.13.3 to 1.13.4 [#241](https://github.com/grafana/grafana-aws-sdk-react/pull/241)
+- Bump @testing-library/jest-dom from 6.6.4 to 6.7.0 [#240](https://github.com/grafana/grafana-aws-sdk-react/pull/240)
+- Bump EndBug/version-check from 2.1.5 to 2.1.7 [#238](https://github.com/grafana/grafana-aws-sdk-react/pull/238)
+- Bump rollup from 4.46.3 to 4.46.4 [#237](https://github.com/grafana/grafana-aws-sdk-react/pull/237)
+- Bump rollup from 4.46.2 to 4.46.3 [#234](https://github.com/grafana/grafana-aws-sdk-react/pull/234)
+- Bump eslint from 9.32.0 to 9.33.0 [#233](https://github.com/grafana/grafana-aws-sdk-react/pull/233)
+- Bump rollup-plugin-dts from 6.2.1 to 6.2.3 [#232](https://github.com/grafana/grafana-aws-sdk-react/pull/232)
+- Bump @types/node from 22.17.1 to 22.17.2 [#231](https://github.com/grafana/grafana-aws-sdk-react/pull/231)
+- Bump @typescript-eslint/eslint-plugin from 8.39.0 to 8.39.1 [#230](https://github.com/grafana/grafana-aws-sdk-react/pull/230)
+- Bump @typescript-eslint/eslint-plugin from 8.38.0 to 8.39.0 [#228](https://github.com/grafana/grafana-aws-sdk-react/pull/228)
+- Bump @grafana/eslint-config from 8.1.0 to 8.2.0 [#229](https://github.com/grafana/grafana-aws-sdk-react/pull/229)
+- Bump @typescript-eslint/parser from 8.39.0 to 8.39.1 [#227](https://github.com/grafana/grafana-aws-sdk-react/pull/227)
+- Bump esbuild from 0.25.8 to 0.25.9 [#226](https://github.com/grafana/grafana-aws-sdk-react/pull/226)
+- Bump lefthook from 1.12.2 to 1.12.3 [#225](https://github.com/grafana/grafana-aws-sdk-react/pull/225)
+- Bump @typescript-eslint/parser from 8.38.0 to 8.39.0 [#224](https://github.com/grafana/grafana-aws-sdk-react/pull/224)
+- Bump @types/node from 22.17.0 to 22.17.1 [#222](https://github.com/grafana/grafana-aws-sdk-react/pull/222)
+- Bump @types/node from 22.16.4 to 22.17.0 [#221](https://github.com/grafana/grafana-aws-sdk-react/pull/221)
+- Bump rollup from 4.46.1 to 4.46.2 [#220](https://github.com/grafana/grafana-aws-sdk-react/pull/220)
+- Bump eslint from 9.31.0 to 9.32.0 [#218](https://github.com/grafana/grafana-aws-sdk-react/pull/218)
+- Bump rollup from 4.45.3 to 4.46.1 [#217](https://github.com/grafana/grafana-aws-sdk-react/pull/217)
+- Bump @typescript-eslint/eslint-plugin from 8.37.0 to 8.38.0 [#216](https://github.com/grafana/grafana-aws-sdk-react/pull/216)
+- Bump @grafana/plugin-ui from 0.10.8 to 0.10.9 [#215](https://github.com/grafana/grafana-aws-sdk-react/pull/215)
+- Bump @typescript-eslint/parser from 8.37.0 to 8.38.0 [#214](https://github.com/grafana/grafana-aws-sdk-react/pull/214)
+- Bump @swc/core from 1.13.2 to 1.13.3 [#213](https://github.com/grafana/grafana-aws-sdk-react/pull/213)
+- Bump rollup from 4.45.1 to 4.45.3 [#212](https://github.com/grafana/grafana-aws-sdk-react/pull/212)
+- Bump @grafana/plugin-ui from 0.10.7 to 0.10.8 [#211](https://github.com/grafana/grafana-aws-sdk-react/pull/211)
+- Bump jest from 30.0.4 to 30.0.5 [#210](https://github.com/grafana/grafana-aws-sdk-react/pull/210)
+- Bump cspell from 9.1.5 to 9.2.0 [#199](https://github.com/grafana/grafana-aws-sdk-react/pull/199)
+- Bump eslint-config-prettier from 10.1.5 to 10.1.8 [#200](https://github.com/grafana/grafana-aws-sdk-react/pull/200)
+- Bump jest-environment-jsdom from 30.0.4 to 30.0.5 [#209](https://github.com/grafana/grafana-aws-sdk-react/pull/209)
+- Bump @testing-library/jest-dom from 6.6.3 to 6.6.4 [#208](https://github.com/grafana/grafana-aws-sdk-react/pull/208)
+- Bump @swc/core from 1.13.0 to 1.13.2 [#204](https://github.com/grafana/grafana-aws-sdk-react/pull/204)
+- Bump the grafana-dependencies group with 3 updates [#203](https://github.com/grafana/grafana-aws-sdk-react/pull/203)
+- Bump esbuild from 0.25.6 to 0.25.8 [#198](https://github.com/grafana/grafana-aws-sdk-react/pull/198)
+- Bump @swc/core from 1.12.14 to 1.13.0 [#197](https://github.com/grafana/grafana-aws-sdk-react/pull/197)
+- Bump jest and @types/jest [#195](https://github.com/grafana/grafana-aws-sdk-react/pull/195)
+- Bump @typescript-eslint/eslint-plugin from 8.35.0 to 8.37.0 [#196](https://github.com/grafana/grafana-aws-sdk-react/pull/196)
+- Bump @types/node from 22.15.35 to 22.16.4 [#194](https://github.com/grafana/grafana-aws-sdk-react/pull/194)
+- Bump eslint-plugin-jsdoc from 51.4.0 to 51.4.1 [#193](https://github.com/grafana/grafana-aws-sdk-react/pull/193)
+- Bump eslint-plugin-jsdoc from 50.6.17 to 51.4.0 [#187](https://github.com/grafana/grafana-aws-sdk-react/pull/187)
+- Bump eslint from 9.30.1 to 9.31.0 [#190](https://github.com/grafana/grafana-aws-sdk-react/pull/190)
+- Bump cspell from 9.1.3 to 9.1.5 [#192](https://github.com/grafana/grafana-aws-sdk-react/pull/192)
+- Bump @swc/core from 1.12.11 to 1.12.14 [#191](https://github.com/grafana/grafana-aws-sdk-react/pull/191)
+- Bump rollup from 4.44.2 to 4.45.1 [#189](https://github.com/grafana/grafana-aws-sdk-react/pull/189)
+- Bump @swc/jest from 0.2.38 to 0.2.39 [#188](https://github.com/grafana/grafana-aws-sdk-react/pull/188)
+- Bump lefthook from 1.11.16 to 1.12.2 [#186](https://github.com/grafana/grafana-aws-sdk-react/pull/186)
+- Bump @typescript-eslint/parser from 8.35.1 to 8.37.0 [#185](https://github.com/grafana/grafana-aws-sdk-react/pull/185)
+- Bump @eslint/js from 9.30.1 to 9.31.0 [#184](https://github.com/grafana/grafana-aws-sdk-react/pull/184)
+- Bump eslint from 9.30.0 to 9.30.1 [#182](https://github.com/grafana/grafana-aws-sdk-react/pull/182)
+- Bump @swc/core from 1.12.7 to 1.12.11 [#183](https://github.com/grafana/grafana-aws-sdk-react/pull/183)
+- Bump jest-environment-jsdom from 30.0.0 to 30.0.4 [#181](https://github.com/grafana/grafana-aws-sdk-react/pull/181)
+- Bump esbuild from 0.25.5 to 0.25.6 [#180](https://github.com/grafana/grafana-aws-sdk-react/pull/180)
+- Bump @eslint/js from 9.30.0 to 9.30.1 [#179](https://github.com/grafana/grafana-aws-sdk-react/pull/179)
+- Bump eslint from 9.27.0 to 9.30.0 [#177](https://github.com/grafana/grafana-aws-sdk-react/pull/177)
+- Bump @eslint/js from 9.27.0 to 9.30.0 [#178](https://github.com/grafana/grafana-aws-sdk-react/pull/178)
+- Bump jest from 29.7.0 to 30.0.0 [#175](https://github.com/grafana/grafana-aws-sdk-react/pull/175)
+- Bump cspell from 9.1.2 to 9.1.3 [#176](https://github.com/grafana/grafana-aws-sdk-react/pull/176)
+- Bump @swc/core from 1.11.24 to 1.12.7 [#174](https://github.com/grafana/grafana-aws-sdk-react/pull/174)
+- Bump rollup from 4.44.1 to 4.44.2 [#173](https://github.com/grafana/grafana-aws-sdk-react/pull/173)
+- Bump @grafana/plugin-ui from 0.10.6 to 0.10.7 [#172](https://github.com/grafana/grafana-aws-sdk-react/pull/172)
+- Bump @typescript-eslint/eslint-plugin from 8.32.1 to 8.35.0 [#169](https://github.com/grafana/grafana-aws-sdk-react/pull/169)
+- Bump @types/node from 22.15.19 to 22.15.35 [#170](https://github.com/grafana/grafana-aws-sdk-react/pull/170)
+- Bump @typescript-eslint/parser from 8.35.0 to 8.35.1 [#168](https://github.com/grafana/grafana-aws-sdk-react/pull/168)
+- Bump jest-environment-jsdom from 29.7.0 to 30.0.0 [#163](https://github.com/grafana/grafana-aws-sdk-react/pull/163)
+- Bump @typescript-eslint/parser from 8.32.1 to 8.35.0 [#165](https://github.com/grafana/grafana-aws-sdk-react/pull/165)
+- Bump @grafana/async-query-data from 0.4.1 to 0.4.2 [#167](https://github.com/grafana/grafana-aws-sdk-react/pull/167)
+- Bump lefthook from 1.11.13 to 1.11.16 [#166](https://github.com/grafana/grafana-aws-sdk-react/pull/166)
+- Bump rollup from 4.41.0 to 4.44.1 [#164](https://github.com/grafana/grafana-aws-sdk-react/pull/164)
+- Bump @stylistic/eslint-plugin-ts from 4.2.0 to 4.4.1 [#161](https://github.com/grafana/grafana-aws-sdk-react/pull/161)
+- Bump cspell from 9.0.1 to 9.1.2 [#162](https://github.com/grafana/grafana-aws-sdk-react/pull/162)
+- Bump rollup-plugin-node-externals from 8.0.0 to 8.0.1 [#160](https://github.com/grafana/grafana-aws-sdk-react/pull/160)
+- Bump @grafana/eslint-config from 8.0.0 to 8.1.0 [#159](https://github.com/grafana/grafana-aws-sdk-react/pull/159)
+- Bump esbuild from 0.25.4 to 0.25.5 [#158](https://github.com/grafana/grafana-aws-sdk-react/pull/158)
+- Bump prettier from 3.5.3 to 3.6.2 [#157](https://github.com/grafana/grafana-aws-sdk-react/pull/157)
+- Bump @types/lodash from 4.17.16 to 4.17.20 [#156](https://github.com/grafana/grafana-aws-sdk-react/pull/156)
+- Bump the grafana-dependencies group with 3 updates [#155](https://github.com/grafana/grafana-aws-sdk-react/pull/155)
+
 ## v0.7.1
 
 - Chore: Use vault to get npm token in [#145](https://github.com/grafana/grafana-aws-sdk-react/pull/145)

cspell.config.json

@@ -18,6 +18,7 @@
     "hmac",
     "grabpl",
     "spellcheck",
+    "amazonprometheus",
     "zizmor",
     "npmPreapprovedPackages"
   ]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/aws-sdk",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Common AWS features for grafana",
   "main": "dist/index.js",
   "module": "dist/esm/index.js",
@@ -23,7 +23,10 @@
   "files": [
     "dist"
   ],
-  "repository": "github:grafana/grafana-aws-sdk-react",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/grafana/grafana-aws-sdk-react.git"
+  },
   "author": "Grafana Labs <[email protected]> (https://grafana.com)",
   "license": "Apache-2.0",
   "dependencies": {
@@ -48,7 +51,7 @@
     "@testing-library/user-event": "^14.5.2",
     "@types/jest": "30.0.0",
     "@types/lodash": "4.17.20",
-    "@types/node": "22.18.6",
+    "@types/node": "22.18.7",
     "@types/react": "18.3.12",
     "@types/react-dom": "18.3.1",
     "@typescript-eslint/eslint-plugin": "^8.12.2",
@@ -71,7 +74,7 @@
     "react-dom": "18.3.1",
     "react-select-event": "^5.5.1",
     "rimraf": "^6.0.1",
-    "rollup": "4.50.2",
+    "rollup": "4.52.3",
     "rollup-plugin-dts": "^6.1.1",
     "rollup-plugin-esbuild": "^6.1.1",
     "rollup-plugin-node-externals": "^8.0.0",

src/components/ConnectionConfig.tsx

@@ -14,7 +14,11 @@ import { assumeRoleInstructionsStyle } from './ConnectionConfig.styles';
 import { ConfigSection, ConfigSubSection } from '@grafana/plugin-ui';
 
 export const DEFAULT_LABEL_WIDTH = 28;
-const DS_TYPES_THAT_SUPPORT_TEMP_CREDS = ['cloudwatch', 'grafana-athena-datasource'];
+const DS_TYPES_THAT_SUPPORT_TEMP_CREDS = [
+  'cloudwatch',
+  'grafana-athena-datasource',
+  'grafana-amazonprometheus-datasource',
+];
 const toOption = (value: string) => ({ value, label: value });
 const isAwsAuthType = (value: any): value is AwsAuthType => {
   return typeof value === 'string' && awsAuthProviderOptions.some((opt) => opt.value === value);