Fix watcher routes broken by Hapi upgrade (#26713) (#26718)

elastic · Dec 5, 2018 · eda9076 · eda9076
1 parent 42102ba
commit eda9076
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/x-pack/plugins/watcher/server/routes/api/history/register_load_route.js b/x-pack/plugins/watcher/server/routes/api/history/register_load_route.js
@@ -57,18 +57,18 @@ export function registerLoadRoute(server) {
           };
 
           const watchHistoryItem = WatchHistoryItem.fromUpstreamJson(json);
-          ({
+          return {
             watchHistoryItem: watchHistoryItem.downstreamJson
-          });
+          };
         })
         .catch(err => {
-        // Case: Error from Elasticsearch JS client
+          // Case: Error from Elasticsearch JS client
           if (isEsError(err)) {
             throw wrapEsError(err);
           }
 
           // Case: default
-          wrapUnknownError(err);
+          throw wrapUnknownError(err);
         });
     },
     config: {

diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_execute_route.js b/x-pack/plugins/watcher/server/routes/api/watch/register_execute_route.js
@@ -47,9 +47,9 @@ export function registerExecuteRoute(server) {
           };
 
           const watchHistoryItem = WatchHistoryItem.fromUpstreamJson(json);
-          ({
+          return {
             watchHistoryItem: watchHistoryItem.downstreamJson
-          });
+          };
         })
         .catch(err => {
 
@@ -59,7 +59,7 @@ export function registerExecuteRoute(server) {
           }
 
           // Case: default
-          wrapUnknownError(err);
+          throw wrapUnknownError(err);
         });
     },
     config: {