Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 🐛 correctly create error on no_matching_indices #61257

Merged
merged 6 commits into from
Apr 7, 2020
Merged

fix: 🐛 correctly create error on no_matching_indices #61257

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6ce62da
fix: 🐛 correctly create error on no_matching_indices
streamich Mar 25, 2020
cb7af68
Merge branch 'master' into better-error-message
elasticmachine Mar 27, 2020
dda5b94
Merge branch 'master' into better-error-message
elasticmachine Mar 30, 2020
f46820d
Merge remote-tracking branch 'upstream/master' into better-error-message
streamich Apr 3, 2020
b022988
feat: 🎸 improve error type checking
streamich Apr 3, 2020
f2d7ccf
Merge branch 'master' into better-error-message
elasticmachine Apr 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
16 changes: 15 additions & 1 deletion src/plugins/data/server/index_patterns/routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
}
);
Expand Down