[master] Fix calculation of SLS context vars when trailing dots on targetted sls/state#65036
Merged
dwoz merged 3 commits intosaltstack:masterfrom Jan 30, 2026
Merged
Conversation
Contributor
|
Why would someone target a |
Contributor
Author
Yeah, this is a bit strange, I don't think someone would do that on purpose, but this PR just prevents the inconsistent values to appear while it just mimic the behavior of
|
agraul
pushed a commit
to agraul/salt
that referenced
this pull request
Jan 27, 2025
…ls/state (bsc#1213518) (saltstack#598) * Fix calculation of SLS context vars when trailing dots on targetted state * Add changelog file BACKPORT-UPSTREAM=saltstack#65036
twangboy
approved these changes
Apr 4, 2025
ea1c9fb to
9f08b26
Compare
9f08b26 to
61f0b37
Compare
61f0b37 to
e2d9b90
Compare
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
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?
This PR fixes a problem on the behavior of SLS context vars, that has been identified when targetting an SLS with trailing dots.
Let say I have the following in my "file_roots":
where
test/init.slscontains:Now, depending how I trigger the state, I got wrong calculation of SLS context variables (slspath, slsdotpath, slscolonpath, sls_path), where the expected relative paths are actually rendered as absolute paths:
Additionally, this PR fixes a bad logic for test comparison that was making related tests to always pass.
What issues does this PR fix or reference?
Fixes: #63411
Previous Behavior
As mentioned, when targetting as
test., I got unexpected absolute paths:New Behavior
After this PR, I got expected values:
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes
Please review Salt's Contributing Guide for best practices.
See GitHub's page on GPG signing for more information about signing commits with GPG.