Fix yaml() Jinja filter returning NULL on Pillar containers#69225
Open
dwoz wants to merge 1 commit into
Open
Conversation
Pillar dicts and lists are wrapped in salt.utils.secret.MaskedDict / MaskedList (dict / list subclasses) so their repr can redact secrets. SafeOrderedDumper has no representer for those subclasses, so safe_dump fell through to the add_representer(None, represent_undefined) catch-all and emitted the scalar "NULL". Register MaskedDict / MaskedList with the Ordered / SafeOrdered / IndentedSafeOrdered dumpers (and the base PyYAML dumpers used by salt.utils.yaml.dump) so they serialize as their underlying dict / list. Fixes saltstack#69218
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Pillar dicts and lists are wrapped in salt.utils.secret.MaskedDict / MaskedList (dict / list subclasses) so their repr can redact secrets. SafeOrderedDumper has no representer for those subclasses, so safe_dump fell through to the add_representer(None, represent_undefined) catch-all and emitted the scalar "NULL". Register MaskedDict / MaskedList with the Ordered / SafeOrdered / IndentedSafeOrdered dumpers (and the base PyYAML dumpers used by salt.utils.yaml.dump) so they serialize as their underlying dict / list.
Fixes #69218