Make template conflict warning deterministic#67066
Merged
tvernum merged 1 commit intoelastic:masterfrom Jan 7, 2021
Merged
Conversation
This changes the conflict (overlap) template warning deterministic by collecting the composable templates into a map sorted by template name. Relates: elastic#66820
Collaborator
|
Pinging @elastic/es-core-features (Team:Core/Features) |
tvernum
added a commit
to tvernum/elasticsearch
that referenced
this pull request
Jan 6, 2021
This changes the expected error message (on FIPS) so that the order of the templates (and their associated patterns) matches the (newly updated) order generated by the server. Relates: elastic#67066 Resolves: elastic#66820
joegallo
approved these changes
Jan 6, 2021
tvernum
added a commit
that referenced
this pull request
Jan 7, 2021
tvernum
added a commit
to tvernum/elasticsearch
that referenced
this pull request
Jan 11, 2021
This changes the conflict (overlap) template warning so that the message is built deterministically. It does this by collecting the composable templates into a map sorted by template name. Relates: elastic#66820 Backport of: elastic#67066
tvernum
added a commit
that referenced
this pull request
Jan 11, 2021
This changes the conflict (overlap) template warning so that the message is built deterministically. It does this by collecting the composable templates into a map sorted by template name. Backport of: #67066
tvernum
added a commit
to tvernum/elasticsearch
that referenced
this pull request
Jan 11, 2021
This changes the expected error message (on FIPS) so that the order of the templates (and their associated patterns) matches the (newly updated) order generated by the server. Relates: elastic#67066 Resolves: elastic#66820 Backport of: elastic#67067
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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 changes the conflict (overlap) template warning so that the
message is built deterministically. It does this by collecting the
composable templates into a map sorted by template name.
Relates: #66820