-
Notifications
You must be signed in to change notification settings - Fork 51
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
Allow kwargs for fileserver roots update (bsc#1218482) #618
Allow kwargs for fileserver roots update (bsc#1218482) #618
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you please add the link to the upstream PR to the description?
I left a few comments inline.
06cc4a4
to
c218dda
Compare
c218dda
to
fadbbf3
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me 👍
Thanks for taking care of the tests 👍
* Allow kwargs for fileserver roots update (bsc#1218482) * Prevent exceptions with fileserver.update when called via state * Fix wrong logic and enhance tests around fileserver.update * Remove test which is not longer valid --------- Co-authored-by: Pablo Suárez Hernández <[email protected]>
What does this PR do?
When an orchestration state is applied the user responsible for the runner is passed to the
update
function as the__pub_user
keyword argument. Therefore, theupdate
function must be aware of this or the orchestration state application will fail.What issues does this PR fix or reference?
Fixes: https://github.com/SUSE/spacewalk/issues/23324
Upstream PR: saltstack/salt#65819
Previous Behavior
The application of this example orchestration state fails
with the following error:
New Behavior
Now the orchestrating state is applied correctly.
Additionally, it fixes wrong asserts on fileserver.update tests, as it was producing false positives when ret["return"] is a string (i.a. when errors are produced) instead of True value.
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.