From ba76877d28088bb29db845ac32f8f8a9a9e9801c Mon Sep 17 00:00:00 2001 From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com> Date: Fri, 6 Aug 2021 03:24:35 -0400 Subject: [PATCH] Datasource: Pass access type to data source instance settings (#37577) * Pass Access info to datasourceInstance * Update packages/grafana-data/src/types/datasource.ts Co-authored-by: Giordano Ricci * Type access as direct | proxy * Fix tests where mocking datasourceInstance, include access * Pass access to data source instance mocks * Update comment * Pass access to data source instance mocks Co-authored-by: Giordano Ricci --- packages/grafana-data/src/types/datasource.ts | 1 + pkg/api/frontendsettings.go | 1 + .../internal/input-datasource/src/InputDatasource.test.ts | 1 + .../features/alerting/unified/RedirectToRuleViewer.test.tsx | 3 +++ public/app/features/alerting/unified/RuleViewer.test.tsx | 1 + public/app/features/alerting/unified/mocks.ts | 1 + public/app/features/alerting/unified/utils/query.test.ts | 1 + public/app/features/explore/Wrapper.test.tsx | 1 + public/app/features/expressions/ExpressionDatasource.ts | 1 + public/app/features/variables/shared/testing/helpers.ts | 1 + public/app/plugins/datasource/elasticsearch/datasource.test.ts | 1 + .../__mocks__/instanceSettings.ts | 1 + public/app/plugins/datasource/jaeger/datasource.test.ts | 1 + public/app/plugins/datasource/tempo/datasource.test.ts | 1 + public/app/plugins/datasource/zipkin/datasource.test.ts | 1 + 15 files changed, 17 insertions(+) diff --git a/packages/grafana-data/src/types/datasource.ts b/packages/grafana-data/src/types/datasource.ts index f7c66634966..a370e1a5913 100644 --- a/packages/grafana-data/src/types/datasource.ts +++ b/packages/grafana-data/src/types/datasource.ts @@ -599,6 +599,7 @@ export interface DataSourceInstanceSettings { type: 'x', name: 'xxx', meta: {} as PluginMeta, + access: 'proxy', jsonData: { data, }, diff --git a/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx b/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx index 5545495b87f..a8298cc5f3a 100644 --- a/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx +++ b/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx @@ -38,6 +38,7 @@ const mockRuleSourceByName = () => { id: 1, meta: {} as PluginMeta, jsonData: {} as DataSourceJsonData, + access: 'proxy', }); }; @@ -95,6 +96,7 @@ const mockedRules: CombinedRule[] = [ id: 1, meta: {} as PluginMeta, jsonData: {} as DataSourceJsonData, + access: 'proxy', }, }, }, @@ -123,6 +125,7 @@ const mockedRules: CombinedRule[] = [ id: 1, meta: {} as PluginMeta, jsonData: {} as DataSourceJsonData, + access: 'proxy', }, }, }, diff --git a/public/app/features/alerting/unified/RuleViewer.test.tsx b/public/app/features/alerting/unified/RuleViewer.test.tsx index ad6410cf1ef..71eacc65f22 100644 --- a/public/app/features/alerting/unified/RuleViewer.test.tsx +++ b/public/app/features/alerting/unified/RuleViewer.test.tsx @@ -122,6 +122,7 @@ const mockCloudRule = { id: 1, meta: {} as PluginMeta, jsonData: {} as DataSourceJsonData, + access: 'proxy', }, }, }; diff --git a/public/app/features/alerting/unified/mocks.ts b/public/app/features/alerting/unified/mocks.ts index 3cb8994ceff..70dc72ad90a 100644 --- a/public/app/features/alerting/unified/mocks.ts +++ b/public/app/features/alerting/unified/mocks.ts @@ -25,6 +25,7 @@ export const mockDataSource = ( uid: `mock-ds-${nextDataSourceId}`, type: 'prometheus', name: `Prometheus-${id}`, + access: 'proxy', jsonData: {}, meta: ({ info: { diff --git a/public/app/features/alerting/unified/utils/query.test.ts b/public/app/features/alerting/unified/utils/query.test.ts index 2e3de3deed8..1bd05f8c74a 100644 --- a/public/app/features/alerting/unified/utils/query.test.ts +++ b/public/app/features/alerting/unified/utils/query.test.ts @@ -50,6 +50,7 @@ describe('alertRuleToQueries', () => { type: 'prometheus', uid: 'asdf23', id: 1, + access: 'proxy', meta: {} as PluginMeta, jsonData: {} as DataSourceJsonData, }, diff --git a/public/app/features/explore/Wrapper.test.tsx b/public/app/features/explore/Wrapper.test.tsx index a70f4e2f006..7a6ed6decab 100644 --- a/public/app/features/explore/Wrapper.test.tsx +++ b/public/app/features/explore/Wrapper.test.tsx @@ -377,6 +377,7 @@ function makeDatasourceSetup({ name = 'loki', id = 1 }: { name?: string; id?: nu type: 'logs', name, meta, + access: 'proxy', jsonData: {}, }, api: { diff --git a/public/app/features/expressions/ExpressionDatasource.ts b/public/app/features/expressions/ExpressionDatasource.ts index 1500e304aca..82a988b2ce7 100644 --- a/public/app/features/expressions/ExpressionDatasource.ts +++ b/public/app/features/expressions/ExpressionDatasource.ts @@ -34,6 +34,7 @@ export const instanceSettings: DataSourceInstanceSettings = { uid: ExpressionDatasourceUID, name: ExpressionDatasourceID, type: 'grafana-expression', + access: 'proxy', meta: { baseUrl: '', module: '', diff --git a/public/app/features/variables/shared/testing/helpers.ts b/public/app/features/variables/shared/testing/helpers.ts index bf8df912e72..efc041b0af0 100644 --- a/public/app/features/variables/shared/testing/helpers.ts +++ b/public/app/features/variables/shared/testing/helpers.ts @@ -7,6 +7,7 @@ export function getDataSourceInstanceSetting(name: string, meta: DataSourcePlugi type: '', name, meta, + access: 'proxy', jsonData: ({} as unknown) as DataSourceJsonData, }; } diff --git a/public/app/plugins/datasource/elasticsearch/datasource.test.ts b/public/app/plugins/datasource/elasticsearch/datasource.test.ts index 153dcdbe773..7b2e28f3b49 100644 --- a/public/app/plugins/datasource/elasticsearch/datasource.test.ts +++ b/public/app/plugins/datasource/elasticsearch/datasource.test.ts @@ -100,6 +100,7 @@ function getTestContext({ name: 'test-elastic', type: 'type', uid: 'uid', + access: 'proxy', url: ELASTICSEARCH_MOCK_URL, database, jsonData, diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/instanceSettings.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/instanceSettings.ts index 6473078b17c..6857d6e0c5c 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/instanceSettings.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/instanceSettings.ts @@ -6,6 +6,7 @@ export const createMockInstanceSetttings = (): AzureDataSourceInstanceSettings = id: 1, uid: 'abc', type: 'azuremonitor', + access: 'proxy', meta: {} as DataSourcePluginMeta, name: 'azure', diff --git a/public/app/plugins/datasource/jaeger/datasource.test.ts b/public/app/plugins/datasource/jaeger/datasource.test.ts index cb846e0e8b1..cef92297731 100644 --- a/public/app/plugins/datasource/jaeger/datasource.test.ts +++ b/public/app/plugins/datasource/jaeger/datasource.test.ts @@ -215,6 +215,7 @@ const defaultSettings: DataSourceInstanceSettings = { type: 'tracing', name: 'jaeger', url: 'http://grafana.com', + access: 'proxy', meta: { id: 'jaeger', name: 'jaeger', diff --git a/public/app/plugins/datasource/tempo/datasource.test.ts b/public/app/plugins/datasource/tempo/datasource.test.ts index 8ceb5eb99c4..d7838b6f442 100644 --- a/public/app/plugins/datasource/tempo/datasource.test.ts +++ b/public/app/plugins/datasource/tempo/datasource.test.ts @@ -114,6 +114,7 @@ const defaultSettings: DataSourceInstanceSettings = { uid: '0', type: 'tracing', name: 'jaeger', + access: 'proxy', meta: { id: 'jaeger', name: 'jaeger', diff --git a/public/app/plugins/datasource/zipkin/datasource.test.ts b/public/app/plugins/datasource/zipkin/datasource.test.ts index c1cd6149df2..3d121e58963 100644 --- a/public/app/plugins/datasource/zipkin/datasource.test.ts +++ b/public/app/plugins/datasource/zipkin/datasource.test.ts @@ -67,4 +67,5 @@ const defaultSettings: DataSourceInstanceSettings = { name: 'zipkin', meta: {} as any, jsonData: {}, + access: 'proxy', };