salt.utils.secret.mask_pillar not unset during pillar SLS rendering#69176
Merged
Conversation
twangboy
approved these changes
May 16, 2026
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
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.
What does this PR do?
Fixes a critical regression introduced by the new Pillar Output Masking feature where pillar string values rendered via Jinja are incorrectly masked as
**********. This explicitly unsets themask_pillarContextVar during pillar SLS rendering.What issues does this PR fix or reference?
Fixes #69160
Fixes #69144
Previous Behavior
In
3008.0rc3, string values in pillar SLS files were evaluated to literal**********strings when interpolated. This occurred becausesalt.utils.secret.mask_pillardefaults toTrueand was never unset bysalt/pillar/__init__.py:render_pillar().New Behavior
The
mask_pillarContextVar is explicitly set toFalseprior to executing the pillar renderer and reset immediately afterward (mirroring the behavior already present in the state template renderer). Pillar SLS files now correctly render their actual unmasked string values. Functional tests have been added to prevent future regressions.Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes