[Ingest Manager] Do not await in start. Return a Promise

x-pack/plugins/ingest_manager/common/types/rest_spec/index.ts

@@ -12,6 +12,7 @@ export * from './fleet_setup';
 export * from './epm';
 export * from './enrollment_api_key';
 export * from './install_script';
+export * from './ingest_setup';
 export * from './output';
 export * from './settings';
 export * from './app';

x-pack/plugins/ingest_manager/common/types/rest_spec/ingest_setup.ts

@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export interface PostIngestSetupResponse {
+  isInitialized: boolean;
+}

x-pack/plugins/ingest_manager/public/plugin.ts

@@ -14,7 +14,7 @@ import { i18n } from '@kbn/i18n';
 import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
 import { DataPublicPluginSetup, DataPublicPluginStart } from '../../../../src/plugins/data/public';
 import { LicensingPluginSetup } from '../../licensing/public';
-import { PLUGIN_ID } from '../common/constants';
+import { PLUGIN_ID, CheckPermissionsResponse, PostIngestSetupResponse } from '../common';
 
 import { IngestManagerConfigType } from '../common/types';
 import { setupRouteService, appRoutesService } from '../common';
@@ -28,10 +28,7 @@ export type IngestManagerSetup = void;
  */
 export interface IngestManagerStart {
   registerDatasource: typeof registerDatasource;
-  success: boolean;
-  error?: {
-    message: string;
-  };
+  success: Promise<true>;
 }
 
 export interface IngestManagerSetupDeps {
@@ -78,21 +75,29 @@ export class IngestManagerPlugin
   }
 
   public async start(core: CoreStart): Promise<IngestManagerStart> {
+    let successPromise: IngestManagerStart['success'];
     try {
-      const permissionsResponse = await core.http.get(appRoutesService.getCheckPermissionsPath());
-      if (permissionsResponse.success) {
-        const { isInitialized: success } = await core.http.post(setupRouteService.getSetupPath());
-        return { success, registerDatasource };
+      const permissionsResponse = await core.http.get<CheckPermissionsResponse>(
+        appRoutesService.getCheckPermissionsPath()
+      );
+
+      if (permissionsResponse?.success) {
+        successPromise = core.http
+          .post<PostIngestSetupResponse>(setupRouteService.getSetupPath())
+          .then(({ isInitialized }) =>
+            isInitialized ? Promise.resolve(true) : Promise.reject(new Error('Unknown setup error'))
+          );
       } else {
-        throw new Error(permissionsResponse.error);
+        throw new Error(permissionsResponse?.error || 'Unknown permissions error');
       }
     } catch (error) {
-      return {
-        success: false,
-        error: { message: error.body?.message || 'Unknown error' },
-        registerDatasource,
-      };
+      successPromise = Promise.reject(error);
     }
+
+    return {
+      success: successPromise,
+      registerDatasource,
+    };
   }
 
   public stop() {}

x-pack/plugins/ingest_manager/server/routes/setup/handlers.ts

@@ -6,7 +6,7 @@
 import { RequestHandler } from 'src/core/server';
 import { TypeOf } from '@kbn/config-schema';
 import { outputService, appContextService } from '../../services';
-import { GetFleetStatusResponse } from '../../../common';
+import { GetFleetStatusResponse, PostIngestSetupResponse } from '../../../common';
 import { setupIngestManager, setupFleet } from '../../services/setup';
 import { PostFleetSetupRequestSchema } from '../../types';
 import { IngestManagerError, getHTTPResponseCode } from '../../errors';
@@ -83,9 +83,10 @@ export const ingestManagerSetupHandler: RequestHandler = async (context, request
   const callCluster = context.core.elasticsearch.legacy.client.callAsCurrentUser;
   const logger = appContextService.getLogger();
   try {
+    const body: PostIngestSetupResponse = { isInitialized: true };
     await setupIngestManager(soClient, callCluster);
     return response.ok({
-      body: { isInitialized: true },
+      body,
     });
   } catch (e) {
     if (e instanceof IngestManagerError) {

x-pack/plugins/security_solution/public/app/home/setup.tsx

@@ -32,20 +32,7 @@ export const Setup: React.FunctionComponent<{
       });
     };
 
-    const displayToast = () => {
-      notifications.toasts.addDanger({
-        title,
-        text: defaultText,
-      });
-    };
-
-    if (!ingestManager.success) {
-      if (ingestManager.error) {
-        displayToastWithModal(ingestManager.error.message);
-      } else {
-        displayToast();
-      }
-    }
+    ingestManager.success.catch((error: Error) => displayToastWithModal(error.message));
   }, [ingestManager, notifications.toasts]);
 
   return null;

x-pack/plugins/security_solution/public/common/mock/endpoint/dependencies_start_mock.ts

@@ -56,6 +56,6 @@ export const depsStartMock: () => DepsStartMock = () => {
 
   return {
     data: dataMock,
-    ingestManager: { success: true, registerDatasource },
+    ingestManager: { success: Promise.resolve(true), registerDatasource },
   };
 };

x-pack/test/security_solution_endpoint/apps/endpoint/index.ts

@@ -5,10 +5,13 @@
  */
 import { FtrProviderContext } from '../../ftr_provider_context';
 
-export default function ({ loadTestFile }: FtrProviderContext) {
+export default function ({ loadTestFile, getService }: FtrProviderContext) {
   describe('endpoint', function () {
     this.tags('ciGroup7');
-
+    const ingestManager = getService('ingestManager');
+    before(async () => {
+      await ingestManager.setup();
+    });
     loadTestFile(require.resolve('./endpoint_list'));
     loadTestFile(require.resolve('./policy_list'));
     loadTestFile(require.resolve('./policy_details'));

x-pack/test/security_solution_endpoint/services/index.ts

@@ -4,10 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { services as apiIntegrationServices } from '../../api_integration/services';
 import { services as xPackFunctionalServices } from '../../functional/services';
 import { EndpointPolicyTestResourcesProvider } from './endpoint_policy';
 
 export const services = {
   ...xPackFunctionalServices,
+  ingestManager: apiIntegrationServices.ingestManager,
   policyTestResources: EndpointPolicyTestResourcesProvider,
 };