From 212a1a33c6f674703a95ddb49d1c3632783c8009 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Thu, 23 Jan 2020 13:31:22 +0100
Subject: [PATCH] Re-introduce injected elasticsearch variable and use it in
 public

---
 src/legacy/core_plugins/console_legacy/index.ts |  7 +++++++
 src/plugins/console/public/index.ts             |  6 ++----
 src/plugins/console/public/plugin.ts            | 10 +++++++---
 src/plugins/console/server/plugin.ts            | 13 ++++++++++---
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/legacy/core_plugins/console_legacy/index.ts b/src/legacy/core_plugins/console_legacy/index.ts
index e2305e69daa525..65547e1ee54067 100644
--- a/src/legacy/core_plugins/console_legacy/index.ts
+++ b/src/legacy/core_plugins/console_legacy/index.ts
@@ -18,7 +18,9 @@
  */
 
 import { first } from 'rxjs/operators';
+import { head } from 'lodash';
 import { resolve } from 'path';
+import url from 'url';
 
 // TODO: Remove this hack once we can get the ES config we need for Console proxy a better way.
 let _legacyEsConfig: any;
@@ -39,6 +41,11 @@ export default function(kibana: any) {
 
     uiExports: {
       styleSheetPaths: resolve(__dirname, 'public/styles/index.scss'),
+      injectDefaultVars: () => ({
+        elasticsearchUrl: url.format(
+          Object.assign(url.parse(head(_legacyEsConfig.hosts)), { auth: false })
+        ),
+      }),
     },
   } as any);
 }
diff --git a/src/plugins/console/public/index.ts b/src/plugins/console/public/index.ts
index 64d4a01a88dd5c..2a3f002557db3a 100644
--- a/src/plugins/console/public/index.ts
+++ b/src/plugins/console/public/index.ts
@@ -17,14 +17,12 @@
  * under the License.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
-
 import { ConsoleUIPlugin } from './plugin';
 
 export { ConsoleUIPlugin as Plugin };
 
 export { Panel, PanelsContainer } from './application/components/split_panel';
 
-export function plugin(ctx: PluginInitializerContext) {
-  return new ConsoleUIPlugin(ctx);
+export function plugin() {
+  return new ConsoleUIPlugin();
 }
diff --git a/src/plugins/console/public/plugin.ts b/src/plugins/console/public/plugin.ts
index be4628f916f418..05e72c3b726028 100644
--- a/src/plugins/console/public/plugin.ts
+++ b/src/plugins/console/public/plugin.ts
@@ -20,14 +20,14 @@
 import { render, unmountComponentAtNode } from 'react-dom';
 import { i18n } from '@kbn/i18n';
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'kibana/public';
+import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
 
 import { FeatureCatalogueCategory } from '../../home/public';
 
 import { AppSetupUIPluginDependencies } from './types';
 
 export class ConsoleUIPlugin implements Plugin<void, void, AppSetupUIPluginDependencies> {
-  constructor(private readonly ctx: PluginInitializerContext) {}
+  constructor() {}
 
   async setup(
     { notifications, getStartServices }: CoreSetup,
@@ -56,7 +56,11 @@ export class ConsoleUIPlugin implements Plugin<void, void, AppSetupUIPluginDepen
       enableRouting: false,
       mount: async ({ core: { docLinks, i18n: i18nDep } }, { element }) => {
         const { boot } = await import('./application');
-        const { elasticsearchUrl } = this.ctx.config.get<any>();
+        const [{ injectedMetadata }] = await getStartServices();
+        const elasticsearchUrl = injectedMetadata.getInjectedVar(
+          'elasticsearchUrl',
+          'http://localhost:9200'
+        ) as string;
         render(
           boot({
             docLinkVersion: docLinks.DOC_LINK_VERSION,
diff --git a/src/plugins/console/server/plugin.ts b/src/plugins/console/server/plugin.ts
index 88547be3e0b69b..c8ef84aee3b615 100644
--- a/src/plugins/console/server/plugin.ts
+++ b/src/plugins/console/server/plugin.ts
@@ -34,7 +34,14 @@ export class ConsoleServerPlugin implements Plugin<ConsoleSetup> {
     this.log = this.ctx.logger.get();
   }
 
-  async setup({ http }: CoreSetup) {
+  async setup({ http, capabilities, getStartServices }: CoreSetup) {
+    capabilities.registerProvider(() => ({
+      dev_tools: {
+        show: true,
+        save: true,
+      },
+    }));
+
     const config = await this.ctx.config
       .create()
       .pipe(first())
@@ -69,6 +76,6 @@ export class ConsoleServerPlugin implements Plugin<ConsoleSetup> {
       addProcessorDefinition,
     };
   }
-  async start() {}
-  stop() {}
+
+  start() {}
 }