fix: 🐛 correctly create error on no_matching_indices (#61257)

* fix: 🐛 correctly create error on no_matching_indices * feat: 🎸 improve error type checking Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
elastic · Apr 7, 2020 · afb8d8d · afb8d8d
1 parent 3a9e7be
commit afb8d8d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.ts b/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.ts
@@ -45,7 +45,7 @@ export class IndexPatternsApiClient {
         query,
       })
       .catch((resp: any) => {
-        if (resp.body.statusCode === 404 && resp.body.statuscode === 'no_matching_indices') {
+        if (resp.body.statusCode === 404 && resp.body.attributes?.code === 'no_matching_indices') {
           throw new IndexPatternMissingIndices(resp.body.message);
         }
 

diff --git a/src/plugins/data/server/index_patterns/routes.ts b/src/plugins/data/server/index_patterns/routes.ts
@@ -70,7 +70,22 @@ export function registerRoutes(http: HttpServiceSetup) {
           },
         });
       } catch (error) {
-        return response.notFound();
+        if (
+          typeof error === 'object' &&
+          !!error?.isBoom &&
+          !!error?.output?.payload &&
+          typeof error?.output?.payload === 'object'
+        ) {
+          const payload = error?.output?.payload;
+          return response.notFound({
+            body: {
+              message: payload.message,
+              attributes: payload,
+            },
+          });
+        } else {
+          return response.notFound();
+        }
       }
     }
   );