Convert relative paths to absolute as their associated sls file is processed #61659
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
dmurphy18
force-pushed
the
abs_rel_path_ids_bug_54179
branch
from
7e90d28 to
f75659b
Compare
dmurphy18
requested review from
Ch3LL,
garethgreenaway,
s0undt3ch and
waynew
|
Want deeply reviewed since state system |
s0undt3ch
suggested changes
Feb 18, 2022
dmurphy18
force-pushed
the
abs_rel_path_ids_bug_54179
branch
from
f75659b to
96e1ca6
Compare
s0undt3ch
previously approved these changes
Feb 22, 2022
twangboy
previously approved these changes
Feb 22, 2022
waynew
previously approved these changes
Feb 28, 2022
There was a problem hiding this comment.
Well, the only thing that I was particularly worried about was something like the IDs changing - it does change __sls__ if you're using --out=json, but aside from that, based on some internal discussion/exploration it doesn't seem to be a problem, and all of the tests are passing, especially saltcheck which looks like one of the main places that __sls__ is being used.
I don't have any reason to block this, and I've tested it locally and it appears to do what it says on the tin 👍
added 6 commits
March 1, 2022 11:47
dmurphy18
force-pushed
the
abs_rel_path_ids_bug_54179
branch
from
03cb0ff to
10033ff
Compare
|
re-run fedora |
|
re-run freebsd |
garethgreenaway
approved these changes
Mar 9, 2022
twangboy
approved these changes
Mar 9, 2022
This was referenced Mar 12, 2022
Merged
3 tasks
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?
Converts the relative path sls files to their equivalent absolute path when initially rendering their state.
What issues does this PR fix or reference?
Fixes: #54179
Previous Behavior
Would get conflicting ID's for the same sls file when rendering the paths for relative and absolute paths to the same file. For example:
salt/bug.bug
salt/bug/bug
are the same sls file from the perspective of the salt/bug directory, but would generate conflicting ids
New Behavior
When rendering the relative path salt/bug.bug, it is now converted to it's absolute path salt/bug/bug.
This is similar to converting all local time to UTC such that comparisons are simplified, likewise using absolute paths.
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.