Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Don't remove one directory level from slspath" #56341

Merged
merged 5 commits into from
Mar 11, 2020

Conversation

dwoz
Copy link
Contributor

@dwoz dwoz commented Mar 10, 2020

This reverts commit 7c28995.

This change is being reverted because it broke states without going through any kind of deprecation path.

What issues does this PR fix or reference?

#56119

Tests written?

Yes

Commits signed with GPG?

Yes

@dwoz dwoz requested a review from a team as a code owner March 10, 2020 01:30
@ghost ghost requested a review from twangboy March 10, 2020 01:30
@dwoz dwoz added the v3000.1 vulnerable version label Mar 10, 2020
@terminalmage
Copy link
Contributor

That change should absolutely not be reverted. It was a bugfix.

From the documentation:

The slspath variable contains the path to the current sls file. The value of slspath
in files referenced in the current sls depends on the reference method. For jinja
includes slspath is the path to the current file. For salt includes slspath is the path
to the included file.

"the path to the current SLS file". Not a directory.

@thatch45
Copy link
Contributor

Those docs should be fixed, not breaking everyone's states

@terminalmage
Copy link
Contributor

Actually, after looking at the code, I think that we should revert, but not without making other changes. See here for my reasoning on this.

@dwoz dwoz merged commit 84c6070 into saltstack:master Mar 11, 2020
agraul added a commit to agraul/salt-1 that referenced this pull request Apr 27, 2020
This was a breaking change in v3000 that was fixed in 3000.1

Fixes bsc#1170104
agraul added a commit to openSUSE/salt that referenced this pull request Apr 30, 2020
Backport from 3000.1 - Revert changes to slspath (saltstack/salt#56341)
meaksh pushed a commit to openSUSE/salt that referenced this pull request May 7, 2020
This was a breaking change in v3000 that was fixed in 3000.1

Fixes bsc#1170104
meaksh added a commit to openSUSE/salt-packaging that referenced this pull request May 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v3000.1 vulnerable version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants