Fix places calling callEs still

elastic · Feb 12, 2020 · 88b525c · 88b525c
1 parent ee4393c
commit 88b525c
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 10 deletions.
diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.mock.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.mock.ts
@@ -8,6 +8,7 @@ import { IClusterClientAdapter } from './cluster_client_adapter';
 
 const createClusterClientMock = () => {
   const mock: jest.Mocked<IClusterClientAdapter> = {
+    indexDocument: jest.fn(),
     doesIlmPolicyExist: jest.fn(),
     createIlmPolicy: jest.fn(),
     doesIndexTemplateExist: jest.fn(),

diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
@@ -23,6 +23,22 @@ beforeEach(() => {
   });
 });
 
+describe('indexDocument', () => {
+  test('should call cluster client with given doc', async () => {
+    await clusterClientAdapter.indexDocument({ args: true });
+    expect(clusterClient.callAsInternalUser).toHaveBeenCalledWith('index', {
+      args: true,
+    });
+  });
+
+  test('should throw error when cluster client throws an error', async () => {
+    clusterClient.callAsInternalUser.mockRejectedValue(new Error('Fail'));
+    await expect(
+      clusterClientAdapter.indexDocument({ args: true })
+    ).rejects.toThrowErrorMatchingInlineSnapshot(`"Fail"`);
+  });
+});
+
 describe('doesIlmPolicyExist', () => {
   const notFoundError = new Error('Not found') as any;
   notFoundError.statusCode = 404;

diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
@@ -23,6 +23,10 @@ export class ClusterClientAdapter {
     this.clusterClient = opts.clusterClient;
   }
 
+  public async indexDocument(doc: any): Promise<void> {
+    await this.callEs('index', doc);
+  }
+
   public async doesIlmPolicyExist(policyName: string): Promise<boolean> {
     const request = {
       method: 'GET',

diff --git a/x-pack/plugins/event_log/server/event_log_service.test.ts b/x-pack/plugins/event_log/server/event_log_service.test.ts
@@ -6,18 +6,14 @@
 
 import { IEventLogConfig } from './types';
 import { EventLogService } from './event_log_service';
-import { getEsNames } from './es/names';
-import { createMockEsContext } from './es/context.mock';
+import { contextMock } from './es/context.mock';
 import { loggingServiceMock } from '../../../../src/core/server/logging/logging_service.mock';
 
 const loggingService = loggingServiceMock.create();
 const systemLogger = loggingService.get();
 
 describe('EventLogService', () => {
-  const esContext = createMockEsContext({
-    esNames: getEsNames('ABC'),
-    logger: systemLogger,
-  });
+  const esContext = contextMock.create();
 
   function getService(config: IEventLogConfig) {
     const { enabled, logEntries, indexEntries } = config;

diff --git a/x-pack/plugins/event_log/server/event_logger.test.ts b/x-pack/plugins/event_log/server/event_logger.test.ts
@@ -7,9 +7,8 @@
 import { IEvent, IEventLogger, IEventLogService } from './index';
 import { ECS_VERSION } from './types';
 import { EventLogService } from './event_log_service';
-import { getEsNames } from './es/names';
 import { EsContext } from './es/context';
-import { createMockEsContext } from './es/context.mock';
+import { contextMock } from './es/context.mock';
 import { loggerMock, MockedLogger } from '../../../../src/core/server/logging/logger.mock';
 import { delay } from './lib/delay';
 import { EVENT_LOGGED_PREFIX } from './event_logger';
@@ -24,7 +23,7 @@ describe('EventLogger', () => {
 
   beforeEach(() => {
     systemLogger = loggerMock.create();
-    esContext = createMockEsContext({ esNames: getEsNames('ABC'), logger: systemLogger });
+    esContext = contextMock.create();
     service = new EventLogService({
       esContext,
       systemLogger,

diff --git a/x-pack/plugins/event_log/server/event_logger.ts b/x-pack/plugins/event_log/server/event_logger.ts
@@ -171,7 +171,7 @@ function indexEventDoc(esContext: EsContext, doc: Doc): void {
 async function indexLogEventDoc(esContext: EsContext, doc: any) {
   esContext.logger.debug(`writing to event log: ${JSON.stringify(doc)}`);
   await esContext.waitTillReady();
-  await esContext.callEs('index', doc);
+  await esContext.esAdapter.indexDocument(doc);
   esContext.logger.debug(`writing to event log complete`);
 }