[index patterns] Don't attempt to wrap Boom errors (#14253) (#14264)

elastic · Oct 4, 2017 · 60dc602 · 60dc602
1 parent 3503aac
commit 60dc602
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/server/index_patterns/service/lib/errors.js b/src/server/index_patterns/service/lib/errors.js
@@ -47,6 +47,10 @@ export function convertEsError(indices, error) {
     return createNoMatchingIndicesError(indices);
   }
 
+  if (error.isBoom) {
+    return error;
+  }
+
   const statusCode = error.statusCode;
   const message = error.body ? error.body.error : undefined;
   return Boom.wrap(error, statusCode, message);

diff --git a/test/api_integration/apis/index_patterns/es_errors/errors.js b/test/api_integration/apis/index_patterns/es_errors/errors.js
@@ -1,5 +1,6 @@
 import expect from 'expect.js';
 import { errors as esErrors } from 'elasticsearch';
+import Boom from 'boom';
 
 import {
   isEsIndexNotFoundError,
@@ -106,6 +107,16 @@ export default function ({ getService }) {
         expect(converted).to.have.property('isBoom');
         expect(converted.output.statusCode).to.be(403);
       });
+
+      it('handles errors that are already Boom errors', () => {
+        const error = new Error();
+        error.statusCode = 401;
+        const boomError = Boom.wrap(error, error.statusCode);
+
+        const converted = convertEsError(indices, boomError);
+
+        expect(converted.output.statusCode).to.be(401);
+      });
     });
   });
 }