classfilterdata: Fix inconsistent results (3.27.x) #6023
Merged
+60
−1
Conversation
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
Currently, classfilterdata() does not return a variable for array_of_XXXs if given data structure's value do not comply completely to given array_of_XXXs parameter. On the other hand, classfilterdata() does return a variable when given object_of_XXXs even if this variable does not completely comply to object_of_XXXs. This patch changes classfilterdata() to not return a variable as well for object_of_XXXs in case given data structure's does not comply. Also add an acceptance test for it. This patch also fixes a compiler warning mayby-uninitialized of variable remove in FnCallClassFilterData() in case parent is of type JSON object. (cherry picked from commit f53bee0) Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Contributor
Author
|
@cf-bottom Jenkins please :) |
|
Sure, I triggered a build: Jenkins: https://ci.cfengine.com/job/pr-pipeline/13323/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-13323/ |
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.
Currently, classfilterdata() does not return a variable for
array_of_XXXs if given data structure's value do not comply completely
to given array_of_XXXs parameter.
On the other hand, classfilterdata() does return a variable when given
object_of_XXXs even if this variable does not completely comply to
object_of_XXXs.
This patch changes classfilterdata() to not return a variable as well
for object_of_XXXs in case given data structure's does not comply.
Also add an acceptance test for it.
This patch also fixes a compiler warning mayby-uninitialized of variable
remove in FnCallClassFilterData() in case parent is of type JSON object.
(cherry picked from commit f53bee0)
Signed-off-by: Lars Erik Wik lars.erik.wik@northern.tech
Back ported from #6021