Optimize imports/exports.

src/core/cli/override_config_with_argv.ts → src/core/cli/apply_config_overrides.ts

@@ -24,13 +24,13 @@ import { InstallationFeatures, XPACK_INSTALLED_PATH } from './installation_featu
 import { readKeystore } from './read_keystore';
 
 /**
- * Overrides some config values with ones from argv.
+ * Applies overrides to the config values supplied through command line and keystore.
  *
  * @param config `RawConfig` instance to update config values for.
  * @param argv Argv object with key/value pairs.
  * @param installationFeatures Features that are supported by current installation.
  */
-export function overrideConfigWithArgv(
+export function applyConfigOverrides(
   config: RawConfig,
   argv: { [key: string]: any },
   installationFeatures: InstallationFeatures

src/core/cli/cli.ts

@@ -25,20 +25,17 @@ import { OnShutdown, Root } from '../server/root';
 
 import { isWorker } from 'cluster';
 import { DevConfig } from '../server/dev';
-import { HttpConfig } from '../server/http';
-import { BasePathProxyServer } from '../server/http/base_path_proxy_server';
+import { BasePathProxyServer, HttpConfig } from '../server/http';
 import { LegacyService } from '../server/legacy_compat/legacy_service';
-import { LoggingConfig } from '../server/logging';
-import { MutableLoggerFactory } from '../server/logging/logger_factory';
-import { LoggingService } from '../server/logging/logging_service';
+import { LoggingConfig, LoggingService, MutableLoggerFactory } from '../server/logging';
+import { applyConfigOverrides } from './apply_config_overrides';
 import * as args from './args';
 import { createServeCommand } from './commands';
 import {
   CLUSTER_MANAGER_PATH,
   detectInstallationFeatures,
   REPL_PATH,
 } from './installation_features';
-import { overrideConfigWithArgv } from './override_config_with_argv';
 
 const installationFeatures = detectInstallationFeatures();
 
@@ -90,7 +87,7 @@ export const run = (argv: string[]) => {
   rawConfigService.loadConfig();
 
   const rawConfig$ = k$(rawConfigService.getConfig$())(
-    map(rawConfig => overrideConfigWithArgv(rawConfig, parsedArgs, installationFeatures))
+    map(rawConfig => applyConfigOverrides(rawConfig, parsedArgs, installationFeatures))
   );
 
   const loggerFactory = new MutableLoggerFactory(env);

src/core/server/http/index.ts

@@ -27,6 +27,7 @@ import { Router } from './router';
 
 export { Router, KibanaRequest } from './router';
 export { HttpService };
+export { BasePathProxyServer } from './base_path_proxy_server';
 
 export { HttpConfig };
 

src/core/server/logging/index.ts

@@ -18,5 +18,6 @@
  */
 
 export { Logger } from './logger';
-export { LoggerFactory } from './logger_factory';
+export { LoggerFactory, MutableLoggerFactory } from './logger_factory';
 export { LoggingConfig } from './logging_config';
+export { LoggingService } from './logging_service';