From 44c536ba2aea8d0c9d6b0e8d5292a523011feb53 Mon Sep 17 00:00:00 2001
From: restrry <restrry@gmail.com>
Date: Tue, 14 Jan 2020 09:37:03 +0100
Subject: [PATCH 1/2] use NP env to retrieve kibana version. settings has none

---
 src/core/server/legacy/legacy_service.ts              |  6 +++++-
 .../server/legacy/plugins/find_legacy_plugin_specs.ts | 11 ++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/core/server/legacy/legacy_service.ts b/src/core/server/legacy/legacy_service.ts
index cc36b90ec526d..7a03cefc38c1a 100644
--- a/src/core/server/legacy/legacy_service.ts
+++ b/src/core/server/legacy/legacy_service.ts
@@ -125,7 +125,11 @@ export class LegacyService implements CoreService {
       disabledPluginSpecs,
       uiExports,
       navLinks,
-    } = await findLegacyPluginSpecs(this.settings, this.coreContext.logger);
+    } = await findLegacyPluginSpecs(
+      this.settings,
+      this.coreContext.logger,
+      this.coreContext.env.packageInfo
+    );
 
     this.legacyPlugins = {
       pluginSpecs,
diff --git a/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts b/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts
index d2e7a39236d0a..9867274d224bd 100644
--- a/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts
+++ b/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts
@@ -29,6 +29,8 @@ import {
 import { collectUiExports as collectLegacyUiExports } from '../../../../legacy/ui/ui_exports/collect_ui_exports';
 
 import { LoggerFactory } from '../../logging';
+import { PackageInfo } from '../../config';
+
 import {
   LegacyUiExports,
   LegacyNavLink,
@@ -92,7 +94,11 @@ function getNavLinks(uiExports: LegacyUiExports, pluginSpecs: LegacyPluginSpec[]
     .sort((a, b) => a.order - b.order);
 }
 
-export async function findLegacyPluginSpecs(settings: unknown, loggerFactory: LoggerFactory) {
+export async function findLegacyPluginSpecs(
+  settings: unknown,
+  loggerFactory: LoggerFactory,
+  packageInfo: PackageInfo
+) {
   const configToMutate: LegacyConfig = defaultConfig(settings);
   const {
     pack$,
@@ -152,8 +158,7 @@ export async function findLegacyPluginSpecs(settings: unknown, loggerFactory: Lo
       map(spec => {
         const name = spec.getId();
         const pluginVersion = spec.getExpectedKibanaVersion();
-        // @ts-ignore
-        const kibanaVersion = settings.pkg.version;
+        const kibanaVersion = packageInfo.version;
         return `Plugin "${name}" was disabled because it expected Kibana version "${pluginVersion}", and found "${kibanaVersion}".`;
       }),
       distinct(),

From b82a454be5746d6c46369a1d2a5212d8ed99c86b Mon Sep 17 00:00:00 2001
From: restrry <restrry@gmail.com>
Date: Tue, 14 Jan 2020 11:41:46 +0100
Subject: [PATCH 2/2] update tests

---
 src/core/server/legacy/legacy_service.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/server/legacy/legacy_service.test.ts b/src/core/server/legacy/legacy_service.test.ts
index 608392e4943f9..af4db68ee95e1 100644
--- a/src/core/server/legacy/legacy_service.test.ts
+++ b/src/core/server/legacy/legacy_service.test.ts
@@ -424,7 +424,7 @@ describe('#discoverPlugins()', () => {
 
     await legacyService.discoverPlugins();
     expect(findLegacyPluginSpecs).toHaveBeenCalledTimes(1);
-    expect(findLegacyPluginSpecs).toHaveBeenCalledWith(expect.any(Object), logger);
+    expect(findLegacyPluginSpecs).toHaveBeenCalledWith(expect.any(Object), logger, env.packageInfo);
   });
 
   it(`register legacy plugin's deprecation providers`, async () => {