PR feedback

Author: chrisronline

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

@@ -42,5 +42,71 @@ describe('ES error parser', () => {
         },
       })
     ).toStrictEqual(', caused by: "reason2"');
+
+    expect(
+      getEsErrorMessage({
+        name: '',
+        message: '',
+        meta: {
+          body: {
+            error: {
+              caused_by: {
+                reason: 'reason3',
+                caused_by: {
+                  reason: 'reason4',
+                },
+              },
+            },
+          },
+        },
+      })
+    ).toStrictEqual(', caused by: "reason3,reason4"');
+
+    expect(
+      getEsErrorMessage({
+        name: '',
+        message: '',
+        meta: {
+          body: {
+            error: {
+              failed_shards: [
+                {
+                  reason: {
+                    caused_by: {
+                      reason: 'reason4',
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        },
+      })
+    ).toStrictEqual(', caused by: "reason4"');
+
+    expect(
+      getEsErrorMessage({
+        name: '',
+        message: '',
+        meta: {
+          body: {
+            error: {
+              failed_shards: [
+                {
+                  reason: {
+                    caused_by: {
+                      reason: 'reason5',
+                      caused_by: {
+                        reason: 'reason6',
+                      },
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        },
+      })
+    ).toStrictEqual(', caused by: "reason5,reason6"');
   });
 });

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

@@ -6,23 +6,12 @@
  */
 
 // import { ResponseError } from '@elastic/elasticsearch/lib/errors';
-import { ElasticsearchError } from './';
+import { ElasticsearchError, ElasticsearchErrorCausedByObject } from './types';
 
-interface ErrorObject {
-  caused_by?: {
-    reason?: string;
-    caused_by?: {};
-  };
-  failed_shards?: Array<{
-    reason?: {
-      caused_by?: {
-        reason?: string;
-      };
-    };
-  }>;
-}
-
-const getEsCause = (obj: ErrorObject = {}, causes: string[] = []): string[] => {
+const getEsCause = (
+  obj: ElasticsearchErrorCausedByObject = {},
+  causes: string[] = []
+): string[] => {
   const updated = [...causes];
 
   if (obj.caused_by) {
@@ -49,7 +38,7 @@ 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)}"`;
+    message += `, caused by: "${getEsCause(apiError as ElasticsearchErrorCausedByObject)}"`;
   }
   return message;
 };

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

@@ -10,15 +10,19 @@ export interface ErrorThatHandlesItsOwnResponse extends Error {
   sendResponse(res: KibanaResponseFactory): IKibanaResponse;
 }
 
-interface ElasticsearchErrorCausedBy {
-  caused_by?: {
-    reason?: string;
-  };
+export interface ElasticsearchErrorCausedByObject {
+  reason?: string;
+  caused_by?: ElasticsearchErrorCausedByObject;
+  failed_shards?: Array<{
+    reason?: {
+      caused_by?: ElasticsearchErrorCausedByObject;
+    };
+  }>;
 }
 
 interface ElasticsearchErrorMeta {
   body?: {
-    error?: ElasticsearchErrorCausedBy;
+    error?: ElasticsearchErrorCausedByObject;
   };
 }