Fix tests

Author: chrisronline

x-pack/plugins/alerting/server/lib/errors/es_error_parser.test.ts

@@ -5,41 +5,42 @@
  * 2.0.
  */
 
-import { getEsCause } from './es_error_parser';
+import { getEsErrorMessage } from './es_error_parser';
 
 describe('ES error parser', () => {
   test('should return all the cause of the error', () => {
     expect(
-      getEsCause({
-        caused_by: {
-          reason: 'reason1',
-        },
-      })
-    ).toStrictEqual(['reason1']);
-
-    expect(
-      getEsCause({
-        caused_by: {
-          reason: 'reason1',
-          caused_by: {
-            reason: 'reason2',
+      getEsErrorMessage({
+        name: '',
+        message: '',
+        error: {
+          meta: {
+            body: {
+              error: {
+                caused_by: {
+                  reason: 'reason1',
+                },
+              },
+            },
           },
         },
       })
-    ).toStrictEqual(['reason1', 'reason2']);
+    ).toStrictEqual(', caused by: "reason1"');
 
     expect(
-      getEsCause({
-        failed_shards: [
-          {
-            reason: {
+      getEsErrorMessage({
+        name: '',
+        message: '',
+        meta: {
+          body: {
+            error: {
               caused_by: {
-                reason: 'reason3',
+                reason: 'reason2',
               },
             },
           },
-        ],
+        },
       })
-    ).toStrictEqual(['reason3']);
+    ).toStrictEqual(', caused by: "reason2"');
   });
 });

x-pack/plugins/alerting/server/lib/errors/es_error_parser.ts

@@ -45,11 +45,9 @@ const getEsCause = (obj: ErrorObject = {}, causes: string[] = []): string[] => {
   return updated.filter(Boolean);
 };
 
-export const getEsErrorMessage = (error: Error) => {
-  let message = error.message;
-  const apiError =
-    (error as ElasticsearchError)?.error?.meta?.body?.error ??
-    (error as ElasticsearchError)?.meta?.body?.error;
+export const getEsErrorMessage = (error: ElasticsearchError) => {
+  let message = error?.message;
+  const apiError = error?.error?.meta?.body?.error ?? error?.meta?.body?.error;
   if (apiError) {
     message += `, caused by: "${getEsCause(apiError as ErrorObject)}"`;
   }

x-pack/plugins/alerting/server/lib/errors/types.ts

@@ -4,16 +4,21 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ApiError } from '@elastic/elasticsearch';
 import { KibanaResponseFactory, IKibanaResponse } from '../../../../../../src/core/server';
 
 export interface ErrorThatHandlesItsOwnResponse extends Error {
   sendResponse(res: KibanaResponseFactory): IKibanaResponse;
 }
 
+interface ElasticsearchErrorCausedBy {
+  caused_by?: {
+    reason?: string;
+  };
+}
+
 interface ElasticsearchErrorMeta {
   body?: {
-    error?: ApiError;
+    error?: ElasticsearchErrorCausedBy;
   };
 }