Fix #33437: Prevent None values from overwriting existing pillar data #68533
+147
−9
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
dwoz
force-pushed
the
issue/33437/3006.x
branch
from
254c753 to
f298ff7
Compare
…llar data When merging pillar data, if one pillar file is empty (e.g., due to conditional rendering that produces no output), None values were overwriting existing non-empty dictionaries. This fix adds a _filter_none_overwrites function that recursively removes None values that would overwrite existing non-empty dicts during the pillar merge process. - Added _filter_none_overwrites function to salt/pillar/__init__.py - Applied filter before merging pillar state - Added test case to test_pillar.py to verify the fix
dwoz
force-pushed
the
issue/33437/3006.x
branch
from
f298ff7 to
6e99078
Compare
twangboy
requested changes
Dec 16, 2025
Contributor
twangboy
left a comment
twangboy
left a comment
There was a problem hiding this comment.
Are we still using OrderedDict on 3006.x? Maybe it's only removed on master.
Also needs a changelog
| # causes an UnboundLocalError. This should be investigated and fixed, but until | ||
| # then, leave the import directly below this comment intact. | ||
| from salt.utils.dictupdate import merge | ||
| from salt.utils.odict import OrderedDict |
Contributor
There was a problem hiding this comment.
We're not using this anymore, right?
| import salt.loader | ||
| import salt.pillar | ||
| import salt.utils.cache | ||
| from salt.utils.odict import OrderedDict |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
When merging pillar data, None values were overwriting existing non-empty dictionaries. This fix adds a _filter_none_overwrites function that filters out None values during pillar merging to preserve existing data.
Fixes #33437