From 16d55feb0e3d34b1e74e742085aa6e503d564747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?= Date: Fri, 30 Aug 2024 00:05:35 +0200 Subject: [PATCH] [Move `@kbn/config-schema` to server] `data` --- src/plugins/data/config.mock.ts | 2 +- src/plugins/data/public/index.ts | 2 +- src/plugins/data/public/plugin.ts | 2 +- .../data/public/search/search_interceptor/search_interceptor.ts | 2 +- src/plugins/data/public/search/search_service.ts | 2 +- src/plugins/data/public/search/session/session_service.ts | 2 +- .../public/search/session/sessions_mgmt/application/index.tsx | 2 +- .../search/session/sessions_mgmt/components/main.test.tsx | 2 +- .../public/search/session/sessions_mgmt/components/main.tsx | 2 +- .../session/sessions_mgmt/components/table/table.test.tsx | 2 +- .../search/session/sessions_mgmt/components/table/table.tsx | 2 +- src/plugins/data/public/search/session/sessions_mgmt/index.ts | 2 +- .../data/public/search/session/sessions_mgmt/lib/api.test.ts | 2 +- src/plugins/data/public/search/session/sessions_mgmt/lib/api.ts | 2 +- .../search/session/sessions_mgmt/lib/get_columns.test.tsx | 2 +- .../public/search/session/sessions_mgmt/lib/get_columns.tsx | 2 +- .../search/session/sessions_mgmt/lib/get_expiration_status.ts | 2 +- src/plugins/data/{ => server}/config.ts | 0 src/plugins/data/server/index.ts | 2 +- src/plugins/data/server/plugin.ts | 2 +- src/plugins/data/server/search/search_service.ts | 2 +- .../data/server/search/session/get_session_status.test.ts | 2 +- src/plugins/data/server/search/session/get_session_status.ts | 2 +- src/plugins/data/server/search/session/mocks.ts | 2 +- src/plugins/data/server/search/session/session_service.test.ts | 2 +- src/plugins/data/server/search/session/session_service.ts | 2 +- src/plugins/data/server/search/session/types.ts | 2 +- src/plugins/data/server/search/strategies/common/async_utils.ts | 2 +- .../server/search/strategies/eql_search/eql_search_strategy.ts | 2 +- .../server/search/strategies/ese_search/ese_search_strategy.ts | 2 +- .../data/server/search/strategies/ese_search/request_utils.ts | 2 +- .../strategies/esql_async_search/esql_async_search_strategy.ts | 2 +- .../data/server/search/strategies/sql_search/request_utils.ts | 2 +- .../server/search/strategies/sql_search/sql_search_strategy.ts | 2 +- src/plugins/data/tsconfig.json | 1 - 35 files changed, 33 insertions(+), 34 deletions(-) rename src/plugins/data/{ => server}/config.ts (100%) diff --git a/src/plugins/data/config.mock.ts b/src/plugins/data/config.mock.ts index ab1d02cb63b3..b7c41754dc24 100644 --- a/src/plugins/data/config.mock.ts +++ b/src/plugins/data/config.mock.ts @@ -7,7 +7,7 @@ */ import moment from 'moment/moment'; -import { SearchConfigSchema, SearchSessionsConfigSchema } from './config'; +import type { SearchConfigSchema, SearchSessionsConfigSchema } from './server/config'; export const getMockSearchConfig = ({ sessions: { enabled = true, defaultExpiration = moment.duration(7, 'd') } = { diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts index fa03dc95f564..09f3226eef57 100644 --- a/src/plugins/data/public/index.ts +++ b/src/plugins/data/public/index.ts @@ -7,7 +7,7 @@ */ import { PluginInitializerContext } from '@kbn/core/public'; -import { ConfigSchema } from '../config'; +import type { ConfigSchema } from '../server/config'; /* * Filters: diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts index 530cbe978c3d..8e0eea12ed16 100644 --- a/src/plugins/data/public/plugin.ts +++ b/src/plugins/data/public/plugin.ts @@ -14,7 +14,7 @@ import { IStorageWrapper, createStartServicesGetter, } from '@kbn/kibana-utils-plugin/public'; -import { ConfigSchema } from '../config'; +import type { ConfigSchema } from '../server/config'; import type { DataPublicPluginSetup, DataPublicPluginStart, diff --git a/src/plugins/data/public/search/search_interceptor/search_interceptor.ts b/src/plugins/data/public/search/search_interceptor/search_interceptor.ts index 7f54c63592b1..95573127fdc9 100644 --- a/src/plugins/data/public/search/search_interceptor/search_interceptor.ts +++ b/src/plugins/data/public/search/search_interceptor/search_interceptor.ts @@ -73,7 +73,7 @@ import { toPartialResponseAfterTimeout } from './to_partial_response'; import { ISessionService, SearchSessionState } from '../session'; import { SearchResponseCache } from './search_response_cache'; import { SearchAbortController } from './search_abort_controller'; -import { SearchConfigSchema } from '../../../config'; +import type { SearchConfigSchema } from '../../../server/config'; import type { SearchServiceStartDependencies } from '../search_service'; import { createRequestHash } from './create_request_hash'; diff --git a/src/plugins/data/public/search/search_service.ts b/src/plugins/data/public/search/search_service.ts index 0bdc33cb5930..07afdc0514c5 100644 --- a/src/plugins/data/public/search/search_service.ts +++ b/src/plugins/data/public/search/search_service.ts @@ -62,7 +62,7 @@ import { SHARD_DELAY_AGG_NAME, } from '../../common/search/aggs/buckets/shard_delay'; import { aggShardDelay } from '../../common/search/aggs/buckets/shard_delay_fn'; -import { ConfigSchema } from '../../config'; +import type { ConfigSchema } from '../../server/config'; import { NowProviderInternalContract } from '../now_provider'; import { DataPublicPluginStart, DataStartDependencies } from '../types'; import { AggsService } from './aggs'; diff --git a/src/plugins/data/public/search/session/session_service.ts b/src/plugins/data/public/search/session/session_service.ts index 5b936fb72a88..b3c3e94f18b5 100644 --- a/src/plugins/data/public/search/session/session_service.ts +++ b/src/plugins/data/public/search/session/session_service.ts @@ -39,7 +39,7 @@ import { i18n } from '@kbn/i18n'; import moment from 'moment'; import { ISearchOptions } from '@kbn/search-types'; import { SearchUsageCollector } from '../..'; -import { ConfigSchema } from '../../../config'; +import type { ConfigSchema } from '../../../server/config'; import type { SessionMeta, SessionStateContainer, diff --git a/src/plugins/data/public/search/session/sessions_mgmt/application/index.tsx b/src/plugins/data/public/search/session/sessions_mgmt/application/index.tsx index b0a15ca40574..b0c4330c35e5 100644 --- a/src/plugins/data/public/search/session/sessions_mgmt/application/index.tsx +++ b/src/plugins/data/public/search/session/sessions_mgmt/application/index.tsx @@ -17,7 +17,7 @@ import { APP } from '..'; import { SearchSessionsMgmtAPI } from '../lib/api'; import { AsyncSearchIntroDocumentation } from '../lib/documentation'; import { renderApp } from './render'; -import { SearchSessionsConfigSchema } from '../../../../../config'; +import type { SearchSessionsConfigSchema } from '../../../../../server/config'; export class SearchSessionsMgmtApp { constructor( diff --git a/src/plugins/data/public/search/session/sessions_mgmt/components/main.test.tsx b/src/plugins/data/public/search/session/sessions_mgmt/components/main.test.tsx index 38ccbb9646de..97b446cae47c 100644 --- a/src/plugins/data/public/search/session/sessions_mgmt/components/main.test.tsx +++ b/src/plugins/data/public/search/session/sessions_mgmt/components/main.test.tsx @@ -20,7 +20,7 @@ import { LocaleWrapper } from '../__mocks__'; import { SearchSessionsMgmtMain } from './main'; import { SharePluginStart } from '@kbn/share-plugin/public'; import { sharePluginMock } from '@kbn/share-plugin/public/mocks'; -import { SearchSessionsConfigSchema } from '../../../../../config'; +import type { SearchSessionsConfigSchema } from '../../../../../server/config'; import { createSearchUsageCollectorMock } from '../../../collectors/mocks'; let mockCoreSetup: MockedKeys; diff --git a/src/plugins/data/public/search/session/sessions_mgmt/components/main.tsx b/src/plugins/data/public/search/session/sessions_mgmt/components/main.tsx index 009e3ce7d9b0..af5e1c3bc9a8 100644 --- a/src/plugins/data/public/search/session/sessions_mgmt/components/main.tsx +++ b/src/plugins/data/public/search/session/sessions_mgmt/components/main.tsx @@ -14,7 +14,7 @@ import type { SearchSessionsMgmtAPI } from '../lib/api'; import type { AsyncSearchIntroDocumentation } from '../lib/documentation'; import { SearchSessionsMgmtTable } from './table'; import { SearchSessionsDeprecatedWarning } from '../../search_sessions_deprecation_message'; -import { SearchSessionsConfigSchema } from '../../../../../config'; +import type { SearchSessionsConfigSchema } from '../../../../../server/config'; import { SearchUsageCollector } from '../../../collectors'; interface Props { diff --git a/src/plugins/data/public/search/session/sessions_mgmt/components/table/table.test.tsx b/src/plugins/data/public/search/session/sessions_mgmt/components/table/table.test.tsx index 6394deeab843..efe35f206dc5 100644 --- a/src/plugins/data/public/search/session/sessions_mgmt/components/table/table.test.tsx +++ b/src/plugins/data/public/search/session/sessions_mgmt/components/table/table.test.tsx @@ -20,7 +20,7 @@ import { LocaleWrapper } from '../../__mocks__'; import { SearchSessionsMgmtTable } from './table'; import { SharePluginStart } from '@kbn/share-plugin/public'; import { sharePluginMock } from '@kbn/share-plugin/public/mocks'; -import { SearchSessionsConfigSchema } from '../../../../../../config'; +import type { SearchSessionsConfigSchema } from '../../../../../../server/config'; import { createSearchUsageCollectorMock } from '../../../../collectors/mocks'; let mockCoreSetup: MockedKeys; diff --git a/src/plugins/data/public/search/session/sessions_mgmt/components/table/table.tsx b/src/plugins/data/public/search/session/sessions_mgmt/components/table/table.tsx index 833ad3ec7e75..649a3d4316a5 100644 --- a/src/plugins/data/public/search/session/sessions_mgmt/components/table/table.tsx +++ b/src/plugins/data/public/search/session/sessions_mgmt/components/table/table.tsx @@ -21,7 +21,7 @@ import { OnActionComplete } from '../actions'; import { getAppFilter } from './app_filter'; import { getStatusFilter } from './status_filter'; import { SearchUsageCollector } from '../../../../collectors'; -import { SearchSessionsConfigSchema } from '../../../../../../config'; +import type { SearchSessionsConfigSchema } from '../../../../../../server/config'; interface Props { core: CoreStart; diff --git a/src/plugins/data/public/search/session/sessions_mgmt/index.ts b/src/plugins/data/public/search/session/sessions_mgmt/index.ts index 7b95305f6e56..59437bf27b6e 100644 --- a/src/plugins/data/public/search/session/sessions_mgmt/index.ts +++ b/src/plugins/data/public/search/session/sessions_mgmt/index.ts @@ -15,7 +15,7 @@ import type { ISessionsClient, SearchUsageCollector } from '../../..'; import { SEARCH_SESSIONS_MANAGEMENT_ID } from '../constants'; import type { SearchSessionsMgmtAPI } from './lib/api'; import type { AsyncSearchIntroDocumentation } from './lib/documentation'; -import { SearchSessionsConfigSchema } from '../../../../config'; +import type { SearchSessionsConfigSchema } from '../../../../server/config'; export interface IManagementSectionsPluginsSetup { management: ManagementSetup; diff --git a/src/plugins/data/public/search/session/sessions_mgmt/lib/api.test.ts b/src/plugins/data/public/search/session/sessions_mgmt/lib/api.test.ts index 52b72afd30ab..a765bb8a0a2d 100644 --- a/src/plugins/data/public/search/session/sessions_mgmt/lib/api.test.ts +++ b/src/plugins/data/public/search/session/sessions_mgmt/lib/api.test.ts @@ -16,7 +16,7 @@ import { SearchSessionStatus } from '../../../../../common'; import { sharePluginMock } from '@kbn/share-plugin/public/mocks'; import { SharePluginStart } from '@kbn/share-plugin/public'; import { SearchSessionsMgmtAPI } from './api'; -import { SearchSessionsConfigSchema } from '../../../../../config'; +import type { SearchSessionsConfigSchema } from '../../../../../server/config'; let mockCoreSetup: MockedKeys; let mockCoreStart: MockedKeys; diff --git a/src/plugins/data/public/search/session/sessions_mgmt/lib/api.ts b/src/plugins/data/public/search/session/sessions_mgmt/lib/api.ts index f5abbc4c77de..5c426942034f 100644 --- a/src/plugins/data/public/search/session/sessions_mgmt/lib/api.ts +++ b/src/plugins/data/public/search/session/sessions_mgmt/lib/api.ts @@ -22,7 +22,7 @@ import { import { ISessionsClient } from '../../sessions_client'; import { SearchUsageCollector } from '../../../collectors'; import { SearchSessionsFindResponse, SearchSessionStatus } from '../../../../../common'; -import { SearchSessionsConfigSchema } from '../../../../../config'; +import type { SearchSessionsConfigSchema } from '../../../../../server/config'; type LocatorsStart = SharePluginStart['url']['locators']; diff --git a/src/plugins/data/public/search/session/sessions_mgmt/lib/get_columns.test.tsx b/src/plugins/data/public/search/session/sessions_mgmt/lib/get_columns.test.tsx index 3fd53ccfddec..643cd6b6286f 100644 --- a/src/plugins/data/public/search/session/sessions_mgmt/lib/get_columns.test.tsx +++ b/src/plugins/data/public/search/session/sessions_mgmt/lib/get_columns.test.tsx @@ -21,7 +21,7 @@ import { SearchSessionsMgmtAPI } from './api'; import { getColumns } from './get_columns'; import { SharePluginStart } from '@kbn/share-plugin/public'; import { sharePluginMock } from '@kbn/share-plugin/public/mocks'; -import { SearchSessionsConfigSchema } from '../../../../../config'; +import type { SearchSessionsConfigSchema } from '../../../../../server/config'; import { createSearchUsageCollectorMock } from '../../../collectors/mocks'; let mockCoreSetup: MockedKeys; diff --git a/src/plugins/data/public/search/session/sessions_mgmt/lib/get_columns.tsx b/src/plugins/data/public/search/session/sessions_mgmt/lib/get_columns.tsx index 371ffac111e8..07862651f60a 100644 --- a/src/plugins/data/public/search/session/sessions_mgmt/lib/get_columns.tsx +++ b/src/plugins/data/public/search/session/sessions_mgmt/lib/get_columns.tsx @@ -30,7 +30,7 @@ import { SearchSessionsMgmtAPI } from './api'; import { getExpirationStatus } from './get_expiration_status'; import { UISession } from '../types'; import { SearchUsageCollector } from '../../../collectors'; -import { SearchSessionsConfigSchema } from '../../../../../config'; +import type { SearchSessionsConfigSchema } from '../../../../../server/config'; // Helper function: translate an app string to EuiIcon-friendly string const appToIcon = (app: string) => { diff --git a/src/plugins/data/public/search/session/sessions_mgmt/lib/get_expiration_status.ts b/src/plugins/data/public/search/session/sessions_mgmt/lib/get_expiration_status.ts index cde183f569f9..b80b315aaea8 100644 --- a/src/plugins/data/public/search/session/sessions_mgmt/lib/get_expiration_status.ts +++ b/src/plugins/data/public/search/session/sessions_mgmt/lib/get_expiration_status.ts @@ -8,7 +8,7 @@ import { i18n } from '@kbn/i18n'; import moment from 'moment'; -import { SearchSessionsConfigSchema } from '../../../../../config'; +import type { SearchSessionsConfigSchema } from '../../../../../server/config'; export const getExpirationStatus = (config: SearchSessionsConfigSchema, expires: string | null) => { const tNow = moment.utc().valueOf(); diff --git a/src/plugins/data/config.ts b/src/plugins/data/server/config.ts similarity index 100% rename from src/plugins/data/config.ts rename to src/plugins/data/server/config.ts diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts index 7a41c20094d6..e9292342f917 100644 --- a/src/plugins/data/server/index.ts +++ b/src/plugins/data/server/index.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server'; -import { ConfigSchema, configSchema } from '../config'; +import { ConfigSchema, configSchema } from './config'; import type { DataServerPlugin, DataPluginSetup, DataPluginStart } from './plugin'; export { getEsQueryConfig, DEFAULT_QUERY_LANGUAGE } from '../common'; diff --git a/src/plugins/data/server/plugin.ts b/src/plugins/data/server/plugin.ts index 77f90393a616..296d59dc2f63 100644 --- a/src/plugins/data/server/plugin.ts +++ b/src/plugins/data/server/plugin.ts @@ -12,7 +12,7 @@ import { BfetchServerSetup } from '@kbn/bfetch-plugin/server'; import { PluginStart as DataViewsServerPluginStart } from '@kbn/data-views-plugin/server'; import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server'; import { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/server'; -import { ConfigSchema } from '../config'; +import { ConfigSchema } from './config'; import type { ISearchSetup, ISearchStart } from './search'; import { DatatableUtilitiesService } from './datatable_utilities'; import { SearchService } from './search/search_service'; diff --git a/src/plugins/data/server/search/search_service.ts b/src/plugins/data/server/search/search_service.ts index 09bee9bb8bab..b9449b7f5da1 100644 --- a/src/plugins/data/server/search/search_service.ts +++ b/src/plugins/data/server/search/search_service.ts @@ -90,7 +90,7 @@ import { SHARD_DELAY_AGG_NAME, } from '../../common/search/aggs/buckets/shard_delay'; import { aggShardDelay } from '../../common/search/aggs/buckets/shard_delay_fn'; -import { ConfigSchema } from '../../config'; +import { ConfigSchema } from '../config'; import { SearchSessionService } from './session'; import { registerBsearchRoute } from './routes/bsearch'; import { enhancedEsSearchStrategyProvider } from './strategies/ese_search'; diff --git a/src/plugins/data/server/search/session/get_session_status.test.ts b/src/plugins/data/server/search/session/get_session_status.test.ts index 1d59fd11c471..128c19220c2f 100644 --- a/src/plugins/data/server/search/session/get_session_status.test.ts +++ b/src/plugins/data/server/search/session/get_session_status.test.ts @@ -10,7 +10,7 @@ import { elasticsearchServiceMock } from '@kbn/core/server/mocks'; import { getSessionStatus } from './get_session_status'; import { SearchSessionSavedObjectAttributes, SearchSessionStatus } from '../../../common'; import moment from 'moment'; -import { SearchSessionsConfigSchema } from '../../../config'; +import { SearchSessionsConfigSchema } from '../../config'; const mockInProgressSearchResponse = { body: { diff --git a/src/plugins/data/server/search/session/get_session_status.ts b/src/plugins/data/server/search/session/get_session_status.ts index e1cb50a6c4cd..57bae3c38e9a 100644 --- a/src/plugins/data/server/search/session/get_session_status.ts +++ b/src/plugins/data/server/search/session/get_session_status.ts @@ -10,7 +10,7 @@ import moment from 'moment'; import { ElasticsearchClient } from '@kbn/core/server'; import { SearchSessionSavedObjectAttributes, SearchSessionStatus } from '../../../common'; import { SearchStatus } from './types'; -import { SearchSessionsConfigSchema } from '../../../config'; +import { SearchSessionsConfigSchema } from '../../config'; import { getSearchStatus } from './get_search_status'; export async function getSessionStatus( diff --git a/src/plugins/data/server/search/session/mocks.ts b/src/plugins/data/server/search/session/mocks.ts index 339ef628356d..a5bbb06a5621 100644 --- a/src/plugins/data/server/search/session/mocks.ts +++ b/src/plugins/data/server/search/session/mocks.ts @@ -8,7 +8,7 @@ import moment from 'moment'; import type { IScopedSearchSessionsClient } from './types'; -import { SearchSessionsConfigSchema } from '../../../config'; +import { SearchSessionsConfigSchema } from '../../config'; export function createSearchSessionsClientMock(): jest.Mocked { return { diff --git a/src/plugins/data/server/search/session/session_service.test.ts b/src/plugins/data/server/search/session/session_service.test.ts index 5a31cefe7b99..5f596da37470 100644 --- a/src/plugins/data/server/search/session/session_service.test.ts +++ b/src/plugins/data/server/search/session/session_service.test.ts @@ -17,7 +17,7 @@ import { SearchSessionService } from './session_service'; import { createRequestHash } from './utils'; import moment from 'moment'; import { coreMock } from '@kbn/core/server/mocks'; -import { ConfigSchema } from '../../../config'; +import { ConfigSchema } from '../../config'; import type { AuthenticatedUser } from '@kbn/core/server'; import { SEARCH_SESSION_TYPE, SearchSessionStatus } from '../../../common'; import { elasticsearchServiceMock } from '@kbn/core/server/mocks'; diff --git a/src/plugins/data/server/search/session/session_service.ts b/src/plugins/data/server/search/session/session_service.ts index efd41990493b..ef367b552983 100644 --- a/src/plugins/data/server/search/session/session_service.ts +++ b/src/plugins/data/server/search/session/session_service.ts @@ -32,7 +32,7 @@ import { } from '../../../common'; import { ISearchSessionService, NoSearchIdInSessionError } from '../..'; import { createRequestHash } from './utils'; -import { ConfigSchema, SearchSessionsConfigSchema } from '../../../config'; +import { ConfigSchema, SearchSessionsConfigSchema } from '../../config'; import { getSessionStatus } from './get_session_status'; export interface SearchSessionDependencies { diff --git a/src/plugins/data/server/search/session/types.ts b/src/plugins/data/server/search/session/types.ts index cc3d604f50ef..02cb9cad55bb 100644 --- a/src/plugins/data/server/search/session/types.ts +++ b/src/plugins/data/server/search/session/types.ts @@ -19,7 +19,7 @@ import { SearchSessionSavedObjectAttributes, SearchSessionStatusResponse, } from '../../../common/search'; -import { SearchSessionsConfigSchema } from '../../../config'; +import { SearchSessionsConfigSchema } from '../../config'; export { SearchStatus } from '../../../common/search'; diff --git a/src/plugins/data/server/search/strategies/common/async_utils.ts b/src/plugins/data/server/search/strategies/common/async_utils.ts index ca33a01ac806..6c2d4b98bc5a 100644 --- a/src/plugins/data/server/search/strategies/common/async_utils.ts +++ b/src/plugins/data/server/search/strategies/common/async_utils.ts @@ -11,7 +11,7 @@ import { AsyncSearchGetRequest, } from '@elastic/elasticsearch/lib/api/types'; import { ISearchOptions } from '@kbn/search-types'; -import { SearchConfigSchema } from '../../../../config'; +import { SearchConfigSchema } from '../../../config'; /** @internal diff --git a/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts b/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts index 9db01189ff66..2bf6ff4f6860 100644 --- a/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts +++ b/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts @@ -10,7 +10,7 @@ import type { TransportResult } from '@elastic/elasticsearch'; import { tap } from 'rxjs'; import type { IScopedClusterClient, Logger } from '@kbn/core/server'; import { getKbnServerError } from '@kbn/kibana-utils-plugin/server'; -import { SearchConfigSchema } from '../../../../config'; +import { SearchConfigSchema } from '../../../config'; import { EqlSearchStrategyRequest, EqlSearchStrategyResponse, diff --git a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts index 8c5a8ad204a7..d4933357e033 100644 --- a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts +++ b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts @@ -31,7 +31,7 @@ import { getTotalLoaded, shimHitsTotal, } from '../es_search'; -import { SearchConfigSchema } from '../../../../config'; +import { SearchConfigSchema } from '../../../config'; import { sanitizeRequestParams } from '../../sanitize_request_params'; export const enhancedEsSearchStrategyProvider = ( diff --git a/src/plugins/data/server/search/strategies/ese_search/request_utils.ts b/src/plugins/data/server/search/strategies/ese_search/request_utils.ts index ec182534e089..d3341b192660 100644 --- a/src/plugins/data/server/search/strategies/ese_search/request_utils.ts +++ b/src/plugins/data/server/search/strategies/ese_search/request_utils.ts @@ -12,7 +12,7 @@ import { AsyncSearchSubmitRequest } from '@elastic/elasticsearch/lib/api/types'; import { ISearchOptions } from '@kbn/search-types'; import { UI_SETTINGS } from '../../../../common'; import { getDefaultSearchParams } from '../es_search'; -import { SearchConfigSchema } from '../../../../config'; +import { SearchConfigSchema } from '../../../config'; import { getCommonDefaultAsyncGetParams, getCommonDefaultAsyncSubmitParams, diff --git a/src/plugins/data/server/search/strategies/esql_async_search/esql_async_search_strategy.ts b/src/plugins/data/server/search/strategies/esql_async_search/esql_async_search_strategy.ts index a204b6ca69cc..a8623d99e163 100644 --- a/src/plugins/data/server/search/strategies/esql_async_search/esql_async_search_strategy.ts +++ b/src/plugins/data/server/search/strategies/esql_async_search/esql_async_search_strategy.ts @@ -22,7 +22,7 @@ import { getKbnSearchError } from '../../report_search_error'; import type { ISearchStrategy, SearchStrategyDependencies } from '../../types'; import type { IAsyncSearchOptions } from '../../../../common'; import { toAsyncKibanaSearchResponse } from './response_utils'; -import { SearchConfigSchema } from '../../../../config'; +import { SearchConfigSchema } from '../../../config'; // `drop_null_columns` is going to change the response // now we get `all_columns` and `columns` diff --git a/src/plugins/data/server/search/strategies/sql_search/request_utils.ts b/src/plugins/data/server/search/strategies/sql_search/request_utils.ts index 1a2540796d69..a60840946782 100644 --- a/src/plugins/data/server/search/strategies/sql_search/request_utils.ts +++ b/src/plugins/data/server/search/strategies/sql_search/request_utils.ts @@ -8,7 +8,7 @@ import { SqlGetAsyncRequest, SqlQueryRequest } from '@elastic/elasticsearch/lib/api/types'; import { ISearchOptions } from '@kbn/search-types'; -import { SearchConfigSchema } from '../../../../config'; +import { SearchConfigSchema } from '../../../config'; import { getCommonDefaultAsyncGetParams, getCommonDefaultAsyncSubmitParams, diff --git a/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts b/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts index 55ed1bfecb99..c71e926d764d 100644 --- a/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts +++ b/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts @@ -22,7 +22,7 @@ import type { import { pollSearch } from '../../../../common'; import { getDefaultAsyncGetParams, getDefaultAsyncSubmitParams } from './request_utils'; import { toAsyncKibanaSearchResponse } from './response_utils'; -import { SearchConfigSchema } from '../../../../config'; +import { SearchConfigSchema } from '../../../config'; export const sqlSearchStrategyProvider = ( searchConfig: SearchConfigSchema, diff --git a/src/plugins/data/tsconfig.json b/src/plugins/data/tsconfig.json index cc6ced2bef61..1b2fc9ed85e9 100644 --- a/src/plugins/data/tsconfig.json +++ b/src/plugins/data/tsconfig.json @@ -7,7 +7,6 @@ "common/**/*", "public/**/*", "server/**/*", - "config.ts", "config.mock.ts", "common/**/*.json", "public/**/*.json",