[Ingest Manager] Don't retain POST /setup results. fixes #74587

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

@@ -0,0 +1,83 @@
+/*
+ * 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.
+ */
+
+import { xpackMocks } from '../../../../../../x-pack/mocks';
+import { httpServerMock } from 'src/core/server/mocks';
+import { PostIngestSetupResponse } from '../../../common';
+import { RegistryError } from '../../errors';
+import { createAppContextStartContractMock } from '../../mocks';
+import { ingestManagerSetupHandler } from './handlers';
+import { appContextService } from '../../services/app_context';
+import { setupIngestManager } from '../../services/setup';
+
+jest.mock('../../services/setup', () => {
+  return {
+    setupIngestManager: jest.fn(),
+  };
+});
+
+const mockSetupIngestManager = setupIngestManager as jest.MockedFunction<typeof setupIngestManager>;
+
+describe('ingestManagerSetupHandler', () => {
+  let context: ReturnType<typeof xpackMocks.createRequestHandlerContext>;
+  let response: ReturnType<typeof httpServerMock.createResponseFactory>;
+  let request: ReturnType<typeof httpServerMock.createKibanaRequest>;
+
+  beforeEach(async () => {
+    context = xpackMocks.createRequestHandlerContext();
+    response = httpServerMock.createResponseFactory();
+    request = httpServerMock.createKibanaRequest({
+      method: 'post',
+      path: '/api/ingest_manager/setup',
+    });
+    // prevents `Logger not set.` and other appContext errors
+    appContextService.start(createAppContextStartContractMock());
+  });
+
+  afterEach(async () => {
+    jest.clearAllMocks();
+    appContextService.stop();
+  });
+
+  it('POST /setup succeeds w/200 and body of resolved value', async () => {
+    mockSetupIngestManager.mockImplementation(() => Promise.resolve({ isIntialized: true }));
+    await ingestManagerSetupHandler(context, request, response);
+
+    const expectedBody: PostIngestSetupResponse = { isInitialized: true };
+    expect(response.customError).toHaveBeenCalledTimes(0);
+    expect(response.ok).toHaveBeenCalledWith({ body: expectedBody });
+  });
+
+  it('POST /setup fails w/500 on custom error', async () => {
+    mockSetupIngestManager.mockImplementation(() =>
+      Promise.reject(new Error('SO method mocked to throw'))
+    );
+    await ingestManagerSetupHandler(context, request, response);
+
+    expect(response.customError).toHaveBeenCalledTimes(1);
+    expect(response.customError).toHaveBeenCalledWith({
+      statusCode: 500,
+      body: {
+        message: 'SO method mocked to throw',
+      },
+    });
+  });
+
+  it('POST /setup fails w/502 on RegistryError', async () => {
+    mockSetupIngestManager.mockImplementation(() =>
+      Promise.reject(new RegistryError('Registry method mocked to throw'))
+    );
+
+    await ingestManagerSetupHandler(context, request, response);
+    expect(response.customError).toHaveBeenCalledTimes(1);
+    expect(response.customError).toHaveBeenCalledWith({
+      statusCode: 502,
+      body: {
+        message: 'Registry method mocked to throw',
+      },
+    });
+  });
+});

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

@@ -14,8 +14,7 @@ import {
 } from './handlers';
 import { PostFleetSetupRequestSchema } from '../../types';
 
-export const registerRoutes = (router: IRouter, config: IngestManagerConfigType) => {
-  // Ingest manager setup
+export const registerIngestManagerSetupRoute = (router: IRouter) => {
   router.post(
     {
       path: SETUP_API_ROUTE,
@@ -26,12 +25,20 @@ export const registerRoutes = (router: IRouter, config: IngestManagerConfigType)
     },
     ingestManagerSetupHandler
   );
+};
 
-  if (!config.fleet.enabled) {
-    return;
-  }
+export const registerCreateFleetSetupRoute = (router: IRouter) => {
+  router.post(
+    {
+      path: FLEET_SETUP_API_ROUTES.CREATE_PATTERN,
+      validate: PostFleetSetupRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}-all`] },
+    },
+    createFleetSetupHandler
+  );
+};
 
-  // Get Fleet setup
+export const registerGetFleetStatusRoute = (router: IRouter) => {
   router.get(
     {
       path: FLEET_SETUP_API_ROUTES.INFO_PATTERN,
@@ -40,14 +47,19 @@ export const registerRoutes = (router: IRouter, config: IngestManagerConfigType)
     },
     getFleetStatusHandler
   );
+};
+
+export const registerRoutes = (router: IRouter, config: IngestManagerConfigType) => {
+  // Ingest manager setup
+  registerIngestManagerSetupRoute(router);
+
+  if (!config.fleet.enabled) {
+    return;
+  }
+
+  // Get Fleet setup
+  registerGetFleetStatusRoute(router);
 
   // Create Fleet setup
-  router.post(
-    {
-      path: FLEET_SETUP_API_ROUTES.CREATE_PATTERN,
-      validate: PostFleetSetupRequestSchema,
-      options: { tags: [`access:${PLUGIN_ID}-all`] },
-    },
-    createFleetSetupHandler
-  );
+  registerCreateFleetSetupRoute(router);
 };

x-pack/plugins/ingest_manager/server/services/epm/registry/streams.ts

@@ -11,7 +11,8 @@ export function bufferToStream(buffer: Buffer): PassThrough {
   return stream;
 }
 
-export function streamToString(stream: NodeJS.ReadableStream): Promise<string> {
+export function streamToString(stream: NodeJS.ReadableStream | Buffer): Promise<string> {
+  if (stream instanceof Buffer) return Promise.resolve(stream.toString());
   return new Promise((resolve, reject) => {
     const body: string[] = [];
     stream.on('data', (chunk: string) => body.push(chunk));

x-pack/plugins/ingest_manager/server/services/setup.test.ts

@@ -4,41 +4,59 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { xpackMocks } from '../../../../../x-pack/mocks';
+import { createAppContextStartContractMock } from '../mocks';
+import { appContextService } from './app_context';
 import { setupIngestManager } from './setup';
-import { savedObjectsClientMock } from 'src/core/server/mocks';
 
-describe('setupIngestManager', () => {
-  it('returned promise should reject if errors thrown', async () => {
-    const { savedObjectsClient, callClusterMock } = makeErrorMocks();
-    const setupPromise = setupIngestManager(savedObjectsClient, callClusterMock);
-    await expect(setupPromise).rejects.toThrow('mocked');
+const mockedMethodThrowsError = () =>
+  jest.fn().mockImplementation(() => {
+    throw new Error('SO method mocked to throw');
   });
-});
 
-function makeErrorMocks() {
-  jest.mock('./app_context'); // else fails w/"Logger not set."
-  jest.mock('./epm/registry/registry_url', () => {
-    return {
-      fetchUrl: () => {
-        throw new Error('mocked registry#fetchUrl');
-      },
-    };
+class CustomTestError extends Error {}
+const mockedMethodThrowsCustom = () =>
+  jest.fn().mockImplementation(() => {
+    throw new CustomTestError('method mocked to throw');
   });
 
-  const callClusterMock = jest.fn();
-  const savedObjectsClient = savedObjectsClientMock.create();
-  savedObjectsClient.find = jest.fn().mockImplementation(() => {
-    throw new Error('mocked SO#find');
-  });
-  savedObjectsClient.get = jest.fn().mockImplementation(() => {
-    throw new Error('mocked SO#get');
+describe('setupIngestManager', () => {
+  let context: ReturnType<typeof xpackMocks.createRequestHandlerContext>;
+
+  beforeEach(async () => {
+    context = xpackMocks.createRequestHandlerContext();
+    // prevents `Logger not set.` and other appContext errors
+    appContextService.start(createAppContextStartContractMock());
   });
-  savedObjectsClient.update = jest.fn().mockImplementation(() => {
-    throw new Error('mocked SO#update');
+
+  afterEach(async () => {
+    jest.clearAllMocks();
+    appContextService.stop();
   });
 
-  return {
-    savedObjectsClient,
-    callClusterMock,
-  };
-}
+  describe('should reject with any error thrown underneath', () => {
+    it('SO client throws plain Error', async () => {
+      const soClient = context.core.savedObjects.client;
+      soClient.create = mockedMethodThrowsError();
+      soClient.find = mockedMethodThrowsError();
+      soClient.get = mockedMethodThrowsError();
+      soClient.update = mockedMethodThrowsError();
+
+      const setupPromise = setupIngestManager(soClient, jest.fn());
+      await expect(setupPromise).rejects.toThrow('SO method mocked to throw');
+      await expect(setupPromise).rejects.toThrow(Error);
+    });
+
+    it('SO client throws other error', async () => {
+      const soClient = context.core.savedObjects.client;
+      soClient.create = mockedMethodThrowsCustom();
+      soClient.find = mockedMethodThrowsCustom();
+      soClient.get = mockedMethodThrowsCustom();
+      soClient.update = mockedMethodThrowsCustom();
+
+      const setupPromise = setupIngestManager(soClient, jest.fn());
+      await expect(setupPromise).rejects.toThrow('method mocked to throw');
+      await expect(setupPromise).rejects.toThrow(CustomTestError);
+    });
+  });
+});