[New platform] Expose NP core services and plugins contracts to the legacy server

src/legacy/core_plugins/console/index.js

@@ -103,7 +103,7 @@ export default function (kibana) {
       }
 
       const config = server.config();
-      const legacyEsConfig = await server.core.elasticsearch.legacy.config$.pipe(first()).toPromise();
+      const legacyEsConfig = await server.newPlatform.start.core.elasticsearch.legacy.config$.pipe(first()).toPromise();
       const proxyConfigCollection = new ProxyConfigCollection(options.proxyConfig);
       const proxyPathFilters = options.proxyFilter.map(str => new RegExp(str));
 

src/legacy/core_plugins/elasticsearch/index.js

@@ -36,9 +36,9 @@ export default function (kibana) {
       // value from all observables here to be able to synchronously return and create
       // cluster clients afterwards.
       const [esConfig, adminCluster, dataCluster] = await combineLatest(
-        server.core.elasticsearch.legacy.config$,
-        server.core.elasticsearch.adminClient$,
-        server.core.elasticsearch.dataClient$
+        server.newPlatform.start.core.elasticsearch.legacy.config$,
+        server.newPlatform.start.core.elasticsearch.adminClient$,
+        server.newPlatform.start.core.elasticsearch.dataClient$
       ).pipe(
         first(),
         map(([config, adminClusterClient, dataClusterClient]) => [
@@ -80,7 +80,7 @@ export default function (kibana) {
         // We fill all the missing properties in the `clientConfig` using the default
         // Elasticsearch config so that we don't depend on default values set and
         // controlled by underlying Elasticsearch JS client.
-        const cluster = new Cluster(server.core.elasticsearch.createClient(name, {
+        const cluster = new Cluster(server.newPlatform.start.core.elasticsearch.createClient(name, {
           ...esConfig,
           ...clientConfig,
         }));

src/legacy/core_plugins/metrics/server/lib/vis_data/__tests__/helpers/get_es_shard_timeout.js

@@ -26,8 +26,12 @@ describe('getEsShardTimeout', () => {
   it('should return the elasticsearch.shardTimeout', async () => {
     const req = {
       server: {
-        core: {
-          elasticsearch: { legacy: { config$: of({ shardTimeout: moment.duration(12345) }) } }
+        newPlatform: {
+          start: {
+            core: {
+              elasticsearch: { legacy: { config$: of({ shardTimeout: moment.duration(12345) }) } }
+            }
+          }
         }
       }
     };

src/legacy/core_plugins/metrics/server/lib/vis_data/helpers/get_es_shard_timeout.js

@@ -19,7 +19,7 @@
 import { first, map } from 'rxjs/operators';
 
 export async function getEsShardTimeout(req) {
-  return await req.server.core.elasticsearch.legacy.config$.pipe(
+  return await req.server.newPlatform.start.core.elasticsearch.legacy.config$.pipe(
     first(),
     map(config => config.shardTimeout.asMilliseconds())
   ).toPromise();

src/legacy/core_plugins/timelion/server/series_functions/__tests__/fixtures/tlConfig.js

@@ -41,9 +41,13 @@ export default function () {
         })
       }
     },
-    core: {
-      elasticsearch: {
-        legacy: { config$: of({ shardTimeout: moment.duration(30000) }) }
+    newPlatform: {
+      start: {
+        core: {
+          elasticsearch: {
+            legacy: { config$: of({ shardTimeout: moment.duration(30000) }) }
+          }
+        }
       }
     },
   };

src/legacy/core_plugins/timelion/server/series_functions/es/index.js

@@ -127,7 +127,7 @@ export default new Datasource('es', {
       });
     }
 
-    const esShardTimeout = await tlConfig.server.core.elasticsearch.legacy.config$.pipe(
+    const esShardTimeout = await tlConfig.server.newPlatform.start.core.elasticsearch.legacy.config$.pipe(
       first(),
       map(config => config.shardTimeout.asMilliseconds())
     ).toPromise();

src/legacy/server/config/complete.js

@@ -79,7 +79,7 @@ export default async function (kbnServer, server, config) {
   });
 
   const unusedKeys = await getUnusedConfigKeys(
-    kbnServer.core.handledConfigPaths,
+    kbnServer.newPlatform.params.handledConfigPaths,
     kbnServer.plugins,
     kbnServer.disabledPluginSpecs,
     kbnServer.settings,

src/legacy/server/config/complete.test.js

@@ -46,7 +46,9 @@ describe('server/config completeMixin()', function () {
     };
 
     const kbnServer = {
-      core: { handledConfigPaths: [] },
+      newPlatform: {
+        params: { handledConfigPaths: [] }
+      },
       settings,
       server,
       config,

src/legacy/server/core/index.ts

@@ -21,10 +21,11 @@ import { Server } from 'hapi';
 import KbnServer from '../kbn_server';
 
 /**
- * Exposes `kbnServer.core` through Hapi API.
+ * Exposes `kbnServer.newPlatform` through Hapi API.
  * @param kbnServer KbnServer singleton instance.
  * @param server Hapi server instance to expose `core` on.
  */
 export function coreMixin(kbnServer: KbnServer, server: Server) {
-  server.decorate('server', 'core', kbnServer.core);
+  // we suppress type error because hapi expect a function here not an object
+  server.decorate('server', 'newPlatform', kbnServer.newPlatform as any);
 }

src/legacy/server/http/index.js

@@ -28,7 +28,7 @@ import { setupBasePathProvider } from './setup_base_path_provider';
 import { setupXsrf } from './xsrf';
 
 export default async function (kbnServer, server, config) {
-  kbnServer.server = new Hapi.Server(kbnServer.core.serverOptions);
+  kbnServer.server = new Hapi.Server(kbnServer.newPlatform.params.serverOptions);
   server = kbnServer.server;
 
   setupBasePathProvider(server, config);

src/legacy/server/kbn_server.d.ts

@@ -19,6 +19,10 @@
 
 import { Server } from 'hapi';
 
+import { ConfigService } from '../../core/server/config';
+import { ElasticsearchServiceStart } from '../../core/server/elasticsearch';
+import { HttpServerInfo } from '../../core/server/http/';
+import { PluginsServiceStart } from '../../core/server/plugins/plugins_service';
 import { ApmOssPlugin } from '../core_plugins/apm_oss';
 import { CallClusterWithRequest, ElasticsearchPlugin } from '../core_plugins/elasticsearch';
 
@@ -53,9 +57,21 @@ declare module 'hapi' {
 }
 
 type KbnMixinFunc = (kbnServer: KbnServer, server: Server, config: any) => Promise<any> | void;
-
+type Unpromise<T> = T extends Promise<infer U> ? U : T;
 export default class KbnServer {
-  public readonly core: any;
+  public readonly newPlatform: {
+    start: {
+      core: {
+        elasticsearch: ElasticsearchServiceStart;
+      };
+      plugins: PluginsServiceStart;
+    };
+    stop: null;
+    params: {
+      serverOptions: HttpServerInfo;
+      handledConfigPaths: Unpromise<ReturnType<ConfigService['getUsedPaths']>>;
+    };
+  };
   public server: Server;
   public inject: Server['inject'];
 

src/legacy/server/kbn_server.js

@@ -54,7 +54,21 @@ export default class KbnServer {
     this.rootDir = rootDir;
     this.settings = settings || {};
 
-    this.core = core;
+    const { plugins, elasticsearch, serverOptions, handledConfigPaths } = core;
+
+    this.newPlatform = {
+      start: {
+        core: {
+          elasticsearch,
+        },
+        plugins,
+      },
+      stop: null,
+      params: {
+        serverOptions,
+        handledConfigPaths,
+      },
+    };
 
     this.ready = constant(this.mixin(
       Plugins.waitForInitSetupMixin,