use root error

elastic · Oct 12, 2020 · b7d33a7 · b7d33a7
1 parent 9073897
commit b7d33a7
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 15 deletions.
diff --git a/src/plugins/expressions/common/util/create_error.ts b/src/plugins/expressions/common/util/create_error.ts
@@ -22,7 +22,7 @@ import { ExpressionValueError } from '../../common';
 type ErrorLike = Partial<Pick<Error, 'name' | 'message' | 'stack'>>;
 
 export const createError = (
-  err: string | Error | ErrorLike | ExpressionValueError['error']
+  err: string | Error | (ErrorLike & { original?: Error })
 ): ExpressionValueError => ({
   type: 'error',
   error: {

diff --git a/x-pack/plugins/lens/public/editor_frame_service/error_helper.ts b/x-pack/plugins/lens/public/editor_frame_service/error_helper.ts
@@ -8,8 +8,14 @@ import { i18n } from '@kbn/i18n';
 
 import { ExpressionRenderError } from 'src/plugins/expressions/public';
 
+interface ElasticsearchErrorClause {
+  type: string;
+  reason: string;
+  caused_by?: ElasticsearchErrorClause;
+}
+
 interface RequestError extends Error {
-  body?: { attributes?: { error: { caused_by: { type: string; reason: string } } } };
+  body?: { attributes?: { error: ElasticsearchErrorClause } };
 }
 
 const isRequestError = (e: Error | RequestError): e is RequestError => {
@@ -19,18 +25,25 @@ const isRequestError = (e: Error | RequestError): e is RequestError => {
   return false;
 };
 
+function getNestedErrorClause({
+  type,
+  reason,
+  caused_by: causedBy,
+}: ElasticsearchErrorClause): { type: string; reason: string } {
+  if (causedBy) {
+    return getNestedErrorClause(causedBy);
+  }
+  return { type, reason };
+}
+
 export function getOriginalRequestErrorMessage(error?: ExpressionRenderError | null) {
-  return (
-    error &&
-    'original' in error &&
-    error.original &&
-    isRequestError(error.original) &&
-    i18n.translate('xpack.lens.editorFrame.expressionFailureMessage', {
-      defaultMessage: 'Request error: {causedByType}, {causedByReason}',
-      values: {
-        causedByType: error.original.body?.attributes?.error?.caused_by.type,
-        causedByReason: error.original.body?.attributes?.error?.caused_by.reason,
-      },
-    })
-  );
+  if (error && 'original' in error && error.original && isRequestError(error.original)) {
+    const rootError = getNestedErrorClause(error.original.body!.attributes!.error);
+    if (rootError.reason && rootError.type) {
+      return i18n.translate('xpack.lens.editorFrame.expressionFailureMessage', {
+        defaultMessage: 'Request error: {type}, {reason}',
+        values: rootError,
+      });
+    }
+  }
 }