From 35db65aaa6b4be60176eabc49322bfc948855d7c Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Tue, 10 Sep 2019 11:38:32 +0200
Subject: [PATCH] [7.x] Data plugin: Expose setup apis also on start (#44903)
 (#45127)

---
 src/legacy/core_plugins/data/public/plugin.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/legacy/core_plugins/data/public/plugin.ts b/src/legacy/core_plugins/data/public/plugin.ts
index b62c8106bc168..76a746045491a 100644
--- a/src/legacy/core_plugins/data/public/plugin.ts
+++ b/src/legacy/core_plugins/data/public/plugin.ts
@@ -79,6 +79,8 @@ export class DataPlugin implements Plugin<DataSetup, DataStart, DataPluginSetupD
   private readonly query: QueryService = new QueryService();
   private readonly search: SearchService = new SearchService();
 
+  private setupApi!: DataSetup;
+
   public setup(core: CoreSetup, { __LEGACY }: DataPluginSetupDependencies): DataSetup {
     const { uiSettings } = core;
     const savedObjectsClient = __LEGACY.savedObjectsClient;
@@ -87,7 +89,8 @@ export class DataPlugin implements Plugin<DataSetup, DataStart, DataPluginSetupD
       uiSettings,
       savedObjectsClient,
     });
-    return {
+
+    this.setupApi = {
       expressions: this.expressions.setup(),
       indexPatterns: indexPatternsService,
       filter: this.filter.setup({
@@ -97,10 +100,13 @@ export class DataPlugin implements Plugin<DataSetup, DataStart, DataPluginSetupD
       query: this.query.setup(),
       search: this.search.setup(savedObjectsClient),
     };
+
+    return this.setupApi;
   }
 
   public start(core: CoreStart, plugins: DataPluginStartDependencies) {
     return {
+      ...this.setupApi!,
       expressions: this.expressions.start({ inspector: plugins.inspector }),
     };
   }