Fixes bugs for product check in update and delete #109979
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 tasks
TinaHeiligers
commented
Aug 24, 2021
| @@ -69,6 +70,11 @@ export function decorateEsError(error: EsErrors) { | |||
| if (match?.length > 0) { | |||
| return SavedObjectsErrorHelpers.decorateIndexAliasNotFoundError(error, match[1]); | |||
| } | |||
| // Throw EsUnavailable error if the 404 is not from elasticsearch | |||
| // Needed here to verify Product support for any non-ignored 404 responses from calls to ES | |||
There was a problem hiding this comment.
Check against the product header and return the appropriate error from here to catch it in update.
TinaHeiligers
commented
Aug 24, 2021
| @@ -681,6 +681,10 @@ export class SavedObjectsRepository { | |||
| { ignore: [404] } | |||
| ); | |||
|
|
|||
| if (isNotFoundFromUnsupportedServer({ statusCode, headers })) { | |||
There was a problem hiding this comment.
Simplifies the nested conditionals originally added.
|
Pinging @elastic/kibana-core (Team:Core) |
mshustov
reviewed
Aug 26, 2021
| expect(SavedObjectsErrorHelpers.isNotFoundError(error)).toBe(false); | ||
| const genericError = decorateEsError(error); | ||
| expect(genericError).not.toBe(error); | ||
| expect(SavedObjectsErrorHelpers.isNotFoundError(error)).toBe(false); |
There was a problem hiding this comment.
nit: duplicated. see L117
mshustov
reviewed
Aug 26, 2021
| ); | ||
| await expectNotFoundEsUnavailableError(type, id); | ||
| await expectNotFoundError(type, id); |
mshustov
approved these changes
Aug 26, 2021
TinaHeiligers
commented
Aug 26, 2021
src/core/server/saved_objects/service/lib/decorate_es_error.test.ts
Outdated
Show resolved
Hide resolved
💚 Build SucceededMetrics [docs]
History
To update your PR or re-run it, just comment with: |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Aug 26, 2021
* Fixes bugs for product check in update and delete * Apply suggestions from code review
💚 Backport successful
This backport PR will be merged automatically after passing CI. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Adding integration tests for #107246 uncovered a couple of edge cases not handled in the original work. This PR fixes bugs in update and delete introduced in #107301.
In the original implementation for handling 404's in
delete, we only verified that an error is from Elasticsearch whenbody.foundis explicitlynot_found. However, that might not be the case when the error originates from the proxy itself and we'll miss those.In
update, we don't ignore 404's and these are caught ifretryCallClusterthrows so we have to handle the product check on NotFound errors indecorateEsError.Checklist
Delete any items that are not applicable to this PR.
Risk Matrix
Delete this section if it is not applicable to this PR.
Before closing this PR, invite QA, stakeholders, and other developers to identify risks that should be tested prior to the change/feature release.
When forming the risk matrix, consider some of the following examples and how they may potentially impact the change:
For maintainers
(No breaking API changes)