[8.18] [Security Solution] Reverts all remaining diff algorithm fields to return Target version when base version is missing (#214287)#214515
Merged
kibanamachine merged 1 commit intoelastic:8.18from Mar 14, 2025
Conversation
…turn Target version when base version is missing (elastic#214287) ## Summary Originally we had intended to have the prebuilt rule diff algorithms merge non-functional fields when the field's base version was missing and a rule was marked as customized as described in elastic#210358 > - When the rule has a missing base version and is marked as customized: > - We should attempt to merge all non-functional mergeable fields (any field that doesn't have consequences with how the rule runs e.g. tags) and return them as SOLVABLE_CONFLICT We ended up changing this logic to return the `Target` version for every field that fit that description (elastic#214161 and elastic#213757) besides `tags` and in order to support consistency rather than a very minor edge case, we now just return the target version for every field with a missing base version and let users sort it out on their end This PR reverts the changes made to accommodate this edge case and updates related tests to account for the new logic ### Checklist Check the PR satisfies following conditions. Reviewers should verify this PR satisfies this list as well. - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios --------- Co-authored-by: Georgii Gorbachev <georgii.gorbachev@elastic.co> (cherry picked from commit a2d2054)
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
1 task
Contributor
💚 Build Succeeded
Metrics [docs]
cc @dplumlee |
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
3 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.
Backport
This will backport the following commits from
mainto8.18:Questions ?
Please refer to the Backport tool documentation