IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

CloudWatch: Call query method from DataSourceWithBackend to support public dashboards (#77532)

Browse Source 
* CloudWatch: call query method from DataSourceWithBackend to support public dashboards

* add test

* remove unneeded properties from test case

* update betterer

* add parens to group related logic

* remove unnecessary aliasing of variable

* use t.Cleanup

* remove redundant check

* add comment
This commit is contained in:
Kevin Yu
2023-11-20 14:44:22 -08:00
committed by GitHub
parent efdfa29fe2
commit 7f7d912af7
21 changed files with 354 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
public/app/plugins/datasource/cloudwatch/__mocks__/MetricsQueryRunner.ts
View File

@@ -1,7 +1,7 @@
import { of, throwError } from 'rxjs';
import { CustomVariableModel, DataQueryError, DataQueryRequest, DataSourceInstanceSettings } from '@grafana/data';
import { BackendDataSourceResponse, getBackendSrv, setBackendSrv } from '@grafana/runtime';
import { BackendDataSourceResponse, toDataQueryResponse } from '@grafana/runtime';
import { TemplateSrv } from 'app/features/templating/template_srv';
import { CloudWatchMetricsQueryRunner } from '../query-runner/CloudWatchMetricsQueryRunner';
@@ -16,13 +16,13 @@ export function setupMockedMetricsQueryRunner({
},
variables,
mockGetVariableName = true,
throws = false,
errorResponse,
instanceSettings = CloudWatchSettings,
}: {
data?: BackendDataSourceResponse | DataQueryError;
data?: BackendDataSourceResponse;
variables?: CustomVariableModel[];
mockGetVariableName?: boolean;
throws?: boolean;
errorResponse?: DataQueryError;
instanceSettings?: DataSourceInstanceSettings<CloudWatchJsonData>;
} = {}) {
let templateService = new TemplateSrv();
@@ -33,15 +33,10 @@ export function setupMockedMetricsQueryRunner({
}
}
const runner = new CloudWatchMetricsQueryRunner(instanceSettings, templateService);
const fetchMock = throws
? jest.fn().mockImplementation(() => throwError(data))
: jest.fn().mockReturnValue(of({ data }));
setBackendSrv({
...getBackendSrv(),
fetch: fetchMock,
});
const queryMock = errorResponse
? jest.fn().mockImplementation(() => throwError(errorResponse))
: jest.fn().mockReturnValue(of(toDataQueryResponse({ data })));
const runner = new CloudWatchMetricsQueryRunner(instanceSettings, templateService, queryMock);
const request: DataQueryRequest<CloudWatchQuery> = {
range: TimeRangeMock,
@@ -56,5 +51,5 @@ export function setupMockedMetricsQueryRunner({
startTime: 0,
};
return { runner, fetchMock, templateService, instanceSettings, request, timeRange: TimeRangeMock };
return { runner, queryMock, templateService, instanceSettings, request, timeRange: TimeRangeMock };
}