From 6ce62da912c974ee4252fccd6040bf20d021a1d6 Mon Sep 17 00:00:00 2001 From: streamich Date: Wed, 25 Mar 2020 14:06:11 +0100 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=F0=9F=90=9B=20correctly=20create=20?= =?UTF-8?q?error=20on=20no=5Fmatching=5Findices?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index_patterns/index_patterns_api_client.ts | 2 +- src/plugins/data/server/index_patterns/routes.ts | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 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 index 4d4e8d8827b48..0007d1780c25b 100644 --- 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 index 8f017a73083ec..9d402eef184a2 100644 --- a/src/plugins/data/server/index_patterns/routes.ts +++ b/src/plugins/data/server/index_patterns/routes.ts @@ -70,7 +70,21 @@ export function registerRoutes(http: HttpServiceSetup) { }, }); } catch (error) { - return response.notFound(); + if ( + !!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(); + } } } ); From b022988af9839cd491b36e2e281cdfa51512c0b2 Mon Sep 17 00:00:00 2001 From: streamich Date: Fri, 3 Apr 2020 13:11:35 +0200 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20improve=20error=20ty?= =?UTF-8?q?pe=20checking?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/data/server/index_patterns/routes.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/data/server/index_patterns/routes.ts b/src/plugins/data/server/index_patterns/routes.ts index 9d402eef184a2..8b9fa28c77165 100644 --- a/src/plugins/data/server/index_patterns/routes.ts +++ b/src/plugins/data/server/index_patterns/routes.ts @@ -71,7 +71,8 @@ export function registerRoutes(http: HttpServiceSetup) { }); } catch (error) { if ( - !!error.isBoom && + typeof error === 'object' && + !!error?.isBoom && !!error?.output?.payload && typeof error?.output?.payload === 'object' ) {