Skip to content
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

Jump to bottom

Update grafana/aws-sdk-go to 0.20.0 and prepare 1.12.0 #273

Merged
merged 4 commits into from
Feb 13, 2024
Merged

Update grafana/aws-sdk-go to 0.20.0 and prepare 1.12.0 #273

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3406d67
Update aws-sdk and refactor test
idastambuk Feb 9, 2024
1ac33e9
Prepare 1.11.2
idastambuk Feb 9, 2024
67c833c
Change to minor version
idastambuk Feb 9, 2024
151c0f7
Update CHANGELOG.md
idastambuk Feb 9, 2024
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Changelog


## 1.12.0

- Update grafana/aws-sdk-go to 0.20.0 in [#273](https://github.com/grafana/grafana-iot-twinmaker-app/pull/273)
- chore(twinmaker): upgrade UxSDK to add path query feature for query editor in [#272](https://github.com/grafana/grafana-iot-twinmaker-app/pull/272)
idastambuk marked this conversation as resolved.
Show resolved Hide resolved

## 1.11.1

- Query Editor: Disable delete if only one filter, fix tooltip (new form styling) in [#268](https://github.com/grafana/grafana-iot-twinmaker-app/pull/268)
Expand Down
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 @@ -8,7 +8,7 @@ require (
github.com/aws/aws-sdk-go v1.44.323
github.com/google/uuid v1.3.1
github.com/gorilla/mux v1.8.0
github.com/grafana/grafana-aws-sdk v0.19.2
github.com/grafana/grafana-aws-sdk v0.20.0
github.com/grafana/grafana-plugin-sdk-go v0.193.0
github.com/magefile/mage v1.15.0
github.com/patrickmn/go-cache v2.1.0+incompatible
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB7
github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/grafana/grafana-aws-sdk v0.19.2 h1:GCLdo3oz7gp/ZJvbgFktMP5LKdNLnhxh/nLGzuxnJPA=
github.com/grafana/grafana-aws-sdk v0.19.2/go.mod h1:IDhwY+LF6jD1zute5UvbZ5DY8aI4DQ+LjU8RjfayD20=
github.com/grafana/grafana-aws-sdk v0.20.0 h1:oIYkuLsxFYRlSGcyevU463upeZ2QN5giO+uDkU7RqvM=
github.com/grafana/grafana-aws-sdk v0.20.0/go.mod h1:ID7Yr4AtErNiTI1rIdsH7Jr5Q10+e2Zr2s2je+iH5p8=
github.com/grafana/grafana-plugin-sdk-go v0.94.0/go.mod h1:3VXz4nCv6wH5SfgB3mlW39s+c+LetqSCjFj7xxPC5+M=
github.com/grafana/grafana-plugin-sdk-go v0.193.0 h1:vRL96urrUfb+XWd4G6/317wpJBWTvoR9+Lrb+yGXZho=
github.com/grafana/grafana-plugin-sdk-go v0.193.0/go.mod h1:6Igwuc+iWyYNWXhJhsWUQpPn2ugNIo6r36vtn7GyIiE=
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "grafana-iot-twinmaker-app",
"version": "1.11.1",
"version": "1.12.0",
"description": "Grafana IoT TwinMaker App Plugin",
"scripts": {
"build": "NODE_OPTIONS='--max-old-space-size=4096' webpack -c webpack.config.ts --env production ",
Expand Down
6 changes: 3 additions & 3 deletions src/datasource/components/QueryEditor.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const getDefaultProps = (grafanaLive: boolean) => ({
});

describe('QueryEditor', () => {
function runGrafanaLiveEnabled() {
function run() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this change about?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was originally accidentally named runGrafanaLiveEnabled, this function should be named just run()

it.each([
[TwinMakerQueryType.GetAlarms, ['Filter', 'Max. Alarms', 'Interval', 'Stream'], {}],
[TwinMakerQueryType.ListEntities, ['Component Type'], { isStreaming: true }],
Expand Down Expand Up @@ -142,7 +142,7 @@ describe('QueryEditor', () => {
afterAll(() => {
cleanup();
});
runGrafanaLiveEnabled();
run();
});
describe('QueryEditor with awsDatasourcesNewFormStyling feature toggle enabled', () => {
beforeAll(() => {
Expand All @@ -151,7 +151,7 @@ describe('QueryEditor', () => {
afterAll(() => {
cleanup();
});
runGrafanaLiveEnabled();
run();
});
function runGrafanaLiveDisabled() {
it.each([
Expand Down
Loading