Fix validation of properties and parameters based on mappings #2288
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
|
test integrations |
|
Created or updated PR in integrations repository to test this version. Check elastic/integrations#12155 |
mrodm
commented
Dec 18, 2024
| @@ -647,7 +723,7 @@ func TestComparingMappings(t *testing.T) { | |||
| ) | |||
| require.NoError(t, err) | |||
|
|
|||
| errs := v.compareMappings("", c.preview, c.actual) | |||
| errs := v.compareMappings("", false, c.preview, c.actual) | |||
There was a problem hiding this comment.
Added a new parameter here to know in which cases properties could be part of the parameters of a mapping or a subfield named properties.
💚 Build Succeeded
History
cc @mrodm |
|
test integrations |
mrodm
commented
Dec 18, 2024
| errs = append(errs, propertiesErrs...) | ||
| if len(errs) == 0 { | ||
| return nil | ||
| } | ||
| return errs.Unique() | ||
| } | ||
|
|
||
| func (v *MappingValidator) validateObjectProperties(path string, containsMultifield bool, actual, preview map[string]any) multierror.Error { | ||
| func (v *MappingValidator) validateObjectProperties(path string, couldBeParametersDefinition, containsMultifield bool, preview, actual map[string]any) multierror.Error { |
There was a problem hiding this comment.
Reordered preview and actual parameters to keep consistency with the other methods.
|
Created or updated PR in integrations repository to test this version. Check elastic/integrations#12155 |
jsoriano
approved these changes
Dec 19, 2024
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.
Follows #2214
In this PR, it is ensured that:
propertiesare validated and not considered as another parameter of the object. For instance, a mapping like:{ "dynamic_templates": {}, "properties": { "foo": { "properties": { "properties": { "type": "keyword" } } } } }{ "properties": { "foo": { "properties": { "type": "keyword", } } } }{ "properties": { "foo": { "properties": { "type": "keyword", "time_series_metric": "counter" } } } }