Fixes elastic#40714: Import API don't override SavedObjectClient erro…

…rs (elastic#41125) (elastic#42753) * Import API: Don't override SavedObjectClient errors * Review comments: rely on default hapi error behaviour
sorenlouv · Aug 6, 2019 · 4399d41 · 4399d41
1 parent d0ff5f4
commit 4399d41
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/src/legacy/core_plugins/kibana/server/routes/api/export/index.js b/src/legacy/core_plugins/kibana/server/routes/api/export/index.js
@@ -17,10 +17,11 @@
  * under the License.
  */
 
-import { exportDashboards } from '../../../lib/export/export_dashboards';
-import Boom from 'boom';
 import Joi from 'joi';
 import moment from 'moment';
+
+import { exportDashboards } from '../../../lib/export/export_dashboards';
+
 export function exportApi(server) {
   server.route({
     path: '/api/kibana/dashboards/export',
@@ -46,8 +47,7 @@ export function exportApi(server) {
             .header('Content-Disposition', `attachment; filename="${filename}"`)
             .header('Content-Type', 'application/json')
             .header('Content-Length', Buffer.byteLength(json, 'utf8'));
-        })
-        .catch(err => Boom.boomify(err, { statusCode: 400 }));
+        });
     }
   });
 }
diff --git a/src/legacy/core_plugins/kibana/server/routes/api/import/index.js b/src/legacy/core_plugins/kibana/server/routes/api/import/index.js
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import Boom from 'boom';
 import Joi from 'joi';
 import { importDashboards } from '../../../lib/import/import_dashboards';
 
@@ -40,11 +39,7 @@ export function importApi(server) {
     },
 
     handler: async (req) => {
-      try {
-        return await importDashboards(req);
-      } catch (err) {
-        throw Boom.boomify(err, { statusCode: 400 });
-      }
+      return await importDashboards(req);
     }
   });
 }