From 99750e42c9bd3ffc06a1ab2042205042f7a220c2 Mon Sep 17 00:00:00 2001 From: spalger Date: Fri, 22 Jul 2022 12:50:22 -0700 Subject: [PATCH 1/2] [inspector] remove root-level redirect to common --- packages/kbn-eslint-config/.eslintrc.js | 5 +++++ src/plugins/inspector/index.ts | 9 --------- 2 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 src/plugins/inspector/index.ts diff --git a/packages/kbn-eslint-config/.eslintrc.js b/packages/kbn-eslint-config/.eslintrc.js index f8db0bf504cf8..c22a3e08134a0 100644 --- a/packages/kbn-eslint-config/.eslintrc.js +++ b/packages/kbn-eslint-config/.eslintrc.js @@ -108,6 +108,11 @@ module.exports = { to: '@kbn/utility-types-jest', disallowedMessage: `import from @kbn/utility-types-jest instead` }, + { + from: '@kbn/inspector-plugin', + to: '@kbn/inspector-plugin/common', + exact: true, + }, ], ], diff --git a/src/plugins/inspector/index.ts b/src/plugins/inspector/index.ts deleted file mode 100644 index 16d45459af845..0000000000000 --- a/src/plugins/inspector/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0 and the Server Side Public License, v 1; you may not use this file except - * in compliance with, at your election, the Elastic License 2.0 or the Server - * Side Public License, v 1. - */ - -export * from './common'; From 67f22c0520bcfba156018267a94fd1cee145abb1 Mon Sep 17 00:00:00 2001 From: spalger Date: Fri, 22 Jul 2022 12:50:42 -0700 Subject: [PATCH 2/2] autofix all imports --- .../main/components/layout/__stories__/get_layout_props.ts | 2 +- .../application/main/components/layout/discover_layout.test.tsx | 2 +- .../discover/public/application/main/components/layout/types.ts | 2 +- .../discover/public/application/main/utils/fetch_all.test.ts | 2 +- src/plugins/discover/public/application/main/utils/fetch_all.ts | 2 +- .../discover/public/application/main/utils/fetch_chart.test.ts | 2 +- .../public/application/main/utils/fetch_documents.test.ts | 2 +- .../public/application/main/utils/fetch_total_hits.test.ts | 2 +- src/plugins/vis_types/timeseries/public/request_handler.ts | 2 +- src/plugins/visualizations/public/vis_types/types.ts | 2 +- .../lib/helpers/create_es_client/call_async_with_debug.ts | 2 +- .../canvas/canvas_plugin_src/functions/common/csv.test.ts | 2 +- .../canvas_plugin_src/functions/common/dropdown_control.test.ts | 2 +- .../plugins/observability/common/utils/get_inspect_response.ts | 2 +- x-pack/plugins/observability/typings/common.ts | 2 +- x-pack/plugins/synthetics/server/legacy_uptime/lib/lib.ts | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/plugins/discover/public/application/main/components/layout/__stories__/get_layout_props.ts b/src/plugins/discover/public/application/main/components/layout/__stories__/get_layout_props.ts index b0e12b3bcd7d2..7aea5b191a36e 100644 --- a/src/plugins/discover/public/application/main/components/layout/__stories__/get_layout_props.ts +++ b/src/plugins/discover/public/application/main/components/layout/__stories__/get_layout_props.ts @@ -9,7 +9,7 @@ import { DataView, DataViewAttributes, SavedObject } from '@kbn/data-views-plugin/common'; import { SearchSource } from '@kbn/data-plugin/common'; import { BehaviorSubject, Subject } from 'rxjs'; -import { RequestAdapter } from '@kbn/inspector-plugin'; +import { RequestAdapter } from '@kbn/inspector-plugin/common'; import { action } from '@storybook/addon-actions'; import { FetchStatus } from '../../../../types'; import { diff --git a/src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx b/src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx index 4aff6e2a78070..e0fc90a83b296 100644 --- a/src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx +++ b/src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx @@ -29,7 +29,7 @@ import { } from '../../hooks/use_saved_search'; import { discoverServiceMock } from '../../../../__mocks__/services'; import { FetchStatus } from '../../../types'; -import { RequestAdapter } from '@kbn/inspector-plugin'; +import { RequestAdapter } from '@kbn/inspector-plugin/common'; import { Chart } from '../chart/point_series'; import { DiscoverSidebar } from '../sidebar/discover_sidebar'; import { LocalStorageMock } from '../../../../__mocks__/local_storage_mock'; diff --git a/src/plugins/discover/public/application/main/components/layout/types.ts b/src/plugins/discover/public/application/main/components/layout/types.ts index f381f87c7389d..26bb24c866c78 100644 --- a/src/plugins/discover/public/application/main/components/layout/types.ts +++ b/src/plugins/discover/public/application/main/components/layout/types.ts @@ -10,7 +10,7 @@ import type { Query, TimeRange } from '@kbn/es-query'; import type { SavedObject } from '@kbn/data-plugin/public'; import type { DataView, DataViewAttributes } from '@kbn/data-views-plugin/public'; import { ISearchSource } from '@kbn/data-plugin/public'; -import { RequestAdapter } from '@kbn/inspector-plugin'; +import { RequestAdapter } from '@kbn/inspector-plugin/common'; import { DataTableRecord } from '../../../../types'; import { AppState, GetStateReturn } from '../../services/discover_state'; import { DataRefetch$, SavedSearchData } from '../../hooks/use_saved_search'; diff --git a/src/plugins/discover/public/application/main/utils/fetch_all.test.ts b/src/plugins/discover/public/application/main/utils/fetch_all.test.ts index e33d931c571da..581fe265ea3e8 100644 --- a/src/plugins/discover/public/application/main/utils/fetch_all.test.ts +++ b/src/plugins/discover/public/application/main/utils/fetch_all.test.ts @@ -9,7 +9,7 @@ import { FetchStatus } from '../../types'; import { BehaviorSubject, firstValueFrom, Subject } from 'rxjs'; import { reduce } from 'rxjs/operators'; import { SearchSource } from '@kbn/data-plugin/public'; -import { RequestAdapter } from '@kbn/inspector-plugin'; +import { RequestAdapter } from '@kbn/inspector-plugin/common'; import { savedSearchMock } from '../../../__mocks__/saved_search'; import { ReduxLikeStateContainer } from '@kbn/kibana-utils-plugin/common'; import { AppState } from '../services/discover_state'; diff --git a/src/plugins/discover/public/application/main/utils/fetch_all.ts b/src/plugins/discover/public/application/main/utils/fetch_all.ts index 655027dddbf1e..bf623c3ad07df 100644 --- a/src/plugins/discover/public/application/main/utils/fetch_all.ts +++ b/src/plugins/discover/public/application/main/utils/fetch_all.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ import { DataPublicPluginStart, ISearchSource } from '@kbn/data-plugin/public'; -import { Adapters } from '@kbn/inspector-plugin'; +import { Adapters } from '@kbn/inspector-plugin/common'; import { ReduxLikeStateContainer } from '@kbn/kibana-utils-plugin/common'; import { DataViewType } from '@kbn/data-views-plugin/public'; import { buildDataTableRecord } from '../../../utils/build_data_record'; diff --git a/src/plugins/discover/public/application/main/utils/fetch_chart.test.ts b/src/plugins/discover/public/application/main/utils/fetch_chart.test.ts index 6a5ce76c2e66a..64e203b951190 100644 --- a/src/plugins/discover/public/application/main/utils/fetch_chart.test.ts +++ b/src/plugins/discover/public/application/main/utils/fetch_chart.test.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ import { of, throwError as throwErrorRx } from 'rxjs'; -import { RequestAdapter } from '@kbn/inspector-plugin'; +import { RequestAdapter } from '@kbn/inspector-plugin/common'; import { savedSearchMockWithTimeField } from '../../../__mocks__/saved_search'; import { fetchChart, updateSearchSource } from './fetch_chart'; import { ReduxLikeStateContainer } from '@kbn/kibana-utils-plugin/common'; diff --git a/src/plugins/discover/public/application/main/utils/fetch_documents.test.ts b/src/plugins/discover/public/application/main/utils/fetch_documents.test.ts index 5796c488dd8fb..2dc34d1a53a23 100644 --- a/src/plugins/discover/public/application/main/utils/fetch_documents.test.ts +++ b/src/plugins/discover/public/application/main/utils/fetch_documents.test.ts @@ -7,7 +7,7 @@ */ import { fetchDocuments } from './fetch_documents'; import { throwError as throwErrorRx, of } from 'rxjs'; -import { RequestAdapter } from '@kbn/inspector-plugin'; +import { RequestAdapter } from '@kbn/inspector-plugin/common'; import { savedSearchMock, savedSearchMockWithTimeField } from '../../../__mocks__/saved_search'; import { discoverServiceMock } from '../../../__mocks__/services'; import { IKibanaSearchResponse } from '@kbn/data-plugin/public'; diff --git a/src/plugins/discover/public/application/main/utils/fetch_total_hits.test.ts b/src/plugins/discover/public/application/main/utils/fetch_total_hits.test.ts index f0e079e146753..f88e9b3d7fc5d 100644 --- a/src/plugins/discover/public/application/main/utils/fetch_total_hits.test.ts +++ b/src/plugins/discover/public/application/main/utils/fetch_total_hits.test.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ import { throwError as throwErrorRx, of } from 'rxjs'; -import { RequestAdapter } from '@kbn/inspector-plugin'; +import { RequestAdapter } from '@kbn/inspector-plugin/common'; import { savedSearchMock, savedSearchMockWithTimeField } from '../../../__mocks__/saved_search'; import { fetchTotalHits } from './fetch_total_hits'; import { discoverServiceMock } from '../../../__mocks__/services'; diff --git a/src/plugins/vis_types/timeseries/public/request_handler.ts b/src/plugins/vis_types/timeseries/public/request_handler.ts index d963fc76b5ead..e4c4f62fe6641 100644 --- a/src/plugins/vis_types/timeseries/public/request_handler.ts +++ b/src/plugins/vis_types/timeseries/public/request_handler.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ import type { KibanaExecutionContext } from '@kbn/core/public'; -import type { Adapters } from '@kbn/inspector-plugin'; +import type { Adapters } from '@kbn/inspector-plugin/common'; import { KibanaContext, handleResponse } from '@kbn/data-plugin/public'; import { getTimezone } from './application/lib/get_timezone'; import { getUISettings, getDataStart, getCoreStart } from './services'; diff --git a/src/plugins/visualizations/public/vis_types/types.ts b/src/plugins/visualizations/public/vis_types/types.ts index 970a9c1d730fb..4267e6a0d8aef 100644 --- a/src/plugins/visualizations/public/vis_types/types.ts +++ b/src/plugins/visualizations/public/vis_types/types.ts @@ -9,7 +9,7 @@ import type { IconType } from '@elastic/eui'; import type { ReactNode } from 'react'; import type { PaletteOutput } from '@kbn/coloring'; -import type { Adapters } from '@kbn/inspector-plugin'; +import type { Adapters } from '@kbn/inspector-plugin/common'; import type { Query } from '@kbn/es-query'; import type { AggGroupNames, AggParam, AggGroupName } from '@kbn/data-plugin/public'; import type { DataView } from '@kbn/data-views-plugin/public'; diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_async_with_debug.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_async_with_debug.ts index 241814e433b62..a401acafd01d9 100644 --- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_async_with_debug.ts +++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_async_with_debug.ts @@ -9,7 +9,7 @@ import chalk from 'chalk'; import { KibanaRequest } from '@kbn/core/server'; -import { RequestStatus } from '@kbn/inspector-plugin'; +import { RequestStatus } from '@kbn/inspector-plugin/common'; import { WrappedElasticsearchClientError } from '@kbn/observability-plugin/server'; import { getInspectResponse } from '@kbn/observability-plugin/server'; import { inspectableEsQueriesMap } from '../../../routes/apm_routes/register_apm_server_routes'; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.ts index 06de11353edaf..e145030c7c8e4 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.ts +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.ts @@ -10,7 +10,7 @@ import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib'; import { getFunctionErrors } from '../../../i18n'; import { csv } from './csv'; import { Datatable, ExecutionContext } from '@kbn/expressions-plugin'; -import { Adapters } from '@kbn/inspector-plugin'; +import { Adapters } from '@kbn/inspector-plugin/common'; const errors = getFunctionErrors().csv; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.ts index 6c95160222016..8e302c0e29803 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.ts +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.ts @@ -9,7 +9,7 @@ import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib'; import { testTable, relationalTable } from './__fixtures__/test_tables'; import { dropdownControl } from './dropdownControl'; import { ExecutionContext } from '@kbn/expressions-plugin'; -import { Adapters } from '@kbn/inspector-plugin'; +import { Adapters } from '@kbn/inspector-plugin/common'; import { SerializableRecord } from '@kbn/utility-types'; describe('dropdownControl', () => { diff --git a/x-pack/plugins/observability/common/utils/get_inspect_response.ts b/x-pack/plugins/observability/common/utils/get_inspect_response.ts index dbd0cd68736db..cfcfceb72752f 100644 --- a/x-pack/plugins/observability/common/utils/get_inspect_response.ts +++ b/x-pack/plugins/observability/common/utils/get_inspect_response.ts @@ -8,7 +8,7 @@ import { i18n } from '@kbn/i18n'; // eslint-disable-next-line @kbn/eslint/no-restricted-paths import type { KibanaRequest } from '@kbn/core/server'; -import type { RequestStatistics, RequestStatus } from '@kbn/inspector-plugin'; +import type { RequestStatistics, RequestStatus } from '@kbn/inspector-plugin/common'; import { InspectResponse } from '../../typings/common'; import { WrappedElasticsearchClientError } from './unwrap_es_response'; diff --git a/x-pack/plugins/observability/typings/common.ts b/x-pack/plugins/observability/typings/common.ts index 1904728896d82..df51061b56a5c 100644 --- a/x-pack/plugins/observability/typings/common.ts +++ b/x-pack/plugins/observability/typings/common.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { Request } from '@kbn/inspector-plugin'; +import { Request } from '@kbn/inspector-plugin/common'; export type ObservabilityApp = | 'infra_metrics' diff --git a/x-pack/plugins/synthetics/server/legacy_uptime/lib/lib.ts b/x-pack/plugins/synthetics/server/legacy_uptime/lib/lib.ts index dfc040bc974a6..fc6b570b034b9 100644 --- a/x-pack/plugins/synthetics/server/legacy_uptime/lib/lib.ts +++ b/x-pack/plugins/synthetics/server/legacy_uptime/lib/lib.ts @@ -9,7 +9,7 @@ import { ElasticsearchClient, SavedObjectsClientContract, KibanaRequest } from ' import chalk from 'chalk'; import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey'; import { ESSearchResponse } from '@kbn/core/types/elasticsearch'; -import { RequestStatus } from '@kbn/inspector-plugin'; +import { RequestStatus } from '@kbn/inspector-plugin/common'; import { getInspectResponse } from '@kbn/observability-plugin/server'; import { InspectResponse } from '@kbn/observability-plugin/typings/common'; import { UMLicenseCheck } from './domains';