[Upgrade Assistant] Fix getFlatSettings() request #89616
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
alisonelizabeth
added
v8.0.0
Team:Kibana Management
|
@elasticmachine merge upstream |
|
Pinging @elastic/es-ui (Team:Elasticsearch UI) |
|
@elasticmachine merge upstream |
jloleysens
approved these changes
Feb 1, 2021
There was a problem hiding this comment.
Great finding and thanks for fixing this @alisonelizabeth ! I did not re-test locally, since I tested the previous refactor locally and everything seemed to go OK.
Would it be worth adding a test to confirm that mappings + settings we expect on the reindexed index are present? From the code it looks like the result of this call is being used here:
|
Thanks for the review @jloleysens! I've added a line to the existing reindexing integration test to verify mappings exist on the new index. |
|
@elasticmachine merge upstream |
💛 Build succeeded, but was flaky
Test FailuresKibana Pipeline / general / X-Pack Alerting API Integration Tests.x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy·ts.alerting api integration security and spaces enabled Alerts legacy alerts alerts superuser at space1 should schedule actions on legacy alertsStandard OutStack TraceMetrics [docs]
History
To update your PR or re-run it, just comment with: |
alisonelizabeth
added a commit
to alisonelizabeth/kibana
that referenced
this pull request
Feb 1, 2021
alisonelizabeth
added a commit
that referenced
this pull request
Feb 2, 2021
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.
This fixes a regression of #89207.
I incorrectly migrated:
to
await esClient.indices.getSettings()instead ofawait esClient.indices.get();indices.getSettings()will only return the index settings and not the mappings.This was caught in the backport PR (#89435), since we are checking for types there. I've updated the tests as part of this PR, however, note that it passed originally since we were mocking the response correctly.