[EPM] Handle object type fields with properties in mappings #64745
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
skh
added
v8.0.0
release_note:skip
|
Pinging @elastic/ingest-management (Team:Ingest Management) |
ruflin
approved these changes
Apr 29, 2020
| @@ -108,7 +108,15 @@ function dedupFields(fields: Fields): Fields { | |||
| return f.name === field.name; | |||
| }); | |||
| if (found) { | |||
| if (found.type === 'group' && field.type === 'group' && found.fields && field.fields) { | |||
| if ( | |||
There was a problem hiding this comment.
Would be nice to have a comment in here that explains why this code is needed (to cover the a, a.b problem).
| @@ -179,4 +179,35 @@ describe('processFields', () => { | |||
| JSON.stringify(mixedFieldsExpanded) | |||
| ); | |||
| }); | |||
|
|
|||
| const objectFieldWithProperty = [ | |||
There was a problem hiding this comment.
Will it also work if you have a.b first and then a?
There was a problem hiding this comment.
Yes. I've added a unit test for that.
💚 Build SucceededTo update your PR or re-run it, just comment with: |
jonathan-buttner
approved these changes
Apr 29, 2020
There was a problem hiding this comment.
I checked it out and tested it. Looks good! Thanks for the quick change @skh !
skh
added a commit
to skh/kibana
that referenced
this pull request
Apr 29, 2020
…64745) * Generate correct mapping for object type field with properties * Add test for fields definition in reverse order
skh
added a commit
that referenced
this pull request
Apr 29, 2020
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
This fixes a problem in the mapping generation for fields of type
objectwith additional properties.A field definition of
now generates a mapping of the form
Before this change, the field
a.bdid not get correctly deduped and nested under fielda.Thanks to @jonathan-buttner for the analysis!
How to test this