Use encoding when caching pillar data #52195
Merged
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
twangboy
reviewed
Mar 15, 2019
|
Those are just pieces that are irrelevant to the test. Opportunity to refactor maybe? |
cachedout
reviewed
Mar 22, 2019
waynew
force-pushed
the
51854-minion-pillar-cache-exception
branch
3 times, most recently
from
86df0e4 to
d772631
Compare
dwoz
requested changes
Apr 11, 2019
waynew
force-pushed
the
51854-minion-pillar-cache-exception
branch
2 times, most recently
from
4f832c9 to
efbc8b7
Compare
|
@waynew Sorry, I missed this. Just checked - it fixes my issue! |
waynew
force-pushed
the
51854-minion-pillar-cache-exception
branch
from
efbc8b7 to
f99f986
Compare
waynew
force-pushed
the
51854-minion-pillar-cache-exception
branch
from
f99f986 to
0a89cfd
Compare
|
@dwoz lint issue is fixed, also it turns out there exists an SLS_ENCODING already, so I changed to using that. |
dwoz
approved these changes
Jul 2, 2019
|
re-run all |
waynew
force-pushed
the
51854-minion-pillar-cache-exception
branch
from
63d2c2f to
50e8849
Compare
waynew
force-pushed
the
51854-minion-pillar-cache-exception
branch
from
50e8849 to
79fb4de
Compare
waynew
added a commit
to waynew/salt
that referenced
this pull request
Feb 12, 2020
Fixes saltstack#51854 and ports saltstack#52195 to master
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.
What does this PR do?
Fixes #51854 - sets the encoding when using the yaml dump
What issues does this PR fix or reference?
#51854
Previous Behavior
Caching just used the default encoding, which broke on Python3 where it expected to be writing bytes out to the file.
New Behavior
Now it specifies the encoding so dump expects the pillar in the form that it is.
Tests written?
Yes
Commits signed with GPG?
Yes