Adapt core imports to use @kbn/config directly (#133204)

* Adapt core imports to use `@kbn/config` directly

* fix import from test_helpers

* lint

* update generated doc

* adapt core usages to use `@kbn/config-mocks`

* missing mock imports

src/core/public/public.api.md

@@ -9,7 +9,7 @@
 import { Action } from 'history';
 import { AnalyticsClient } from '@kbn/analytics-client';
 import type { ButtonColor } from '@elastic/eui';
-import { ConfigPath } from '@kbn/config';
+import type { ConfigPath } from '@kbn/config';
 import { ContextProviderOpts } from '@kbn/analytics-client';
 import type { DocLinks } from '@kbn/doc-links';
 import { EnvironmentMode } from '@kbn/config';

src/core/server/bootstrap.ts

@@ -7,7 +7,7 @@
  */
 
 import chalk from 'chalk';
-import { CliArgs, Env, RawConfigService } from './config';
+import { CliArgs, Env, RawConfigService } from '@kbn/config';
 import { Root } from './root';
 import { CriticalError } from './errors';
 

src/core/server/capabilities/integration_tests/capabilities_service.test.ts

@@ -8,12 +8,12 @@
 
 import supertest from 'supertest';
 import { REPO_ROOT } from '@kbn/utils';
+import { Env } from '@kbn/config';
+import { getEnvOptions } from '@kbn/config-mocks';
 import { HttpService, InternalHttpServicePreboot, InternalHttpServiceSetup } from '../../http';
 import { contextServiceMock } from '../../context/context_service.mock';
 import { executionContextServiceMock } from '../../execution_context/execution_context_service.mock';
 import { loggingSystemMock } from '../../logging/logging_system.mock';
-import { Env } from '../../config';
-import { getEnvOptions } from '../../config/mocks';
 import { CapabilitiesService, CapabilitiesSetup } from '..';
 import { createHttpServer } from '../../http/test_utils';
 

src/core/server/config/ensure_valid_configuration.test.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { configServiceMock } from './mocks';
+import { configServiceMock } from '@kbn/config-mocks';
 import { ensureValidConfiguration } from './ensure_valid_configuration';
 import { CriticalError } from '../errors';
 

src/core/server/config/index.ts

@@ -8,27 +8,3 @@
 
 export { coreDeprecationProvider } from './deprecation';
 export { ensureValidConfiguration } from './ensure_valid_configuration';
-
-export {
-  ConfigService,
-  isConfigPath,
-  hasConfigPathIntersection,
-  Env,
-  ObjectToConfigAdapter,
-  RawConfigService,
-} from '@kbn/config';
-
-export type {
-  IConfigService,
-  RawConfigurationProvider,
-  Config,
-  ConfigPath,
-  CliArgs,
-  ConfigDeprecation,
-  ConfigDeprecationContext,
-  AddConfigDeprecation,
-  ConfigDeprecationProvider,
-  ConfigDeprecationFactory,
-  EnvironmentMode,
-  PackageInfo,
-} from '@kbn/config';

src/core/server/config/mocks.ts

@@ -1,15 +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 {
-  getEnvOptions,
-  rawConfigServiceMock,
-  configServiceMock,
-  configMock,
-  configDeprecationsMock,
-} from '@kbn/config-mocks';

src/core/server/config/test_utils.ts

@@ -8,7 +8,7 @@
 import { set } from '@elastic/safer-lodash-set';
 import type { ConfigDeprecationProvider, ConfigDeprecationContext } from '@kbn/config';
 import { configDeprecationFactory, applyDeprecations } from '@kbn/config';
-import { configDeprecationsMock } from './mocks';
+import { configDeprecationsMock } from '@kbn/config-mocks';
 
 const defaultContext = configDeprecationsMock.createContext();
 

src/core/server/core_context.mock.ts

@@ -8,9 +8,9 @@
 
 import { REPO_ROOT } from '@kbn/utils';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
+import { Env, IConfigService } from '@kbn/config';
+import { configServiceMock, getEnvOptions } from '@kbn/config-mocks';
 import { CoreContext } from './core_context';
-import { Env, IConfigService } from './config';
-import { configServiceMock, getEnvOptions } from './config/mocks';
 import { loggingSystemMock } from './logging/logging_system.mock';
 import { ILoggingSystem } from './logging';
 

src/core/server/core_context.ts

@@ -7,7 +7,7 @@
  */
 
 import { LoggerFactory } from '@kbn/logging';
-import { IConfigService, Env } from './config';
+import { IConfigService, Env } from '@kbn/config';
 
 /** @internal */
 export type CoreId = symbol;

src/core/server/core_usage_data/core_usage_data_service.test.ts

@@ -13,8 +13,7 @@ import { TestScheduler } from 'rxjs/testing';
 // eslint-disable-next-line @kbn/imports/no_unresolvable_imports
 import { HotObservable } from 'rxjs/internal/testing/HotObservable';
 
-import { configServiceMock } from '../config/mocks';
-
+import { configServiceMock } from '@kbn/config-mocks';
 import { mockCoreContext } from '../core_context.mock';
 import { config as RawElasticsearchConfig } from '../elasticsearch/elasticsearch_config';
 import { config as RawHttpConfig } from '../http/http_config';

src/core/server/deprecations/deprecations_service.ts

@@ -9,12 +9,12 @@
 import { firstValueFrom } from 'rxjs';
 
 import type { Logger } from '@kbn/logging';
+import type { IConfigService } from '@kbn/config';
 import { DeprecationsFactory } from './deprecations_factory';
 import { DomainDeprecationDetails, RegisterDeprecationsConfig } from './types';
 import { registerRoutes } from './routes';
 import { config as deprecationConfig, DeprecationConfigType } from './deprecation_config';
 import { CoreContext } from '../core_context';
-import { IConfigService } from '../config';
 import { CoreService } from '../../types';
 import { InternalHttpServiceSetup } from '../http';
 import { IScopedClusterClient } from '../elasticsearch/client';

src/core/server/elasticsearch/elasticsearch_service.test.ts

@@ -25,8 +25,8 @@ import type { NodesVersionCompatibility } from './version_check/ensure_es_versio
 import { BehaviorSubject, firstValueFrom } from 'rxjs';
 import { first, concatMap } from 'rxjs/operators';
 import { REPO_ROOT } from '@kbn/utils';
-import { Env } from '../config';
-import { configServiceMock, getEnvOptions } from '../config/mocks';
+import { Env } from '@kbn/config';
+import { configServiceMock, getEnvOptions } from '@kbn/config-mocks';
 import { CoreContext } from '../core_context';
 import { loggingSystemMock } from '../logging/logging_system.mock';
 import { httpServiceMock } from '../http/http_service.mock';

src/core/server/environment/environment_service.test.ts

@@ -15,7 +15,7 @@ import { writePidFile } from './write_pid_file';
 import { CoreContext } from '../core_context';
 import type { AnalyticsServicePreboot } from '../analytics';
 
-import { configServiceMock } from '../config/mocks';
+import { configServiceMock } from '@kbn/config-mocks';
 import { loggingSystemMock } from '../logging/logging_system.mock';
 import { mockCoreContext } from '../core_context.mock';
 import { analyticsServiceMock } from '../analytics/analytics_service.mock';

src/core/server/environment/environment_service.ts

@@ -9,9 +9,9 @@
 import { firstValueFrom, of } from 'rxjs';
 import { PathConfigType, config as pathConfigDef } from '@kbn/utils';
 import type { Logger } from '@kbn/logging';
+import type { IConfigService } from '@kbn/config';
 import type { AnalyticsServicePreboot } from '../analytics';
 import { CoreContext } from '../core_context';
-import { IConfigService } from '../config';
 import { HttpConfigType, config as httpConfigDef } from '../http';
 import { PidConfigType, config as pidConfigDef } from './pid_config';
 import { resolveInstanceUuid } from './resolve_uuid';

src/core/server/http/http_service.mock.ts

@@ -8,6 +8,7 @@
 
 import { Server } from '@hapi/hapi';
 import type { PublicMethodsOf } from '@kbn/utility-types';
+import { configMock } from '@kbn/config-mocks';
 
 import { CspConfig } from '../csp';
 import { mockRouter, RouterMock } from './router/router.mock';
@@ -27,7 +28,6 @@ import { sessionStorageMock } from './cookie_session_storage.mocks';
 import { OnPostAuthToolkit } from './lifecycle/on_post_auth';
 import { OnPreAuthToolkit } from './lifecycle/on_pre_auth';
 import { OnPreResponseToolkit } from './lifecycle/on_pre_response';
-import { configMock } from '../config/mocks';
 import { ExternalUrlConfig } from '../external_url';
 import type { IAuthHeadersStorage } from './auth_headers_storage';
 

src/core/server/http/http_service.test.ts

@@ -11,11 +11,11 @@ import { mockHttpServer } from './http_service.test.mocks';
 import { noop } from 'lodash';
 import { BehaviorSubject } from 'rxjs';
 import { REPO_ROOT } from '@kbn/utils';
-import { getEnvOptions } from '../config/mocks';
+import { ConfigService, Env } from '@kbn/config';
+import { getEnvOptions } from '@kbn/config-mocks';
 import { HttpService } from '.';
 import { HttpConfigType, config } from './http_config';
 import { httpServerMock } from './http_server.mocks';
-import { ConfigService, Env } from '../config';
 import { loggingSystemMock } from '../logging/logging_system.mock';
 import { contextServiceMock } from '../context/context_service.mock';
 import { executionContextServiceMock } from '../execution_context/execution_context_service.mock';

src/core/server/http/http_service.ts

@@ -11,11 +11,11 @@ import { map } from 'rxjs/operators';
 import { pick } from '@kbn/std';
 
 import type { Logger } from '@kbn/logging';
+import { Env } from '@kbn/config';
 import type { RequestHandlerContext } from '..';
 import type { InternalExecutionContextSetup } from '../execution_context';
 import { CoreService } from '../../types';
 import { ContextSetup, InternalContextPreboot } from '../context';
-import { Env } from '../config';
 import { CoreContext } from '../core_context';
 import { PluginOpaqueId } from '../plugins';
 import { CspConfigType, config as cspConfig } from '../csp';

src/core/server/http/integration_tests/cookie_session_storage.test.ts

@@ -8,19 +8,19 @@
 
 import { parse as parseCookie } from 'tough-cookie';
 import supertest from 'supertest';
-import { REPO_ROOT } from '@kbn/utils';
-import { ByteSizeValue } from '@kbn/config-schema';
 import { BehaviorSubject } from 'rxjs';
 import { duration as momentDuration } from 'moment';
+import { REPO_ROOT } from '@kbn/utils';
+import { ByteSizeValue } from '@kbn/config-schema';
+import { Env } from '@kbn/config';
+import { getEnvOptions, configServiceMock } from '@kbn/config-mocks';
 
 import { CoreContext } from '../../core_context';
 import { HttpService } from '../http_service';
-import { Env } from '../../config';
 
 import { contextServiceMock } from '../../context/context_service.mock';
 import { executionContextServiceMock } from '../../execution_context/execution_context_service.mock';
 import { loggingSystemMock } from '../../logging/logging_system.mock';
-import { getEnvOptions, configServiceMock } from '../../config/mocks';
 import { httpServerMock } from '../http_server.mocks';
 
 import { createCookieSessionStorageFactory } from '../cookie_session_storage';

src/core/server/http/integration_tests/lifecycle_handlers.test.ts

@@ -10,13 +10,13 @@ import supertest from 'supertest';
 import moment from 'moment';
 import { BehaviorSubject } from 'rxjs';
 import { ByteSizeValue } from '@kbn/config-schema';
+import { configServiceMock } from '@kbn/config-mocks';
 
 import { createHttpServer } from '../test_utils';
 import { HttpService } from '../http_service';
 import { HttpServerSetup } from '../http_server';
 import { IRouter, RouteRegistrar } from '../router';
 
-import { configServiceMock } from '../../config/mocks';
 import { contextServiceMock } from '../../context/context_service.mock';
 import { executionContextServiceMock } from '../../execution_context/execution_context_service.mock';
 

src/core/server/http/lifecycle_handlers.ts

@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
+import { Env } from '@kbn/config';
 import { OnPostAuthHandler } from './lifecycle/on_post_auth';
 import { OnPreResponseHandler } from './lifecycle/on_pre_response';
 import { HttpConfig } from './http_config';
 import { isSafeMethod } from './router';
-import { Env } from '../config';
 import { LifecycleRegistrar } from './http_server';
 
 const VERSION_HEADER = 'kbn-version';

src/core/server/http/test_utils.ts

@@ -10,10 +10,10 @@ import { BehaviorSubject } from 'rxjs';
 import moment from 'moment';
 import { REPO_ROOT } from '@kbn/utils';
 import { ByteSizeValue } from '@kbn/config-schema';
-import { Env } from '../config';
+import { Env } from '@kbn/config';
+import { getEnvOptions, configServiceMock } from '@kbn/config-mocks';
 import { HttpService } from './http_service';
 import { CoreContext } from '../core_context';
-import { getEnvOptions, configServiceMock } from '../config/mocks';
 import { loggingSystemMock } from '../logging/logging_system.mock';
 
 const coreId = Symbol('core');

src/core/server/i18n/i18n_service.test.ts

@@ -15,7 +15,7 @@ import {
 import { BehaviorSubject } from 'rxjs';
 import { I18nService } from './i18n_service';
 
-import { configServiceMock } from '../config/mocks';
+import { configServiceMock } from '@kbn/config-mocks';
 import { mockCoreContext } from '../core_context.mock';
 import { httpServiceMock } from '../mocks';
 

src/core/server/i18n/i18n_service.ts

@@ -8,7 +8,7 @@
 
 import { firstValueFrom } from 'rxjs';
 import type { Logger } from '@kbn/logging';
-import { IConfigService } from '../config';
+import type { IConfigService } from '@kbn/config';
 import { CoreContext } from '../core_context';
 import { InternalHttpServicePreboot, InternalHttpServiceSetup } from '../http';
 import { config as i18nConfigDef, I18nConfigType } from './i18n_config';

src/core/server/index.ts

@@ -109,7 +109,7 @@ export type {
   AddConfigDeprecation,
   EnvironmentMode,
   PackageInfo,
-} from './config';
+} from '@kbn/config';
 export type {
   IContextContainer,
   IContextProvider,

src/core/server/internal_types.ts

@@ -7,9 +7,9 @@
  */
 
 import { Type } from '@kbn/config-schema';
+import type { ConfigDeprecationProvider } from '@kbn/config';
 
 import { CapabilitiesSetup, CapabilitiesStart } from './capabilities';
-import { ConfigDeprecationProvider } from './config';
 import { InternalContextPreboot, ContextSetup } from './context';
 import {
   InternalElasticsearchServicePreboot,

src/core/server/metrics/metrics_service.test.ts

@@ -8,7 +8,7 @@
 
 import moment from 'moment';
 
-import { configServiceMock } from '../config/mocks';
+import { configServiceMock } from '@kbn/config-mocks';
 import { mockOpsCollector } from './metrics_service.test.mocks';
 import { MetricsService } from './metrics_service';
 import { mockCoreContext } from '../core_context.mock';

src/core/server/mocks.ts

@@ -42,7 +42,7 @@ import { prebootServiceMock } from './preboot/preboot_service.mock';
 import { docLinksServiceMock } from './doc_links/doc_links_service.mock';
 import { analyticsServiceMock } from './analytics/analytics_service.mock';
 
-export { configServiceMock, configDeprecationsMock } from './config/mocks';
+export { configServiceMock, configDeprecationsMock } from '@kbn/config-mocks';
 export { httpServerMock } from './http/http_server.mocks';
 export { httpResourcesMock } from './http_resources/http_resources_service.mock';
 export { sessionStorageMock } from './http/cookie_session_storage.mocks';

src/core/server/plugins/discovery/plugin_manifest_parser.ts

@@ -11,7 +11,7 @@ import { resolve } from 'path';
 import { coerce } from 'semver';
 import { promisify } from 'util';
 import { snakeCase } from 'lodash';
-import { isConfigPath, PackageInfo } from '../../config';
+import { isConfigPath, PackageInfo } from '@kbn/config';
 import { PluginManifest, PluginType } from '../types';
 import { PluginDiscoveryError } from './plugin_discovery_error';
 import { isCamelCase } from './is_camel_case';

src/core/server/plugins/discovery/plugins_discovery.test.ts

@@ -10,13 +10,13 @@
 import { REPO_ROOT } from '@kbn/utils';
 import { mockPackage, scanPluginSearchPathsMock } from './plugins_discovery.test.mocks';
 import mockFs from 'mock-fs';
+import { getEnvOptions, rawConfigServiceMock } from '@kbn/config-mocks';
 import { loggingSystemMock } from '../../logging/logging_system.mock';
-import { getEnvOptions, rawConfigServiceMock } from '../../config/mocks';
 
 import { firstValueFrom, from } from 'rxjs';
 import { map, toArray } from 'rxjs/operators';
 import { resolve } from 'path';
-import { ConfigService, Env } from '../../config';
+import { ConfigService, Env } from '@kbn/config';
 import { PluginsConfig, PluginsConfigType, config } from '../plugins_config';
 import type { InstanceInfo } from '../plugin_context';
 import { discover } from './plugins_discovery';

src/core/server/plugins/integration_tests/plugins_service.test.ts

@@ -12,9 +12,9 @@ import { mockPackage, mockDiscover } from './plugins_service.test.mocks';
 
 import { join } from 'path';
 
+import { ConfigPath, ConfigService, Env } from '@kbn/config';
+import { getEnvOptions, rawConfigServiceMock } from '@kbn/config-mocks';
 import { PluginsService } from '../plugins_service';
-import { ConfigPath, ConfigService, Env } from '../../config';
-import { getEnvOptions, rawConfigServiceMock } from '../../config/mocks';
 import { BehaviorSubject, from } from 'rxjs';
 import { config } from '../plugins_config';
 import { loggingSystemMock } from '../../logging/logging_system.mock';

src/core/server/plugins/legacy_config.test.ts

@@ -8,7 +8,7 @@
 
 import { take } from 'rxjs/operators';
 import { ConfigService, Env } from '@kbn/config';
-import { getEnvOptions, rawConfigServiceMock } from '../config/mocks';
+import { getEnvOptions, rawConfigServiceMock } from '@kbn/config-mocks';
 import { getGlobalConfig, getGlobalConfig$ } from './legacy_config';
 import { REPO_ROOT } from '@kbn/utils';
 import { loggingSystemMock } from '../logging/logging_system.mock';

src/core/server/plugins/plugin.test.ts

@@ -10,12 +10,12 @@ import { join } from 'path';
 import { BehaviorSubject } from 'rxjs';
 import { REPO_ROOT } from '@kbn/utils';
 import { schema } from '@kbn/config-schema';
+import { Env } from '@kbn/config';
 
-import { Env } from '../config';
+import { configServiceMock, getEnvOptions } from '@kbn/config-mocks';
 import { CoreContext } from '../core_context';
 import { coreMock } from '../mocks';
 import { loggingSystemMock } from '../logging/logging_system.mock';
-import { configServiceMock, getEnvOptions } from '../config/mocks';
 
 import { PluginWrapper } from './plugin';
 import { PluginManifest, PluginType } from './types';

src/core/server/plugins/plugin_context.test.ts

@@ -10,15 +10,15 @@ import { duration } from 'moment';
 import { first } from 'rxjs/operators';
 import { REPO_ROOT } from '@kbn/utils';
 import { fromRoot } from '@kbn/utils';
+import { Env } from '@kbn/config';
+import { rawConfigServiceMock, getEnvOptions, configServiceMock } from '@kbn/config-mocks';
 import {
   createPluginInitializerContext,
   createPluginPrebootSetupContext,
   InstanceInfo,
 } from './plugin_context';
 import { CoreContext } from '../core_context';
-import { Env } from '../config';
 import { loggingSystemMock } from '../logging/logging_system.mock';
-import { rawConfigServiceMock, getEnvOptions, configServiceMock } from '../config/mocks';
 import { PluginManifest, PluginType } from './types';
 import { Server } from '../server';
 import { schema, ByteSizeValue } from '@kbn/config-schema';

src/core/server/plugins/plugins_config.test.ts

@@ -7,9 +7,9 @@
  */
 
 import { REPO_ROOT } from '@kbn/utils';
-import { getEnvOptions } from '../config/mocks';
+import { Env } from '@kbn/config';
+import { getEnvOptions } from '@kbn/config-mocks';
 import { PluginsConfig, PluginsConfigType } from './plugins_config';
-import { Env } from '../config';
 
 describe('PluginsConfig', () => {
   it('retrieves additionalPluginPaths from config.paths when in production mode', () => {

src/core/server/plugins/plugins_config.ts

@@ -7,8 +7,8 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
+import { Env } from '@kbn/config';
 import { ServiceConfigDescriptor } from '../internal_types';
-import { Env } from '../config';
 
 const configSchema = schema.object({
   initialize: schema.boolean({ defaultValue: true }),

src/core/server/plugins/plugins_service.test.ts

@@ -10,12 +10,12 @@ import { mockDiscover, mockPackage } from './plugins_service.test.mocks';
 
 import { resolve, join } from 'path';
 import { BehaviorSubject, from } from 'rxjs';
-import { schema } from '@kbn/config-schema';
 import { createAbsolutePathSerializer } from '@kbn/jest-serializers';
 import { REPO_ROOT } from '@kbn/utils';
+import { schema } from '@kbn/config-schema';
+import { ConfigPath, ConfigService, Env } from '@kbn/config';
 
-import { ConfigPath, ConfigService, Env } from '../config';
-import { rawConfigServiceMock, getEnvOptions } from '../config/mocks';
+import { rawConfigServiceMock, getEnvOptions } from '@kbn/config-mocks';
 import { coreMock } from '../mocks';
 import { loggingSystemMock } from '../logging/logging_system.mock';
 import { environmentServiceMock } from '../environment/environment_service.mock';

src/core/server/plugins/plugins_service.ts

@@ -12,6 +12,7 @@ import { filter, map, tap, toArray } from 'rxjs/operators';
 import { getFlattenedObject } from '@kbn/std';
 
 import type { Logger } from '@kbn/logging';
+import type { IConfigService } from '@kbn/config';
 import { CoreService } from '../../types';
 import { CoreContext } from '../core_context';
 import { discover, PluginDiscoveryError, PluginDiscoveryErrorType } from './discovery';
@@ -28,7 +29,6 @@ import { PluginsConfig, PluginsConfigType } from './plugins_config';
 import { PluginsSystem } from './plugins_system';
 import { createBrowserConfig } from './create_browser_config';
 import { InternalCorePreboot, InternalCoreSetup, InternalCoreStart } from '../internal_types';
-import { IConfigService } from '../config';
 import { InternalEnvironmentServicePreboot } from '../environment';
 
 /** @internal */

src/core/server/plugins/plugins_system.test.ts

@@ -16,8 +16,8 @@ import { BehaviorSubject } from 'rxjs';
 
 import { REPO_ROOT } from '@kbn/utils';
 import type { Logger } from '@kbn/logging';
-import { Env } from '../config';
-import { configServiceMock, getEnvOptions } from '../config/mocks';
+import { Env } from '@kbn/config';
+import { configServiceMock, getEnvOptions } from '@kbn/config-mocks';
 import { CoreContext } from '../core_context';
 import { loggingSystemMock } from '../logging/logging_system.mock';
 

src/core/server/plugins/types.ts

@@ -11,8 +11,13 @@ import { Type } from '@kbn/config-schema';
 import { RecursiveReadonly } from '@kbn/utility-types';
 import { PathConfigType } from '@kbn/utils';
 import { LoggerFactory } from '@kbn/logging';
+import type {
+  ConfigPath,
+  EnvironmentMode,
+  PackageInfo,
+  ConfigDeprecationProvider,
+} from '@kbn/config';
 
-import { ConfigPath, EnvironmentMode, PackageInfo, ConfigDeprecationProvider } from '../config';
 import { ElasticsearchConfigType } from '../elasticsearch/elasticsearch_config';
 import { SavedObjectsConfigType } from '../saved_objects/saved_objects_config';
 import { CorePreboot, CoreSetup, CoreStart } from '..';

src/core/server/preboot/preboot_service.test.ts

@@ -9,7 +9,7 @@
 import { REPO_ROOT } from '@kbn/utils';
 import { LoggerFactory } from '@kbn/logging';
 import { Env } from '@kbn/config';
-import { getEnvOptions } from '../config/mocks';
+import { getEnvOptions } from '@kbn/config-mocks';
 import { configServiceMock, loggingSystemMock } from '../mocks';
 
 import { PrebootService } from './preboot_service';

src/core/server/rendering/types.ts

@@ -9,8 +9,8 @@
 import { i18n } from '@kbn/i18n';
 import type { ThemeVersion } from '@kbn/ui-shared-deps-npm';
 
+import type { EnvironmentMode, PackageInfo } from '@kbn/config';
 import { InternalElasticsearchServiceSetup } from '../elasticsearch';
-import { EnvironmentMode, PackageInfo } from '../config';
 import { ICspConfig } from '../csp';
 import { InternalHttpServicePreboot, InternalHttpServiceSetup, KibanaRequest } from '../http';
 import { UiPlugins, DiscoveredPlugin } from '../plugins';

src/core/server/root/index.test.mocks.ts

@@ -14,7 +14,7 @@ jest.doMock('../logging/logging_system', () => ({
 
 const realKbnConfig = jest.requireActual('@kbn/config');
 
-import { configServiceMock, rawConfigServiceMock } from '../config/mocks';
+import { configServiceMock, rawConfigServiceMock } from '@kbn/config-mocks';
 export const configService = configServiceMock.create();
 export const rawConfigService = rawConfigServiceMock.create();
 jest.doMock('@kbn/config', () => ({

src/core/server/root/index.test.ts

@@ -11,9 +11,9 @@ import { rawConfigService, configService, logger, mockServer } from './index.tes
 import { BehaviorSubject } from 'rxjs';
 import { filter, first } from 'rxjs/operators';
 import { REPO_ROOT } from '@kbn/utils';
-import { getEnvOptions } from '../config/mocks';
+import { Env } from '@kbn/config';
+import { getEnvOptions } from '@kbn/config-mocks';
 import { Root } from '.';
-import { Env } from '../config';
 
 const env = Env.createDefault(REPO_ROOT, getEnvOptions());
 

src/core/server/root/index.ts

@@ -9,7 +9,7 @@
 import { ConnectableObservable, Subscription } from 'rxjs';
 import { first, publishReplay, switchMap, concatMap, tap } from 'rxjs/operators';
 import type { Logger, LoggerFactory } from '@kbn/logging';
-import { Env, RawConfigurationProvider } from '../config';
+import { Env, RawConfigurationProvider } from '@kbn/config';
 import { LoggingConfigType, LoggingSystem } from '../logging';
 import { Server } from '../server';
 

src/core/server/saved_objects/migrations/integration_tests/7.7.2_xpack_100k.test.ts

@@ -10,7 +10,7 @@ import path from 'path';
 import { unlink } from 'fs/promises';
 import { REPO_ROOT } from '@kbn/utils';
 import { Env } from '@kbn/config';
-import { getEnvOptions } from '../../../config/mocks';
+import { getEnvOptions } from '@kbn/config-mocks';
 import * as kbnTestServer from '../../../../test_helpers/kbn_server';
 import { ElasticsearchClient } from '../../../elasticsearch';
 import { InternalCoreStart } from '../../../internal_types';

src/core/server/saved_objects/migrations/integration_tests/batch_size_bytes.test.ts

@@ -14,7 +14,7 @@ import { Root } from '../../../root';
 import { ElasticsearchClient } from '../../../elasticsearch';
 import { Env } from '@kbn/config';
 import { REPO_ROOT } from '@kbn/utils';
-import { getEnvOptions } from '../../../config/mocks';
+import { getEnvOptions } from '@kbn/config-mocks';
 import { LogRecord } from '@kbn/logging';
 import { retryAsync } from '../test_helpers/retry_async';
 

src/core/server/saved_objects/migrations/integration_tests/incompatible_cluster_routing_allocation.test.ts

@@ -12,7 +12,7 @@ import JSON5 from 'json5';
 import { REPO_ROOT } from '@kbn/utils';
 import { Env } from '@kbn/config';
 import { getDocLinksMeta } from '@kbn/doc-links';
-import { getEnvOptions } from '../../../config/mocks';
+import { getEnvOptions } from '@kbn/config-mocks';
 import * as kbnTestServer from '../../../../test_helpers/kbn_server';
 import { Root } from '../../../root';
 import { ElasticsearchClient } from '../../../elasticsearch';

src/core/server/saved_objects/migrations/integration_tests/migration_from_older_v1.test.ts

@@ -12,7 +12,7 @@ import Util from 'util';
 import Semver from 'semver';
 import { REPO_ROOT } from '@kbn/utils';
 import { Env } from '@kbn/config';
-import { getEnvOptions } from '../../../config/mocks';
+import { getEnvOptions } from '@kbn/config-mocks';
 import * as kbnTestServer from '../../../../test_helpers/kbn_server';
 import { ElasticsearchClient } from '../../../elasticsearch';
 import { SavedObjectsRawDoc } from '../../serialization';

src/core/server/saved_objects/migrations/integration_tests/migration_from_same_v1.test.ts

@@ -12,7 +12,7 @@ import Util from 'util';
 import Semver from 'semver';
 import { REPO_ROOT } from '@kbn/utils';
 import { Env } from '@kbn/config';
-import { getEnvOptions } from '../../../config/mocks';
+import { getEnvOptions } from '@kbn/config-mocks';
 import * as kbnTestServer from '../../../../test_helpers/kbn_server';
 import { ElasticsearchClient } from '../../../elasticsearch';
 import { SavedObjectsRawDoc } from '../../serialization';

src/core/server/saved_objects/saved_objects_service.test.ts

@@ -18,14 +18,13 @@ import {
   typeRegistryInstanceMock,
 } from './saved_objects_service.test.mocks';
 import { BehaviorSubject } from 'rxjs';
-import { RawPackageInfo } from '@kbn/config';
+import { RawPackageInfo, Env } from '@kbn/config';
 import { ByteSizeValue } from '@kbn/config-schema';
 import { REPO_ROOT } from '@kbn/utils';
+import { getEnvOptions } from '@kbn/config-mocks';
 
 import { SavedObjectsService } from './saved_objects_service';
 import { mockCoreContext } from '../core_context.mock';
-import { Env } from '../config';
-import { getEnvOptions } from '../config/mocks';
 import { configServiceMock } from '../mocks';
 import { elasticsearchServiceMock } from '../elasticsearch/elasticsearch_service.mock';
 import { coreUsageDataServiceMock } from '../core_usage_data/core_usage_data_service.mock';

src/core/server/saved_objects/validation/integration_tests/validator.test.ts

@@ -14,7 +14,7 @@ import { schema } from '@kbn/config-schema';
 import { REPO_ROOT } from '@kbn/utils';
 import { SavedObjectsType } from '../../types';
 import { ISavedObjectsRepository } from '../../service/lib';
-import { getEnvOptions } from '../../../config/mocks';
+import { getEnvOptions } from '@kbn/config-mocks';
 import { InternalCoreSetup, InternalCoreStart } from '../../../internal_types';
 import { Root } from '../../../root';
 import * as kbnTestServer from '../../../../test_helpers/kbn_server';

src/core/server/server.api.md

@@ -3256,8 +3256,8 @@ export const validBodyOutput: readonly ["data", "stream"];
 //
 // src/core/server/elasticsearch/client/types.ts:81:7 - (ae-forgotten-export) The symbol "Explanation" needs to be exported by the entry point index.d.ts
 // src/core/server/http/router/response.ts:302:3 - (ae-forgotten-export) The symbol "KibanaResponse" needs to be exported by the entry point index.d.ts
-// src/core/server/plugins/types.ts:405:3 - (ae-forgotten-export) The symbol "SharedGlobalConfigKeys" needs to be exported by the entry point index.d.ts
-// src/core/server/plugins/types.ts:407:3 - (ae-forgotten-export) The symbol "SavedObjectsConfigType" needs to be exported by the entry point index.d.ts
-// src/core/server/plugins/types.ts:514:5 - (ae-unresolved-link) The @link reference could not be resolved: The package "kibana" does not have an export "create"
+// src/core/server/plugins/types.ts:410:3 - (ae-forgotten-export) The symbol "SharedGlobalConfigKeys" needs to be exported by the entry point index.d.ts
+// src/core/server/plugins/types.ts:412:3 - (ae-forgotten-export) The symbol "SavedObjectsConfigType" needs to be exported by the entry point index.d.ts
+// src/core/server/plugins/types.ts:519:5 - (ae-unresolved-link) The @link reference could not be resolved: The package "kibana" does not have an export "create"
 
 ```

src/core/server/server.test.mocks.ts

@@ -29,7 +29,7 @@ jest.doMock('./elasticsearch/elasticsearch_service', () => ({
 
 const realKbnConfig = jest.requireActual('@kbn/config');
 
-import { configServiceMock } from './config/mocks';
+import { configServiceMock } from '@kbn/config-mocks';
 
 export const mockConfigService = configServiceMock.create();
 jest.doMock('@kbn/config', () => ({

src/core/server/server.test.ts

@@ -28,8 +28,8 @@ import {
 
 import { BehaviorSubject } from 'rxjs';
 import { REPO_ROOT } from '@kbn/utils';
-import { rawConfigServiceMock, getEnvOptions } from './config/mocks';
-import { Env } from './config';
+import { Env } from '@kbn/config';
+import { rawConfigServiceMock, getEnvOptions } from '@kbn/config-mocks';
 import { Server } from './server';
 
 import { loggingSystemMock } from './logging/logging_system.mock';

src/core/server/server.ts

@@ -9,13 +9,8 @@
 import apm from 'elastic-apm-node';
 import { config as pathConfig } from '@kbn/utils';
 import type { Logger, LoggerFactory } from '@kbn/logging';
-import {
-  ConfigService,
-  Env,
-  RawConfigurationProvider,
-  coreDeprecationProvider,
-  ensureValidConfiguration,
-} from './config';
+import { ConfigService, Env, RawConfigurationProvider } from '@kbn/config';
+import { coreDeprecationProvider, ensureValidConfiguration } from './config';
 import { CoreApp } from './core_app';
 import { I18nService } from './i18n';
 import { ElasticsearchService } from './elasticsearch';

src/core/server/status/routes/status.ts

@@ -8,6 +8,7 @@
 
 import { Observable, combineLatest, ReplaySubject, firstValueFrom } from 'rxjs';
 import { schema } from '@kbn/config-schema';
+import { PackageInfo } from '@kbn/config';
 
 import { IRouter } from '../../http';
 import { MetricsServiceSetup } from '../../metrics';
@@ -15,7 +16,6 @@ import type { CoreIncrementUsageCounter } from '../../core_usage_data/types';
 import { ServiceStatus, CoreStatus, ServiceStatusLevels } from '../types';
 import { PluginName } from '../../plugins';
 import { calculateLegacyStatus, LegacyStatusInfo } from '../legacy_status';
-import { PackageInfo } from '../../config';
 import { StatusResponse } from '../../../types/status';
 
 const SNAPSHOT_POSTFIX = /-SNAPSHOT$/;

src/core/server/status/status_service.test.ts

@@ -22,7 +22,7 @@ import { environmentServiceMock } from '../environment/environment_service.mock'
 import { httpServiceMock } from '../http/http_service.mock';
 import { mockRouter, RouterMock } from '../http/router/router.mock';
 import { metricsServiceMock } from '../metrics/metrics_service.mock';
-import { configServiceMock } from '../config/mocks';
+import { configServiceMock } from '@kbn/config-mocks';
 import { coreUsageDataServiceMock } from '../core_usage_data/core_usage_data_service.mock';
 import { analyticsServiceMock } from '../analytics/analytics_service.mock';
 import { AnalyticsServiceSetup } from '..';

src/core/server/ui_settings/integration_tests/index.test.ts

@@ -8,7 +8,7 @@
 
 import { Env } from '@kbn/config';
 import { REPO_ROOT } from '@kbn/utils';
-import { getEnvOptions } from '../../config/mocks';
+import { getEnvOptions } from '@kbn/config-mocks';
 import { startServers, stopServers } from './lib';
 import { docExistsSuite } from './doc_exists';
 import { docMissingSuite } from './doc_missing';

src/core/test_helpers/kbn_server.ts

@@ -6,6 +6,10 @@
  * Side Public License, v 1.
  */
 
+import { defaultsDeep } from 'lodash';
+import { BehaviorSubject } from 'rxjs';
+import supertest from 'supertest';
+
 import { ToolingLog } from '@kbn/tooling-log';
 import { REPO_ROOT } from '@kbn/utils';
 import {
@@ -15,12 +19,9 @@ import {
   kibanaServerTestUser,
   systemIndicesSuperuser,
 } from '@kbn/test';
-import { defaultsDeep } from 'lodash';
-import { BehaviorSubject } from 'rxjs';
-import supertest from 'supertest';
+import { CliArgs, Env } from '@kbn/config';
 
 import { InternalCoreSetup, InternalCoreStart } from '../server/internal_types';
-import { CliArgs, Env } from '../server/config';
 import { Root } from '../server/root';
 
 export type HttpMethod = 'delete' | 'get' | 'head' | 'post' | 'put';