[Security Solution] Updates diff outcome logic to return CustomizedValueCanUpdate on scenario -AB
#186435
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
dplumlee
added
release_note:skip
3 tasks
|
Thanks for putting this up Davis. I think we should keep this PR open until:
|
2 tasks
jpdjere
added a commit
that referenced
this pull request
Jul 25, 2024
…nd functionality (#187770) **Resolves: #180153 **Resolves: #188277 ## Summary - Extend the POST /upgrade/_review API endpoint's contract and functionality - Changes `has_conflict` property within each rule field's `ThreeWayDiff` from `boolean` to `enum` with possible values: - `NONE`: no conflicts in three way diff - `SOLVABLE`: conflict detected but was successfully resolved by our algorithms - `NON_SOLVABLE`: conflict detected and could not be resolved by our algorithms. - Adds `has_base_version` boolean field within each field diff calculation. Has values: - true: the base version of the field was found and is either defined or undefined - false: the base version of the field was not found - The possible values for `has_conflict` for each concrete diff algorithm are: - **single line strings**: `NO`, `NON_SOLVABLE` - **multi line strings**: `NO`, `SOLVABLE`, `NON_SOLVABLE` - **numbers**: `NO`, `NON_SOLVABLE` - **array of scalar values**: `NO`, `SOLVABLE` - [ ] Adds new logic to handle #186435 (comment) ### For maintainers - [ ] This was checked for breaking API changes and was [labeled appropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)
|
Implemented in #187770 |
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
Related discussion thread: #184889 (comment)
Changes the diff outcome logic to return
CustomizedValueCanUpdatewhen the base version is missing and the current version and target version are not the same (scenario-AB/-BC).Checklist
Delete any items that are not applicable to this PR.
For maintainers