Fix 68572 cp get template context#68712
Draft
harshang03 wants to merge 3 commits intosaltstack:masterfrom
Draft
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
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.
What does this PR do?
Fixes cp.get_template Jinja rendering when templates use import ... with context by normalizing the render context and safely handling missing loader-backed salt data, plus a unit test for the import-with-context path.
What issues does this PR fix or reference?
Fixes #68572
Previous Behavior
cp.get_template could raise a KeyError/AttributeError when a Jinja template used import ... with context because salt could be None in the render context
New Behavior
Jinja rendering safely handles missing loader-backed context, so import ... with context works without errors in cp.get_template.
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
No