From dcd20862121f3f19c3c74040f7e9e656394670cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=A4ggmark?= Date: Thu, 4 Dec 2025 06:06:41 +0100 Subject: [PATCH] chore: reduce cloudwatch barrel files (#114568) --- eslint-suppressions.json | 8 -------- .../dashboard/state/DashboardMigrator.ts | 3 ++- .../cloudwatch/annotationSupport.test.ts | 3 ++- .../cloudwatch/annotationSupport.ts | 3 ++- .../AnnotationQueryEditor.test.tsx | 3 ++- .../AnnotationQueryEditor.tsx | 3 ++- .../components/CheatSheet/LogsCheatSheet.tsx | 3 ++- .../components/CheatSheet/sampleQueries.ts | 2 +- .../LogsQueryEditor/CloudWatchLink.test.tsx | 2 +- .../LogsQueryEditor/CloudWatchLink.tsx | 2 +- .../LogsQueryEditor/LogsQueryEditor.tsx | 3 ++- .../LogsQueryEditor/LogsQueryField.tsx | 3 ++- .../code-editors/LogsQLCodeEditor.tsx | 2 +- .../code-editors/PPLQueryEditor.tsx | 2 +- .../code-editors/SQLCodeEditor.tsx | 2 +- .../MetricsQueryEditor.test.tsx | 3 ++- .../MetricsQueryEditor/MetricsQueryEditor.tsx | 10 ++-------- .../SQLBuilderEditor.test.tsx | 10 ++++++++-- .../SQLBuilderEditor/SQLBuilderEditor.tsx | 2 +- .../SQLBuilderSelectRow.test.tsx | 10 ++++++++-- .../SQLBuilderEditor/SQLBuilderSelectRow.tsx | 2 +- .../SQLBuilderEditor/SQLFilter.tsx | 12 +++++------ .../SQLBuilderEditor/SQLGroupBy.test.tsx | 2 +- .../SQLBuilderEditor/SQLGroupBy.tsx | 6 +++--- .../SQLBuilderEditor/SQLOrderByGroup.tsx | 2 +- .../SQLBuilderEditor/utils.ts | 8 +++++--- .../QueryEditor/QueryEditor.test.tsx | 3 ++- .../components/QueryEditor/QueryHeader.tsx | 3 ++- .../shared/Dimensions/Dimensions.test.tsx | 2 +- .../shared/Dimensions/Dimensions.tsx | 2 +- .../shared/Dimensions/FilterItem.test.tsx | 2 +- .../shared/Dimensions/FilterItem.tsx | 2 +- .../shared/LogGroups/LogGroupsField.tsx | 2 +- .../shared/LogGroups/LogGroupsSelector.tsx | 2 +- .../LogGroups/SelectedLogGroups.test.tsx | 2 +- .../shared/LogGroups/SelectedLogGroups.tsx | 2 +- .../MetricStatEditor.test.tsx | 2 +- .../MetricStatEditor/MetricStatEditor.tsx | 2 +- .../datasource/cloudwatch/datasource.test.ts | 18 ++++++++--------- .../datasource/cloudwatch/datasource.ts | 15 +++++++------- .../datasource/cloudwatch/defaultQueries.ts | 5 ++--- .../datasource/cloudwatch/expressions.ts | 11 ---------- .../plugins/datasource/cloudwatch/guards.ts | 4 ++-- .../completion/CompletionItemProvider.test.ts | 3 ++- .../completion/CompletionItemProvider.ts | 2 +- .../CloudWatchLogsLanguageProvider.ts | 3 ++- .../PPLCompletionItemProvider.test.ts | 3 ++- .../completion/PPLCompletionItemProvider.ts | 2 +- .../cloudwatch-sql/SQLGenerator.test.ts | 3 +-- .../language/cloudwatch-sql/SQLGenerator.ts | 6 +++--- .../completion/CompletionItemProvider.test.ts | 3 ++- .../logs/completion/CompletionItemProvider.ts | 2 +- .../migrations/dashboardMigrations.test.ts | 3 ++- .../migrations/dashboardMigrations.ts | 3 ++- .../migrations/metricQueryMigrations.test.ts | 2 +- .../migrations/metricQueryMigrations.ts | 2 +- .../useMigratedMetricsQuery.test.ts | 2 +- .../migrations/useMigratedMetricsQuery.ts | 2 +- .../migrations/variableQueryMigrations.ts | 3 ++- .../datasource/cloudwatch/mocks/Request.ts | 3 ++- .../datasource/cloudwatch/mocks/queries.ts | 9 +++++++-- .../datasource/cloudwatch/mocks/sqlUtils.ts | 4 ++-- .../CloudWatchAnnotationQueryRunner.test.ts | 2 +- .../CloudWatchAnnotationQueryRunner.ts | 3 ++- .../CloudWatchLogsQueryRunner.test.ts | 2 +- .../query-runner/CloudWatchLogsQueryRunner.ts | 5 +---- .../CloudWatchMetricsQueryRunner.test.ts | 2 +- .../CloudWatchMetricsQueryRunner.ts | 3 ++- .../query-runner/CloudWatchRequest.ts | 3 ++- .../datasource/cloudwatch/resources/types.ts | 2 +- .../plugins/datasource/cloudwatch/tracking.ts | 20 +++++++++---------- .../plugins/datasource/cloudwatch/types.ts | 2 -- .../datasource/cloudwatch/utils/datalinks.ts | 3 ++- .../datasource/cloudwatch/utils/utils.ts | 2 +- 74 files changed, 153 insertions(+), 146 deletions(-) diff --git a/eslint-suppressions.json b/eslint-suppressions.json index 4cb2d651b50..318b3faa31a 100644 --- a/eslint-suppressions.json +++ b/eslint-suppressions.json @@ -3695,11 +3695,6 @@ "count": 1 } }, - "public/app/plugins/datasource/cloudwatch/expressions.ts": { - "no-barrel-files/no-barrel-files": { - "count": 1 - } - }, "public/app/plugins/datasource/cloudwatch/guards.ts": { "@typescript-eslint/consistent-type-assertions": { "count": 1 @@ -3713,9 +3708,6 @@ "public/app/plugins/datasource/cloudwatch/types.ts": { "@typescript-eslint/no-explicit-any": { "count": 7 - }, - "no-barrel-files/no-barrel-files": { - "count": 1 } }, "public/app/plugins/datasource/cloudwatch/utils/datalinks.ts": { diff --git a/public/app/features/dashboard/state/DashboardMigrator.ts b/public/app/features/dashboard/state/DashboardMigrator.ts index b6e9634da87..7355f7575b7 100644 --- a/public/app/features/dashboard/state/DashboardMigrator.ts +++ b/public/app/features/dashboard/state/DashboardMigrator.ts @@ -49,7 +49,8 @@ import { } from 'app/features/transformers/timeSeriesTable/timeSeriesTableTransformer'; import { isConstant, isMulti } from 'app/features/variables/guard'; import { alignCurrentWithMulti } from 'app/features/variables/shared/multiOptions'; -import { CloudWatchMetricsQuery, LegacyAnnotationQuery } from 'app/plugins/datasource/cloudwatch/types'; +import { CloudWatchMetricsQuery } from 'app/plugins/datasource/cloudwatch/dataquery.gen'; +import { LegacyAnnotationQuery } from 'app/plugins/datasource/cloudwatch/types'; import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource'; import { diff --git a/public/app/plugins/datasource/cloudwatch/annotationSupport.test.ts b/public/app/plugins/datasource/cloudwatch/annotationSupport.test.ts index 6bd10edb54c..3b94647b4ac 100644 --- a/public/app/plugins/datasource/cloudwatch/annotationSupport.test.ts +++ b/public/app/plugins/datasource/cloudwatch/annotationSupport.test.ts @@ -1,7 +1,8 @@ import { AnnotationQuery } from '@grafana/data'; import { CloudWatchAnnotationSupport } from './annotationSupport'; -import { CloudWatchAnnotationQuery, LegacyAnnotationQuery } from './types'; +import { CloudWatchAnnotationQuery } from './dataquery.gen'; +import { LegacyAnnotationQuery } from './types'; const metricStatAnnotationQuery: CloudWatchAnnotationQuery = { queryMode: 'Annotations', diff --git a/public/app/plugins/datasource/cloudwatch/annotationSupport.ts b/public/app/plugins/datasource/cloudwatch/annotationSupport.ts index 4c1d91746bd..23d72ad3721 100644 --- a/public/app/plugins/datasource/cloudwatch/annotationSupport.ts +++ b/public/app/plugins/datasource/cloudwatch/annotationSupport.ts @@ -1,9 +1,10 @@ import { AnnotationQuery } from '@grafana/data'; import { AnnotationQueryEditor } from './components/AnnotationQueryEditor/AnnotationQueryEditor'; +import { CloudWatchAnnotationQuery } from './dataquery.gen'; import { DEFAULT_ANNOTATIONS_QUERY } from './defaultQueries'; import { isCloudWatchAnnotation } from './guards'; -import { CloudWatchAnnotationQuery, CloudWatchQuery, LegacyAnnotationQuery } from './types'; +import { CloudWatchQuery, LegacyAnnotationQuery } from './types'; export const CloudWatchAnnotationSupport = { // converts legacy angular style queries to new format. Also sets the same default values as in the deprecated angular directive diff --git a/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor/AnnotationQueryEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor/AnnotationQueryEditor.test.tsx index 9178eb849c4..6033c4bba72 100644 --- a/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor/AnnotationQueryEditor.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor/AnnotationQueryEditor.test.tsx @@ -3,9 +3,10 @@ import '@testing-library/jest-dom'; import { QueryEditorProps } from '@grafana/data'; +import { CloudWatchAnnotationQuery, CloudWatchMetricsQuery } from '../../dataquery.gen'; import { CloudWatchDatasource } from '../../datasource'; import { setupMockedDataSource } from '../../mocks/CloudWatchDataSource'; -import { CloudWatchAnnotationQuery, CloudWatchJsonData, CloudWatchMetricsQuery, CloudWatchQuery } from '../../types'; +import { CloudWatchJsonData, CloudWatchQuery } from '../../types'; import { AnnotationQueryEditor } from './AnnotationQueryEditor'; diff --git a/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor/AnnotationQueryEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor/AnnotationQueryEditor.tsx index 9d3a061c76d..df62a07d40e 100644 --- a/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor/AnnotationQueryEditor.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor/AnnotationQueryEditor.tsx @@ -4,10 +4,11 @@ import { QueryEditorProps } from '@grafana/data'; import { EditorField, EditorHeader, EditorRow, EditorSwitch, InlineSelect } from '@grafana/plugin-ui'; import { Alert, Input, Space } from '@grafana/ui'; +import { MetricStat } from '../../dataquery.gen'; import { CloudWatchDatasource } from '../../datasource'; import { isCloudWatchAnnotationQuery } from '../../guards'; import { useRegions } from '../../hooks'; -import { CloudWatchJsonData, CloudWatchQuery, MetricStat } from '../../types'; +import { CloudWatchJsonData, CloudWatchQuery } from '../../types'; import { MetricStatEditor } from '../shared/MetricStatEditor/MetricStatEditor'; export type Props = QueryEditorProps; diff --git a/public/app/plugins/datasource/cloudwatch/components/CheatSheet/LogsCheatSheet.tsx b/public/app/plugins/datasource/cloudwatch/components/CheatSheet/LogsCheatSheet.tsx index 082a8eaf44a..f714992aa7d 100644 --- a/public/app/plugins/datasource/cloudwatch/components/CheatSheet/LogsCheatSheet.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/CheatSheet/LogsCheatSheet.tsx @@ -6,8 +6,9 @@ import { GrafanaTheme2 } from '@grafana/data'; import { Collapse, useStyles2, Text, TextLink } from '@grafana/ui'; import { flattenTokens } from '@grafana/ui/internal'; +import { CloudWatchLogsQuery, LogsQueryLanguage } from '../../dataquery.gen'; import { trackSampleQuerySelection } from '../../tracking'; -import { CloudWatchLogsQuery, CloudWatchQuery, LogsQueryLanguage } from '../../types'; +import { CloudWatchQuery } from '../../types'; import * as sampleQueries from './sampleQueries'; import { cwliTokenizer, pplTokenizer, sqlTokenizer } from './tokenizer'; diff --git a/public/app/plugins/datasource/cloudwatch/components/CheatSheet/sampleQueries.ts b/public/app/plugins/datasource/cloudwatch/components/CheatSheet/sampleQueries.ts index 4c67fe68c9b..5800ba42c82 100644 --- a/public/app/plugins/datasource/cloudwatch/components/CheatSheet/sampleQueries.ts +++ b/public/app/plugins/datasource/cloudwatch/components/CheatSheet/sampleQueries.ts @@ -1,6 +1,6 @@ import { stripIndents } from 'common-tags'; -import { LogsQueryLanguage } from '../../types'; +import { LogsQueryLanguage } from '../../dataquery.gen'; export interface SampleQuery { title: string; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/CloudWatchLink.test.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/CloudWatchLink.test.tsx index 8c2ed9adb1f..ea291ea8a4d 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/CloudWatchLink.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/CloudWatchLink.test.tsx @@ -2,10 +2,10 @@ import { act, render, screen, waitFor } from '@testing-library/react'; import { LoadingState } from '@grafana/data'; +import { CloudWatchLogsQuery } from '../../../dataquery.gen'; import { setupMockedDataSource } from '../../../mocks/CloudWatchDataSource'; import { RequestMock } from '../../../mocks/Request'; import { validLogsQuery } from '../../../mocks/queries'; -import { CloudWatchLogsQuery } from '../../../types'; import { CloudWatchLink } from './CloudWatchLink'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/CloudWatchLink.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/CloudWatchLink.tsx index 957fe7981ca..107c6c28157 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/CloudWatchLink.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/CloudWatchLink.tsx @@ -5,8 +5,8 @@ import { PanelData } from '@grafana/data'; import { LinkButton } from '@grafana/ui'; import { AwsUrl, encodeUrl } from '../../../aws_url'; +import { CloudWatchLogsQuery } from '../../../dataquery.gen'; import { CloudWatchDatasource } from '../../../datasource'; -import { CloudWatchLogsQuery } from '../../../types'; interface Props { query: CloudWatchLogsQuery; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryEditor.tsx index 96158987b68..516a0c4e6d0 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryEditor.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryEditor.tsx @@ -4,9 +4,10 @@ import { useEffectOnce } from 'react-use'; import { QueryEditorProps, SelectableValue } from '@grafana/data'; import { InlineSelect } from '@grafana/plugin-ui'; +import { CloudWatchLogsQuery, LogsMode, LogsQueryLanguage } from '../../../dataquery.gen'; import { CloudWatchDatasource } from '../../../datasource'; import { DEFAULT_CWLI_QUERY_STRING, DEFAULT_PPL_QUERY_STRING, DEFAULT_SQL_QUERY_STRING } from '../../../defaultQueries'; -import { CloudWatchJsonData, CloudWatchLogsQuery, CloudWatchQuery, LogsMode, LogsQueryLanguage } from '../../../types'; +import { CloudWatchQuery, CloudWatchJsonData } from '../../../types'; import { CloudWatchLink } from './CloudWatchLink'; import { LogsAnomaliesQueryEditor } from './LogsAnomaliesQueryEditor'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryField.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryField.tsx index 111084dbb1e..72e5bb702b0 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryField.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryField.tsx @@ -4,8 +4,9 @@ import { ReactNode, useCallback } from 'react'; import { GrafanaTheme2, QueryEditorProps } from '@grafana/data'; import { useStyles2 } from '@grafana/ui'; +import { CloudWatchLogsQuery, LogsQueryLanguage } from '../../../dataquery.gen'; import { CloudWatchDatasource } from '../../../datasource'; -import { CloudWatchJsonData, CloudWatchLogsQuery, CloudWatchQuery, LogsQueryLanguage } from '../../../types'; +import { CloudWatchJsonData, CloudWatchQuery } from '../../../types'; import { LogGroupsFieldWrapper } from '../../shared/LogGroups/LogGroupsField'; import { LogsQLCodeEditor } from './code-editors/LogsQLCodeEditor'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/LogsQLCodeEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/LogsQLCodeEditor.tsx index dec250d42fd..399d2ff21c3 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/LogsQLCodeEditor.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/LogsQLCodeEditor.tsx @@ -3,11 +3,11 @@ import { useCallback, useRef } from 'react'; import { CodeEditor, Monaco } from '@grafana/ui'; +import { CloudWatchLogsQuery } from '../../../../dataquery.gen'; import { CloudWatchDatasource } from '../../../../datasource'; import language from '../../../../language/logs/definition'; import { TRIGGER_SUGGEST } from '../../../../language/monarch/commands'; import { registerLanguage, reRegisterCompletionProvider } from '../../../../language/monarch/register'; -import { CloudWatchLogsQuery } from '../../../../types'; import { getStatsGroups } from '../../../../utils/query/getStatsGroups'; import { codeEditorCommonProps } from './PPLQueryEditor'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/PPLQueryEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/PPLQueryEditor.tsx index 84ff7e7738c..6c17005ee78 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/PPLQueryEditor.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/PPLQueryEditor.tsx @@ -4,11 +4,11 @@ import { useCallback, useRef } from 'react'; import { CodeEditor, Monaco } from '@grafana/ui'; import { CodeEditorProps } from '@grafana/ui/internal'; +import { CloudWatchLogsQuery } from '../../../../dataquery.gen'; import { CloudWatchDatasource } from '../../../../datasource'; import language from '../../../../language/cloudwatch-ppl/definition'; import { TRIGGER_SUGGEST } from '../../../../language/monarch/commands'; import { registerLanguage, reRegisterCompletionProvider } from '../../../../language/monarch/register'; -import { CloudWatchLogsQuery } from '../../../../types'; import { getStatsGroups } from '../../../../utils/query/getStatsGroups'; export const codeEditorCommonProps: Partial = { diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/SQLCodeEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/SQLCodeEditor.tsx index 59abe051f76..e5b82121483 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/SQLCodeEditor.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/SQLCodeEditor.tsx @@ -3,11 +3,11 @@ import { useCallback, useRef } from 'react'; import { CodeEditor, Monaco } from '@grafana/ui'; +import { CloudWatchLogsQuery } from '../../../../dataquery.gen'; import { CloudWatchDatasource } from '../../../../datasource'; import language from '../../../../language/cloudwatch-logs-sql/definition'; import { TRIGGER_SUGGEST } from '../../../../language/monarch/commands'; import { registerLanguage, reRegisterCompletionProvider } from '../../../../language/monarch/register'; -import { CloudWatchLogsQuery } from '../../../../types'; import { getStatsGroups } from '../../../../utils/query/getStatsGroups'; import { codeEditorCommonProps } from './PPLQueryEditor'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.test.tsx index bca545ec45f..1aff9157f4c 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.test.tsx @@ -5,10 +5,11 @@ import { CustomVariableModel, DataSourceInstanceSettings } from '@grafana/data'; // eslint-disable-next-line no-restricted-imports import * as ui from '@grafana/ui'; +import { CloudWatchMetricsQuery, MetricEditorMode, MetricQueryType } from '../../../dataquery.gen'; import { CloudWatchDatasource } from '../../../datasource'; import { setupMockedTemplateService } from '../../../mocks/CloudWatchDataSource'; import { initialVariableModelState } from '../../../mocks/CloudWatchVariables'; -import { CloudWatchJsonData, CloudWatchMetricsQuery, MetricEditorMode, MetricQueryType } from '../../../types'; +import { CloudWatchJsonData } from '../../../types'; import { MetricsQueryEditor, Props } from './MetricsQueryEditor'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.tsx index db88bda25cd..c9625bbddb0 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.tsx @@ -6,17 +6,11 @@ import { EditorField, EditorRow, InlineSelect } from '@grafana/plugin-ui'; import { config } from '@grafana/runtime'; import { ConfirmModal, Input, RadioButtonGroup, Space } from '@grafana/ui'; +import { CloudWatchMetricsQuery, MetricEditorMode, MetricQueryType, MetricStat } from '../../../dataquery.gen'; import { CloudWatchDatasource } from '../../../datasource'; import { DEFAULT_METRICS_QUERY } from '../../../defaultQueries'; import useMigratedMetricsQuery from '../../../migrations/useMigratedMetricsQuery'; -import { - CloudWatchJsonData, - CloudWatchMetricsQuery, - CloudWatchQuery, - MetricEditorMode, - MetricQueryType, - MetricStat, -} from '../../../types'; +import { CloudWatchQuery, CloudWatchJsonData } from '../../../types'; import { MetricStatEditor } from '../../shared/MetricStatEditor/MetricStatEditor'; import { DynamicLabelsField } from './DynamicLabelsField'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderEditor.test.tsx index 2e3c8e16403..bad9162ae87 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderEditor.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderEditor.test.tsx @@ -1,8 +1,14 @@ import { render, screen, waitFor } from '@testing-library/react'; -import { QueryEditorExpressionType, QueryEditorPropertyType } from '../../../../expressions'; +import { + CloudWatchMetricsQuery, + MetricEditorMode, + MetricQueryType, + SQLExpression, + QueryEditorExpressionType, + QueryEditorPropertyType, +} from '../../../../dataquery.gen'; import { setupMockedDataSource } from '../../../../mocks/CloudWatchDataSource'; -import { CloudWatchMetricsQuery, MetricEditorMode, MetricQueryType, SQLExpression } from '../../../../types'; import { SQLBuilderEditor } from './SQLBuilderEditor'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderEditor.tsx index 93ff8e4d4e4..adb81c609bc 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderEditor.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderEditor.tsx @@ -4,9 +4,9 @@ import * as React from 'react'; import { EditorField, EditorRow, EditorRows } from '@grafana/plugin-ui'; import { Input } from '@grafana/ui'; +import { CloudWatchMetricsQuery } from '../../../../dataquery.gen'; import { CloudWatchDatasource } from '../../../../datasource'; import SQLGenerator from '../../../../language/cloudwatch-sql/SQLGenerator'; -import { CloudWatchMetricsQuery } from '../../../../types'; import SQLBuilderSelectRow from './SQLBuilderSelectRow'; import SQLFilter from './SQLFilter'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderSelectRow.test.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderSelectRow.test.tsx index fca1c946f06..621566f4cf9 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderSelectRow.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderSelectRow.test.tsx @@ -1,9 +1,15 @@ import { act, render, screen } from '@testing-library/react'; import { selectOptionInTest } from 'test/helpers/selectOptionInTest'; -import { QueryEditorExpressionType, QueryEditorPropertyType } from '../../../../expressions'; +import { + CloudWatchMetricsQuery, + MetricEditorMode, + MetricQueryType, + SQLExpression, + QueryEditorExpressionType, + QueryEditorPropertyType, +} from '../../../../dataquery.gen'; import { setupMockedDataSource } from '../../../../mocks/CloudWatchDataSource'; -import { CloudWatchMetricsQuery, MetricEditorMode, MetricQueryType, SQLExpression } from '../../../../types'; import SQLBuilderSelectRow from './SQLBuilderSelectRow'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderSelectRow.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderSelectRow.tsx index 707b7b5b137..ff3ff1969ef 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderSelectRow.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderSelectRow.tsx @@ -5,10 +5,10 @@ import { EditorField, EditorFieldGroup, EditorSwitch } from '@grafana/plugin-ui' import { config } from '@grafana/runtime'; import { Select } from '@grafana/ui'; +import { CloudWatchMetricsQuery } from '../../../../dataquery.gen'; import { CloudWatchDatasource } from '../../../../datasource'; import { useAccountOptions, useDimensionKeys, useMetrics, useNamespaces } from '../../../../hooks'; import { STATISTICS } from '../../../../language/cloudwatch-sql/language'; -import { CloudWatchMetricsQuery } from '../../../../types'; import { appendTemplateVariables } from '../../../../utils/utils'; import { Account } from '../../../shared/Account'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLFilter.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLFilter.tsx index a911f8d05eb..e40c8ec44ee 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLFilter.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLFilter.tsx @@ -6,16 +6,16 @@ import { SelectableValue, toOption } from '@grafana/data'; import { AccessoryButton, EditorList, InputGroup } from '@grafana/plugin-ui'; import { config } from '@grafana/runtime'; import { Alert, Select, useStyles2 } from '@grafana/ui'; +import { + CloudWatchMetricsQuery, + QueryEditorExpressionType, + QueryEditorPropertyType, +} from 'app/plugins/datasource/cloudwatch/dataquery.gen'; import { CloudWatchDatasource } from '../../../../datasource'; -import { - QueryEditorExpressionType, - QueryEditorOperatorExpression, - QueryEditorPropertyType, -} from '../../../../expressions'; +import { QueryEditorOperatorExpression } from '../../../../expressions'; import { useDimensionKeys, useEnsureVariableHasSingleSelection } from '../../../../hooks'; import { COMPARISON_OPERATORS, EQUALS } from '../../../../language/cloudwatch-sql/language'; -import { CloudWatchMetricsQuery } from '../../../../types'; import { appendTemplateVariables } from '../../../../utils/utils'; import { diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLGroupBy.test.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLGroupBy.test.tsx index 315eafb511a..a1be51358ce 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLGroupBy.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLGroupBy.test.tsx @@ -4,9 +4,9 @@ import selectEvent from 'react-select-event'; import { config } from '@grafana/runtime'; +import { CloudWatchMetricsQuery, MetricEditorMode, MetricQueryType, SQLExpression } from '../../../../dataquery.gen'; import { setupMockedDataSource } from '../../../../mocks/CloudWatchDataSource'; import { createArray, createGroupBy } from '../../../../mocks/sqlUtils'; -import { CloudWatchMetricsQuery, MetricEditorMode, MetricQueryType, SQLExpression } from '../../../../types'; import SQLGroupBy from './SQLGroupBy'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLGroupBy.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLGroupBy.tsx index a288b74b0b8..f49aa2ba00c 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLGroupBy.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLGroupBy.tsx @@ -5,14 +5,14 @@ import { AccessoryButton, EditorList, InputGroup } from '@grafana/plugin-ui'; import { config } from '@grafana/runtime'; import { Select } from '@grafana/ui'; -import { CloudWatchDatasource } from '../../../../datasource'; import { + CloudWatchMetricsQuery, QueryEditorExpressionType, QueryEditorGroupByExpression, QueryEditorPropertyType, -} from '../../../../expressions'; +} from '../../../../dataquery.gen'; +import { CloudWatchDatasource } from '../../../../datasource'; import { useDimensionKeys, useIsMonitoringAccount } from '../../../../hooks'; -import { CloudWatchMetricsQuery } from '../../../../types'; import { getFlattenedGroupBys, diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLOrderByGroup.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLOrderByGroup.tsx index 188c7a1ce69..58427587f2d 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLOrderByGroup.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLOrderByGroup.tsx @@ -2,9 +2,9 @@ import { SelectableValue, toOption } from '@grafana/data'; import { AccessoryButton, EditorField, EditorFieldGroup, InputGroup } from '@grafana/plugin-ui'; import { Select } from '@grafana/ui'; +import { CloudWatchMetricsQuery } from '../../../../dataquery.gen'; import { CloudWatchDatasource } from '../../../../datasource'; import { ASC, DESC, STATISTICS } from '../../../../language/cloudwatch-sql/language'; -import { CloudWatchMetricsQuery } from '../../../../types'; import { appendTemplateVariables } from '../../../../utils/utils'; import { setOrderBy, setSql } from './utils'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/utils.ts b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/utils.ts index b25dd6fa45e..e53c02ac173 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/utils.ts +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/utils.ts @@ -1,15 +1,17 @@ import { SelectableValue } from '@grafana/data'; import { + SQLExpression, + CloudWatchMetricsQuery, + Dimensions, QueryEditorExpressionType, QueryEditorPropertyType, QueryEditorFunctionParameterExpression, QueryEditorArrayExpression, - QueryEditorOperatorExpression, QueryEditorGroupByExpression, -} from '../../../../expressions'; +} from '../../../../dataquery.gen'; +import { QueryEditorOperatorExpression } from '../../../../expressions'; import { SCHEMA } from '../../../../language/cloudwatch-sql/language'; -import { SQLExpression, CloudWatchMetricsQuery, Dimensions } from '../../../../types'; export function getMetricNameFromExpression(selectExpression: SQLExpression['select']): string | undefined { return selectExpression?.parameters?.[0].name; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/QueryEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/QueryEditor.test.tsx index 1d87bd29596..47c4633df65 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/QueryEditor.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/QueryEditor.test.tsx @@ -5,6 +5,7 @@ import { selectOptionInTest } from 'test/helpers/selectOptionInTest'; import { QueryEditorProps } from '@grafana/data'; import { config } from '@grafana/runtime'; +import { MetricEditorMode, MetricQueryType, LogsQueryLanguage } from '../../dataquery.gen'; import { CloudWatchDatasource } from '../../datasource'; import { DEFAULT_CWLI_QUERY_STRING, DEFAULT_SQL_QUERY_STRING } from '../../defaultQueries'; import { setupMockedDataSource } from '../../mocks/CloudWatchDataSource'; @@ -15,7 +16,7 @@ import { validMetricSearchBuilderQuery, validMetricSearchCodeQuery, } from '../../mocks/queries'; -import { CloudWatchQuery, CloudWatchJsonData, MetricEditorMode, MetricQueryType, LogsQueryLanguage } from '../../types'; +import { CloudWatchJsonData, CloudWatchQuery } from '../../types'; import { QueryEditor } from './QueryEditor'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/QueryHeader.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/QueryHeader.tsx index 78da93ba3a1..ae8e987b48c 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/QueryHeader.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/QueryHeader.tsx @@ -5,10 +5,11 @@ import { EditorHeader, InlineSelect, FlexItem } from '@grafana/plugin-ui'; import { config } from '@grafana/runtime'; import { Badge, Button } from '@grafana/ui'; +import { CloudWatchQueryMode } from '../../dataquery.gen'; import { CloudWatchDatasource } from '../../datasource'; import { isCloudWatchLogsQuery, isCloudWatchMetricsQuery } from '../../guards'; import { useIsMonitoringAccount, useRegions } from '../../hooks'; -import { CloudWatchJsonData, CloudWatchQuery, CloudWatchQueryMode } from '../../types'; +import { CloudWatchJsonData, CloudWatchQuery } from '../../types'; export interface Props extends QueryEditorProps { extraHeaderElementLeft?: JSX.Element; diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.test.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.test.tsx index 6374c95b8a6..8509a230c45 100644 --- a/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.test.tsx @@ -1,8 +1,8 @@ import { fireEvent, render, screen, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { CloudWatchMetricsQuery } from '../../../dataquery.gen'; import { setupMockedDataSource } from '../../../mocks/CloudWatchDataSource'; -import { CloudWatchMetricsQuery } from '../../../types'; import { Dimensions } from './Dimensions'; diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.tsx index 3ab31316fc9..5f66358636d 100644 --- a/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.tsx @@ -3,8 +3,8 @@ import { useMemo, useState } from 'react'; import { EditorList } from '@grafana/plugin-ui'; +import { Dimensions as DimensionsType, MetricStat } from '../../../dataquery.gen'; import { CloudWatchDatasource } from '../../../datasource'; -import { Dimensions as DimensionsType, MetricStat } from '../../../types'; import { FilterItem } from './FilterItem'; diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.test.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.test.tsx index 2afbd64e195..a98deecd5ef 100644 --- a/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.test.tsx @@ -1,8 +1,8 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { CloudWatchMetricsQuery } from '../../../dataquery.gen'; import { setupMockedDataSource } from '../../../mocks/CloudWatchDataSource'; -import { CloudWatchMetricsQuery } from '../../../types'; import { FilterItem } from './FilterItem'; diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.tsx index 592ecfbe76f..673a193145a 100644 --- a/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.tsx @@ -6,9 +6,9 @@ import { GrafanaTheme2, SelectableValue, toOption } from '@grafana/data'; import { AccessoryButton, InputGroup } from '@grafana/plugin-ui'; import { Alert, Select, useStyles2 } from '@grafana/ui'; +import { Dimensions, MetricStat } from '../../../dataquery.gen'; import { CloudWatchDatasource } from '../../../datasource'; import { useDimensionKeys, useEnsureVariableHasSingleSelection } from '../../../hooks'; -import { Dimensions, MetricStat } from '../../../types'; import { appendTemplateVariables } from '../../../utils/utils'; import { DimensionFilterCondition } from './Dimensions'; diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.tsx index 85c4cf74336..9190cc2bcc9 100644 --- a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.tsx @@ -3,10 +3,10 @@ import { useEffect, useState } from 'react'; import { config } from '@grafana/runtime'; +import { LogGroup } from '../../../dataquery.gen'; import { CloudWatchDatasource } from '../../../datasource'; import { useAccountOptions } from '../../../hooks'; import { DescribeLogGroupsRequest } from '../../../resources/types'; -import { LogGroup } from '../../../types'; import { isTemplateVariable } from '../../../utils/templateVariableUtils'; import { LegacyLogGroupSelection } from './LegacyLogGroupNamesSelection'; diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsSelector.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsSelector.tsx index 170359cdfcb..9f5eb9be6a7 100644 --- a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsSelector.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsSelector.tsx @@ -15,8 +15,8 @@ import { useStyles2, } from '@grafana/ui'; +import { LogGroup } from '../../../dataquery.gen'; import { DescribeLogGroupsRequest, ResourceResponse, LogGroupResponse } from '../../../resources/types'; -import { LogGroup } from '../../../types'; import getStyles from '../../styles'; import { Account, ALL_ACCOUNTS_OPTION } from '../Account'; diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/SelectedLogGroups.test.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/SelectedLogGroups.test.tsx index 7ad0fea4ec4..f404f50c436 100644 --- a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/SelectedLogGroups.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/SelectedLogGroups.test.tsx @@ -1,7 +1,7 @@ import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { LogGroup } from '../../../types'; +import { LogGroup } from '../../../dataquery.gen'; import { SelectedLogGroups } from './SelectedLogGroups'; diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/SelectedLogGroups.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/SelectedLogGroups.tsx index e1c20db7f50..6991861d7a4 100644 --- a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/SelectedLogGroups.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/SelectedLogGroups.tsx @@ -2,7 +2,7 @@ import { useEffect, useState } from 'react'; import { Button, ConfirmModal, useStyles2 } from '@grafana/ui'; -import { LogGroup } from '../../../types'; +import { LogGroup } from '../../../dataquery.gen'; import getStyles from '../../styles'; type CrossAccountLogsQueryProps = { diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/MetricStatEditor/MetricStatEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/MetricStatEditor/MetricStatEditor.test.tsx index 5eec534a5ca..8a353ebd239 100644 --- a/public/app/plugins/datasource/cloudwatch/components/shared/MetricStatEditor/MetricStatEditor.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/shared/MetricStatEditor/MetricStatEditor.test.tsx @@ -4,9 +4,9 @@ import selectEvent from 'react-select-event'; import { config } from '@grafana/runtime'; +import { MetricStat } from '../../../dataquery.gen'; import { setupMockedDataSource, statisticVariable } from '../../../mocks/CloudWatchDataSource'; import { validMetricSearchBuilderQuery } from '../../../mocks/queries'; -import { MetricStat } from '../../../types'; import { MetricStatEditor } from './MetricStatEditor'; diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/MetricStatEditor/MetricStatEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/MetricStatEditor/MetricStatEditor.tsx index cf98588d377..0aab1780826 100644 --- a/public/app/plugins/datasource/cloudwatch/components/shared/MetricStatEditor/MetricStatEditor.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/shared/MetricStatEditor/MetricStatEditor.tsx @@ -6,10 +6,10 @@ import { EditorField, EditorFieldGroup, EditorRow, EditorRows, EditorSwitch } fr import { config } from '@grafana/runtime'; import { Select, TextLink } from '@grafana/ui'; +import { MetricStat } from '../../../dataquery.gen'; import { CloudWatchDatasource } from '../../../datasource'; import { useAccountOptions, useMetrics, useNamespaces } from '../../../hooks'; import { standardStatistics } from '../../../standardStatistics'; -import { MetricStat } from '../../../types'; import { appendTemplateVariables, toOption } from '../../../utils/utils'; import { Account } from '../Account'; import { Dimensions } from '../Dimensions/Dimensions'; diff --git a/public/app/plugins/datasource/cloudwatch/datasource.test.ts b/public/app/plugins/datasource/cloudwatch/datasource.test.ts index 2a84dca2490..a922629e07f 100644 --- a/public/app/plugins/datasource/cloudwatch/datasource.test.ts +++ b/public/app/plugins/datasource/cloudwatch/datasource.test.ts @@ -3,6 +3,13 @@ import { toArray } from 'rxjs/operators'; import { CoreApp, Field } from '@grafana/data'; +import { + CloudWatchLogsQuery, + CloudWatchMetricsQuery, + LogsQueryLanguage, + MetricEditorMode, + MetricQueryType, +} from './dataquery.gen'; import { CloudWatchSettings, fieldsVariable, @@ -13,16 +20,7 @@ import { import { setupForLogs } from './mocks/logsTestContext'; import { validLogsQuery, validMetricSearchBuilderQuery } from './mocks/queries'; import { TimeRangeMock } from './mocks/timeRange'; -import { - CloudWatchDefaultQuery, - CloudWatchLogsQuery, - CloudWatchLogsRequest, - CloudWatchMetricsQuery, - CloudWatchQuery, - LogsQueryLanguage, - MetricEditorMode, - MetricQueryType, -} from './types'; +import { CloudWatchQuery, CloudWatchLogsRequest, CloudWatchDefaultQuery } from './types'; import * as templateUtils from './utils/templateVariableUtils'; describe('datasource', () => { diff --git a/public/app/plugins/datasource/cloudwatch/datasource.ts b/public/app/plugins/datasource/cloudwatch/datasource.ts index 27c240dd6cd..c5b0dc50d56 100644 --- a/public/app/plugins/datasource/cloudwatch/datasource.ts +++ b/public/app/plugins/datasource/cloudwatch/datasource.ts @@ -15,6 +15,12 @@ import { import { DataSourceWithBackend, TemplateSrv, getTemplateSrv } from '@grafana/runtime'; import { CloudWatchAnnotationSupport } from './annotationSupport'; +import { + CloudWatchAnnotationQuery, + CloudWatchLogsAnomaliesQuery, + CloudWatchLogsQuery, + CloudWatchMetricsQuery, +} from './dataquery.gen'; import { DEFAULT_METRICS_QUERY, getDefaultLogsQuery } from './defaultQueries'; import { isCloudWatchAnnotationQuery, @@ -42,14 +48,7 @@ import { CloudWatchAnnotationQueryRunner } from './query-runner/CloudWatchAnnota import { CloudWatchLogsQueryRunner } from './query-runner/CloudWatchLogsQueryRunner'; import { CloudWatchMetricsQueryRunner } from './query-runner/CloudWatchMetricsQueryRunner'; import { ResourcesAPI } from './resources/ResourcesAPI'; -import { - CloudWatchAnnotationQuery, - CloudWatchJsonData, - CloudWatchLogsAnomaliesQuery, - CloudWatchLogsQuery, - CloudWatchMetricsQuery, - CloudWatchQuery, -} from './types'; +import { CloudWatchQuery, CloudWatchJsonData } from './types'; import { CloudWatchVariableSupport } from './variables'; export class CloudWatchDatasource diff --git a/public/app/plugins/datasource/cloudwatch/defaultQueries.ts b/public/app/plugins/datasource/cloudwatch/defaultQueries.ts index 22055f17256..c8935405f6d 100644 --- a/public/app/plugins/datasource/cloudwatch/defaultQueries.ts +++ b/public/app/plugins/datasource/cloudwatch/defaultQueries.ts @@ -6,9 +6,8 @@ import { LogsQueryLanguage, MetricEditorMode, MetricQueryType, - VariableQuery, - VariableQueryType, -} from './types'; +} from './dataquery.gen'; +import { VariableQuery, VariableQueryType } from './types'; export const DEFAULT_METRICS_QUERY: Omit = { queryMode: 'Metrics', diff --git a/public/app/plugins/datasource/cloudwatch/expressions.ts b/public/app/plugins/datasource/cloudwatch/expressions.ts index 206e9284089..60b9d1eca8e 100644 --- a/public/app/plugins/datasource/cloudwatch/expressions.ts +++ b/public/app/plugins/datasource/cloudwatch/expressions.ts @@ -3,17 +3,6 @@ import { QueryEditorOperator as QueryEditorOperatorBase, QueryEditorOperatorValueType, } from './dataquery.gen'; -export { - QueryEditorPropertyType, - type QueryEditorProperty, - type QueryEditorPropertyExpression, - type QueryEditorGroupByExpression, - type QueryEditorFunctionExpression, - type QueryEditorFunctionParameterExpression, - type QueryEditorArrayExpression, - QueryEditorExpressionType, - type QueryEditorExpression, -} from './dataquery.gen'; export interface QueryEditorOperator extends QueryEditorOperatorBase { value?: T; diff --git a/public/app/plugins/datasource/cloudwatch/guards.ts b/public/app/plugins/datasource/cloudwatch/guards.ts index 2a54dd9719c..9c29f4b4c15 100644 --- a/public/app/plugins/datasource/cloudwatch/guards.ts +++ b/public/app/plugins/datasource/cloudwatch/guards.ts @@ -5,9 +5,9 @@ import { CloudWatchLogsAnomaliesQuery, CloudWatchLogsQuery, CloudWatchMetricsQuery, - CloudWatchQuery, LogsMode, -} from './types'; +} from './dataquery.gen'; +import { CloudWatchQuery } from './types'; export const isCloudWatchLogsQuery = (cloudwatchQuery: CloudWatchQuery): cloudwatchQuery is CloudWatchLogsQuery => cloudwatchQuery.queryMode === 'Logs'; diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs-sql/completion/CompletionItemProvider.test.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs-sql/completion/CompletionItemProvider.test.ts index 04b71f35a6d..606527f4711 100644 --- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs-sql/completion/CompletionItemProvider.test.ts +++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs-sql/completion/CompletionItemProvider.test.ts @@ -1,6 +1,7 @@ import { CustomVariableModel } from '@grafana/data'; import { Monaco, monacoTypes } from '@grafana/ui'; +import { LogGroup } from '../../../dataquery.gen'; import { setupMockedTemplateService, logGroupNamesVariable } from '../../../mocks/CloudWatchDataSource'; import { multiLineFullQuery } from '../../../mocks/cloudwatch-logs-sql-test-data/multiLineFullQuery'; import { multiLineFullQueryWithCaseClause } from '../../../mocks/cloudwatch-logs-sql-test-data/multiLineFullQueryWithCaseClause'; @@ -11,7 +12,7 @@ import MonacoMock from '../../../mocks/monarch/Monaco'; import TextModel from '../../../mocks/monarch/TextModel'; import { ResourcesAPI } from '../../../resources/ResourcesAPI'; import { ResourceResponse } from '../../../resources/types'; -import { LogGroup, LogGroupField } from '../../../types'; +import { LogGroupField } from '../../../types'; import cloudWatchLogsLanguageDefinition from '../definition'; import { SELECT, diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs-sql/completion/CompletionItemProvider.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs-sql/completion/CompletionItemProvider.ts index ea8063ff196..cdba699b7a0 100644 --- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs-sql/completion/CompletionItemProvider.ts +++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs-sql/completion/CompletionItemProvider.ts @@ -1,8 +1,8 @@ import { getTemplateSrv, TemplateSrv } from '@grafana/runtime'; import type { Monaco, monacoTypes } from '@grafana/ui'; +import { LogGroup } from '../../../dataquery.gen'; import { ResourcesAPI } from '../../../resources/ResourcesAPI'; -import { LogGroup } from '../../../types'; import { CompletionItemProvider } from '../../monarch/CompletionItemProvider'; import { LinkedToken } from '../../monarch/LinkedToken'; import { TRIGGER_SUGGEST } from '../../monarch/commands'; diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs/CloudWatchLogsLanguageProvider.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs/CloudWatchLogsLanguageProvider.ts index ba36458e0be..bae8ee4785f 100644 --- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs/CloudWatchLogsLanguageProvider.ts +++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs/CloudWatchLogsLanguageProvider.ts @@ -5,8 +5,9 @@ import { AbsoluteTimeRange, HistoryItem, LanguageProvider } from '@grafana/data' import { BackendDataSourceResponse, FetchResponse, TemplateSrv, getTemplateSrv } from '@grafana/runtime'; import { CompletionItemGroup, SearchFunctionType, Token, TypeaheadInput, TypeaheadOutput } from '@grafana/ui'; +import { LogGroup } from '../../dataquery.gen'; import { CloudWatchDatasource } from '../../datasource'; -import { CloudWatchQuery, LogGroup } from '../../types'; +import { CloudWatchQuery } from '../../types'; import { fetchLogGroupFields } from '../utils'; import syntax, { diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-ppl/completion/PPLCompletionItemProvider.test.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-ppl/completion/PPLCompletionItemProvider.test.ts index 7809ac001b5..e9f197e7c4d 100644 --- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-ppl/completion/PPLCompletionItemProvider.test.ts +++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-ppl/completion/PPLCompletionItemProvider.test.ts @@ -1,6 +1,7 @@ import { CustomVariableModel } from '@grafana/data'; import { Monaco, monacoTypes } from '@grafana/ui'; +import { LogGroup } from '../../../dataquery.gen'; import { logGroupNamesVariable, setupMockedTemplateService } from '../../../mocks/CloudWatchDataSource'; import { newCommandQuery } from '../../../mocks/cloudwatch-ppl-test-data/newCommandQuery'; import { @@ -22,7 +23,7 @@ import MonacoMock from '../../../mocks/monarch/Monaco'; import TextModel from '../../../mocks/monarch/TextModel'; import { ResourcesAPI } from '../../../resources/ResourcesAPI'; import { ResourceResponse } from '../../../resources/types'; -import { LogGroup, LogGroupField } from '../../../types'; +import { LogGroupField } from '../../../types'; import cloudWatchLogsPPLLanguageDefinition from '../definition'; import { BOOLEAN_LITERALS, diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-ppl/completion/PPLCompletionItemProvider.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-ppl/completion/PPLCompletionItemProvider.ts index fee0f2e23fe..52626a27ed6 100644 --- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-ppl/completion/PPLCompletionItemProvider.ts +++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-ppl/completion/PPLCompletionItemProvider.ts @@ -1,8 +1,8 @@ import { getTemplateSrv, type TemplateSrv } from '@grafana/runtime'; import { Monaco, monacoTypes } from '@grafana/ui'; +import { LogGroup } from '../../../dataquery.gen'; import { type ResourcesAPI } from '../../../resources/ResourcesAPI'; -import { LogGroup } from '../../../types'; import { CompletionItemProvider } from '../../monarch/CompletionItemProvider'; import { LinkedToken } from '../../monarch/LinkedToken'; import { TRIGGER_SUGGEST } from '../../monarch/commands'; diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.test.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.test.ts index 83f943a4f95..20a990f5ba0 100644 --- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.test.ts +++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.test.ts @@ -1,4 +1,4 @@ -import { QueryEditorExpressionType } from '../../expressions'; +import { SQLExpression, QueryEditorExpressionType } from '../../dataquery.gen'; import { aggregationvariable, labelsVariable, @@ -14,7 +14,6 @@ import { createFunction, createProperty, } from '../../mocks/sqlUtils'; -import { SQLExpression } from '../../types'; import SQLGenerator from './SQLGenerator'; diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.ts index b6058dc2daf..a74a179c248 100644 --- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.ts +++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.ts @@ -7,10 +7,10 @@ import { QueryEditorExpression, QueryEditorExpressionType, QueryEditorFunctionExpression, - QueryEditorOperatorExpression, QueryEditorPropertyExpression, -} from '../../expressions'; -import { SQLExpression } from '../../types'; + SQLExpression, +} from '../../dataquery.gen'; +import { QueryEditorOperatorExpression } from '../../expressions'; import { InsightsReservedKeywords } from './consts'; diff --git a/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.test.ts b/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.test.ts index e586b46ed64..bcf605b9a27 100644 --- a/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.test.ts +++ b/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.test.ts @@ -3,6 +3,7 @@ import * as monaco from 'monaco-editor/esm/vs/editor/editor.api'; import { CustomVariableModel } from '@grafana/data'; import { monacoTypes } from '@grafana/ui'; +import { LogGroup } from '../../../dataquery.gen'; import { setupMockedTemplateService, logGroupNamesVariable } from '../../../mocks/CloudWatchDataSource'; import { logsTestDataDiffModifierQuery } from '../../../mocks/cloudwatch-logs-test-data/diffModifierQuery'; import { logsTestDataDiffQuery } from '../../../mocks/cloudwatch-logs-test-data/diffQuery'; @@ -12,7 +13,7 @@ import { logsTestDataNewCommandQuery } from '../../../mocks/cloudwatch-logs-test import { logsTestDataSortQuery } from '../../../mocks/cloudwatch-logs-test-data/sortQuery'; import { ResourcesAPI } from '../../../resources/ResourcesAPI'; import { ResourceResponse } from '../../../resources/types'; -import { LogGroup, LogGroupField } from '../../../types'; +import { LogGroupField } from '../../../types'; import cloudWatchLogsLanguageDefinition, { CLOUDWATCH_LOGS_LANGUAGE_DEFINITION_ID } from '../definition'; import { DIFF_MODIFIERS, LOGS_COMMANDS, LOGS_FUNCTION_OPERATORS, SORT_DIRECTION_KEYWORDS, language } from '../language'; diff --git a/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.ts b/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.ts index 2d8a62920cb..e6f8ba31d74 100644 --- a/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.ts +++ b/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.ts @@ -1,8 +1,8 @@ import { getTemplateSrv, TemplateSrv } from '@grafana/runtime'; import { Monaco, monacoTypes } from '@grafana/ui'; +import { LogGroup } from '../../../dataquery.gen'; import { type ResourcesAPI } from '../../../resources/ResourcesAPI'; -import { LogGroup } from '../../../types'; import { CompletionItemProvider } from '../../monarch/CompletionItemProvider'; import { LinkedToken } from '../../monarch/LinkedToken'; import { TRIGGER_SUGGEST } from '../../monarch/commands'; diff --git a/public/app/plugins/datasource/cloudwatch/migrations/dashboardMigrations.test.ts b/public/app/plugins/datasource/cloudwatch/migrations/dashboardMigrations.test.ts index 848dda3d857..439b11037f7 100644 --- a/public/app/plugins/datasource/cloudwatch/migrations/dashboardMigrations.test.ts +++ b/public/app/plugins/datasource/cloudwatch/migrations/dashboardMigrations.test.ts @@ -1,6 +1,7 @@ import { AnnotationQuery, DataQuery } from '@grafana/data'; -import { CloudWatchMetricsQuery, LegacyAnnotationQuery, MetricEditorMode, MetricQueryType } from '../types'; +import { CloudWatchMetricsQuery, MetricEditorMode, MetricQueryType } from '../dataquery.gen'; +import { LegacyAnnotationQuery } from '../types'; import { migrateCloudWatchQuery, diff --git a/public/app/plugins/datasource/cloudwatch/migrations/dashboardMigrations.ts b/public/app/plugins/datasource/cloudwatch/migrations/dashboardMigrations.ts index 4d97404fdcb..19171a71b2f 100644 --- a/public/app/plugins/datasource/cloudwatch/migrations/dashboardMigrations.ts +++ b/public/app/plugins/datasource/cloudwatch/migrations/dashboardMigrations.ts @@ -5,7 +5,8 @@ import { AnnotationQuery, getNextRefId } from '@grafana/data'; import { DataQuery } from '@grafana/schema'; -import { CloudWatchMetricsQuery, LegacyAnnotationQuery, MetricQueryType, MetricEditorMode } from '../types'; +import { CloudWatchMetricsQuery, MetricQueryType, MetricEditorMode } from '../dataquery.gen'; +import { LegacyAnnotationQuery } from '../types'; // E.g query.statistics = ['Max', 'Min'] will be migrated to two queries - query1.statistic = 'Max' and query2.statistic = 'Min' export function migrateMultipleStatsMetricsQuery( diff --git a/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.test.ts b/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.test.ts index ae6476e29bd..a15bc132531 100644 --- a/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.test.ts +++ b/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.test.ts @@ -1,4 +1,4 @@ -import { CloudWatchMetricsQuery, MetricEditorMode, MetricQueryType } from '../types'; +import { CloudWatchMetricsQuery, MetricEditorMode, MetricQueryType } from '../dataquery.gen'; import { migrateAliasPatterns, migrateMetricQuery } from './metricQueryMigrations'; diff --git a/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.ts b/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.ts index 7d79fbd1d86..079f0cbf12a 100644 --- a/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.ts +++ b/public/app/plugins/datasource/cloudwatch/migrations/metricQueryMigrations.ts @@ -1,6 +1,6 @@ import deepEqual from 'fast-deep-equal'; -import { CloudWatchMetricsQuery } from '../types'; +import { CloudWatchMetricsQuery } from '../dataquery.gen'; import { migrateCloudWatchQuery } from './dashboardMigrations'; diff --git a/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.test.ts b/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.test.ts index 5ac0dde4410..dd6c976737a 100644 --- a/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.test.ts +++ b/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.test.ts @@ -1,7 +1,7 @@ import { renderHook } from '@testing-library/react'; +import { CloudWatchMetricsQuery } from '../dataquery.gen'; import { DEFAULT_METRICS_QUERY } from '../defaultQueries'; -import { CloudWatchMetricsQuery } from '../types'; import { migrateAliasPatterns } from './metricQueryMigrations'; import useMigratedMetricsQuery from './useMigratedMetricsQuery'; diff --git a/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.ts b/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.ts index 890a0b20908..b0933284e77 100644 --- a/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.ts +++ b/public/app/plugins/datasource/cloudwatch/migrations/useMigratedMetricsQuery.ts @@ -1,6 +1,6 @@ import { useEffect, useMemo } from 'react'; -import { CloudWatchMetricsQuery } from '../types'; +import { CloudWatchMetricsQuery } from '../dataquery.gen'; import { migrateMetricQuery } from './metricQueryMigrations'; diff --git a/public/app/plugins/datasource/cloudwatch/migrations/variableQueryMigrations.ts b/public/app/plugins/datasource/cloudwatch/migrations/variableQueryMigrations.ts index 74e1e6a63e2..95102d0eb74 100644 --- a/public/app/plugins/datasource/cloudwatch/migrations/variableQueryMigrations.ts +++ b/public/app/plugins/datasource/cloudwatch/migrations/variableQueryMigrations.ts @@ -1,6 +1,7 @@ import { omit } from 'lodash'; -import { Dimensions, VariableQuery, VariableQueryType, OldVariableQuery, MultiFilters } from '../types'; +import { Dimensions } from '../dataquery.gen'; +import { VariableQuery, VariableQueryType, OldVariableQuery, MultiFilters } from '../types'; const jsonVariable = /\${(\w+):json}/g; diff --git a/public/app/plugins/datasource/cloudwatch/mocks/Request.ts b/public/app/plugins/datasource/cloudwatch/mocks/Request.ts index dfcdfbeff0d..f466526c4cd 100644 --- a/public/app/plugins/datasource/cloudwatch/mocks/Request.ts +++ b/public/app/plugins/datasource/cloudwatch/mocks/Request.ts @@ -1,6 +1,7 @@ import { DataQueryRequest } from '@grafana/data'; -import { CloudWatchQuery, CloudWatchLogsQuery } from '../types'; +import { CloudWatchLogsQuery } from '../dataquery.gen'; +import { CloudWatchQuery } from '../types'; import { TimeRangeMock } from './timeRange'; diff --git a/public/app/plugins/datasource/cloudwatch/mocks/queries.ts b/public/app/plugins/datasource/cloudwatch/mocks/queries.ts index 82e6e3ef1ae..cdfca0cea3f 100644 --- a/public/app/plugins/datasource/cloudwatch/mocks/queries.ts +++ b/public/app/plugins/datasource/cloudwatch/mocks/queries.ts @@ -1,5 +1,10 @@ -import { QueryEditorExpressionType } from '../expressions'; -import { CloudWatchMetricsQuery, MetricQueryType, MetricEditorMode, CloudWatchLogsQuery } from '../types'; +import { + CloudWatchMetricsQuery, + MetricQueryType, + MetricEditorMode, + CloudWatchLogsQuery, + QueryEditorExpressionType, +} from '../dataquery.gen'; export const validMetricSearchCodeQuery: CloudWatchMetricsQuery = { id: '', diff --git a/public/app/plugins/datasource/cloudwatch/mocks/sqlUtils.ts b/public/app/plugins/datasource/cloudwatch/mocks/sqlUtils.ts index f593d43f4e4..ebc4edf07e2 100644 --- a/public/app/plugins/datasource/cloudwatch/mocks/sqlUtils.ts +++ b/public/app/plugins/datasource/cloudwatch/mocks/sqlUtils.ts @@ -2,13 +2,13 @@ import { QueryEditorExpression, QueryEditorExpressionType, QueryEditorArrayExpression, - QueryEditorOperatorExpression, QueryEditorPropertyType, QueryEditorGroupByExpression, QueryEditorFunctionExpression, QueryEditorFunctionParameterExpression, QueryEditorPropertyExpression, -} from '../expressions'; +} from '../dataquery.gen'; +import { QueryEditorOperatorExpression } from '../expressions'; export function createArray( expressions: QueryEditorExpression[], diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.test.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.test.ts index cac628cea6e..3e9105f82e1 100644 --- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.test.ts +++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.test.ts @@ -1,6 +1,6 @@ +import { CloudWatchAnnotationQuery } from '../dataquery.gen'; import { setupMockedAnnotationQueryRunner } from '../mocks/AnnotationQueryRunner'; import { namespaceVariable, regionVariable } from '../mocks/CloudWatchDataSource'; -import { CloudWatchAnnotationQuery } from '../types'; describe('CloudWatchAnnotationQueryRunner', () => { const queries: CloudWatchAnnotationQuery[] = [ diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.ts index 013d14bbd6f..a563cbbe9d7 100644 --- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.ts +++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.ts @@ -3,7 +3,8 @@ import { Observable } from 'rxjs'; import { DataQueryRequest, DataQueryResponse, DataSourceInstanceSettings } from '@grafana/data'; import { TemplateSrv } from '@grafana/runtime'; -import { CloudWatchAnnotationQuery, CloudWatchJsonData, CloudWatchQuery } from '../types'; +import { CloudWatchAnnotationQuery } from '../dataquery.gen'; +import { CloudWatchJsonData, CloudWatchQuery } from '../types'; import { CloudWatchRequest } from './CloudWatchRequest'; diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts index 8eee779cdcf..150a89aaad4 100644 --- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts +++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts @@ -10,12 +10,12 @@ import { LogRowModel, } from '@grafana/data'; +import { CloudWatchLogsAnomaliesQuery, CloudWatchLogsQuery, LogsMode } from '../dataquery.gen'; // Add this import statement import { logGroupNamesVariable, regionVariable } from '../mocks/CloudWatchDataSource'; import { setupMockedLogsQueryRunner } from '../mocks/LogsQueryRunner'; import { LogsRequestMock } from '../mocks/Request'; import { validLogsQuery } from '../mocks/queries'; import { TimeRangeMock } from '../mocks/timeRange'; -import { CloudWatchLogsAnomaliesQuery, CloudWatchLogsQuery, LogsMode } from '../types'; // Add this import statement import { LOGSTREAM_IDENTIFIER_INTERNAL, diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts index cd8e8b29f1c..470824f76c0 100644 --- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts +++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.ts @@ -38,17 +38,14 @@ import { type CustomFormatterVariable } from '@grafana/scenes'; import { GraphDrawStyle } from '@grafana/schema/dist/esm/index'; import { TableCellDisplayMode } from '@grafana/ui'; +import { CloudWatchLogsQuery, LogsMode, CloudWatchLogsAnomaliesQuery, LogsQueryLanguage } from '../dataquery.gen'; import { CloudWatchJsonData, - CloudWatchLogsAnomaliesQuery, - CloudWatchLogsQuery, CloudWatchLogsQueryStatus, CloudWatchLogsRequest, CloudWatchQuery, GetLogEventsRequest, LogAction, - LogsMode, - LogsQueryLanguage, QueryParam, StartQueryRequest, } from '../types'; diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts index 0234af74af8..59c84b7634c 100644 --- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts +++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts @@ -3,6 +3,7 @@ import { of } from 'rxjs'; import { dateTime, CustomVariableModel, getFrameDisplayName, VariableHide } from '@grafana/data'; import { toDataQueryResponse } from '@grafana/runtime'; +import { MetricQueryType, MetricEditorMode, CloudWatchMetricsQuery } from '../dataquery.gen'; import { namespaceVariable, metricVariable, @@ -15,7 +16,6 @@ import { import { initialVariableModelState } from '../mocks/CloudWatchVariables'; import { setupMockedMetricsQueryRunner } from '../mocks/MetricsQueryRunner'; import { validMetricSearchBuilderQuery, validMetricSearchCodeQuery } from '../mocks/queries'; -import { MetricQueryType, MetricEditorMode, CloudWatchMetricsQuery } from '../types'; jest.mock('@grafana/runtime', () => ({ ...jest.requireActual('@grafana/runtime'), diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.ts index 6560e3d4eed..852cfa93fd4 100644 --- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.ts +++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.ts @@ -17,9 +17,10 @@ import { import { TemplateSrv, getAppEvents } from '@grafana/runtime'; import { ThrottlingErrorMessage } from '../components/Errors/ThrottlingErrorMessage'; +import { CloudWatchMetricsQuery } from '../dataquery.gen'; import memoizedDebounce from '../memoizedDebounce'; import { migrateMetricQuery } from '../migrations/metricQueryMigrations'; -import { CloudWatchJsonData, CloudWatchMetricsQuery, CloudWatchQuery } from '../types'; +import { CloudWatchJsonData, CloudWatchQuery } from '../types'; import { filterMetricsQuery } from '../utils/utils'; import { CloudWatchRequest } from './CloudWatchRequest'; diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchRequest.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchRequest.ts index 460a2e7ee49..7a022e197c3 100644 --- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchRequest.ts +++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchRequest.ts @@ -3,8 +3,9 @@ import { Observable } from 'rxjs'; import { DataSourceInstanceSettings, DataSourceRef, getDataSourceRef, ScopedVars, AppEvents } from '@grafana/data'; import { BackendDataSourceResponse, FetchResponse, getBackendSrv, TemplateSrv, getAppEvents } from '@grafana/runtime'; +import { Dimensions } from '../dataquery.gen'; import memoizedDebounce from '../memoizedDebounce'; -import { CloudWatchJsonData, Dimensions, MetricRequest, MultiFilters } from '../types'; +import { CloudWatchJsonData, MetricRequest, MultiFilters } from '../types'; import { getVariableName } from '../utils/templateVariableUtils'; export abstract class CloudWatchRequest { diff --git a/public/app/plugins/datasource/cloudwatch/resources/types.ts b/public/app/plugins/datasource/cloudwatch/resources/types.ts index 290da62c171..83c3252561a 100644 --- a/public/app/plugins/datasource/cloudwatch/resources/types.ts +++ b/public/app/plugins/datasource/cloudwatch/resources/types.ts @@ -1,6 +1,6 @@ import { SelectableValue } from '@grafana/data'; -import { Dimensions } from '../types'; +import { Dimensions } from '../dataquery.gen'; export interface ResourceResponse { accountId?: string; diff --git a/public/app/plugins/datasource/cloudwatch/tracking.ts b/public/app/plugins/datasource/cloudwatch/tracking.ts index 51a4559ee1e..e2d863f3d64 100644 --- a/public/app/plugins/datasource/cloudwatch/tracking.ts +++ b/public/app/plugins/datasource/cloudwatch/tracking.ts @@ -1,19 +1,19 @@ import { DashboardLoadedEvent } from '@grafana/data'; import { config, reportInteraction } from '@grafana/runtime'; +import { + CloudWatchLogsQuery, + CloudWatchLogsAnomaliesQuery, + CloudWatchMetricsQuery, + LogsMode, + LogsQueryLanguage, + MetricQueryType, + MetricEditorMode, +} from './dataquery.gen'; import { isCloudWatchLogsQuery, isCloudWatchMetricsQuery, isLogsAnomaliesQuery } from './guards'; import { migrateMetricQuery } from './migrations/metricQueryMigrations'; import pluginJson from './plugin.json'; -import { - CloudWatchLogsAnomaliesQuery, - CloudWatchLogsQuery, - CloudWatchMetricsQuery, - CloudWatchQuery, - LogsMode, - LogsQueryLanguage, - MetricEditorMode, - MetricQueryType, -} from './types'; +import { CloudWatchQuery } from './types'; import { filterMetricsQuery } from './utils/utils'; type CloudWatchOnDashboardLoadedTrackingEvent = { diff --git a/public/app/plugins/datasource/cloudwatch/types.ts b/public/app/plugins/datasource/cloudwatch/types.ts index b774bfade40..f1e92d47cbd 100644 --- a/public/app/plugins/datasource/cloudwatch/types.ts +++ b/public/app/plugins/datasource/cloudwatch/types.ts @@ -4,8 +4,6 @@ import { DataQuery } from '@grafana/schema'; import * as raw from './dataquery.gen'; -export * from './dataquery.gen'; - export type CloudWatchQuery = | raw.CloudWatchMetricsQuery | raw.CloudWatchLogsQuery diff --git a/public/app/plugins/datasource/cloudwatch/utils/datalinks.ts b/public/app/plugins/datasource/cloudwatch/utils/datalinks.ts index e69ae4e4e17..16bfc81f70e 100644 --- a/public/app/plugins/datasource/cloudwatch/utils/datalinks.ts +++ b/public/app/plugins/datasource/cloudwatch/utils/datalinks.ts @@ -10,7 +10,8 @@ import { import { getDataSourceSrv } from '@grafana/runtime'; import { AwsUrl, encodeUrl } from '../aws_url'; -import { CloudWatchLogsQuery, CloudWatchQuery } from '../types'; +import { CloudWatchLogsQuery } from '../dataquery.gen'; +import { CloudWatchQuery } from '../types'; type ReplaceFn = ( target?: string, diff --git a/public/app/plugins/datasource/cloudwatch/utils/utils.ts b/public/app/plugins/datasource/cloudwatch/utils/utils.ts index b98751ce156..38fc50067a7 100644 --- a/public/app/plugins/datasource/cloudwatch/utils/utils.ts +++ b/public/app/plugins/datasource/cloudwatch/utils/utils.ts @@ -1,6 +1,6 @@ import { SelectableValue } from '@grafana/data'; -import { CloudWatchMetricsQuery, MetricQueryType, MetricEditorMode } from '../types'; +import { CloudWatchMetricsQuery, MetricQueryType, MetricEditorMode } from '../dataquery.gen'; import { CloudWatchDatasource } from './../datasource';