[3006.x] Fix user.present state when group is unset #64530
Merged
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
salt-project-bot-prod-environment
bot
changed the title
Ch3LL
commented
Jun 23, 2023
| @@ -189,6 +189,8 @@ def test_present_uid_gid_change(): | |||
| "user.chgid": Mock(), | |||
| "file.group_to_gid": mock_group_to_gid, | |||
| "file.gid_to_group": mock_gid_to_group, | |||
| "group.info": MagicMock(return_value=after), | |||
There was a problem hiding this comment.
@nicholasmhughes I'm cautious about this change to this test, since group.info and user.chgroups was not called previously. But I think with my fix it should be getting called to ensure we are changing the user foo's group assignment to othergroup. Wanted to get your thoughts since you last changed this test.
There was a problem hiding this comment.
seems reasonable to me. 👍
s0undt3ch
approved these changes
Jun 26, 2023
nicholasmhughes
approved these changes
Jun 26, 2023
| @@ -189,6 +189,8 @@ def test_present_uid_gid_change(): | |||
| "user.chgid": Mock(), | |||
| "file.group_to_gid": mock_group_to_gid, | |||
| "file.gid_to_group": mock_gid_to_group, | |||
| "group.info": MagicMock(return_value=after), | |||
There was a problem hiding this comment.
seems reasonable to me. 👍
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?
If the
grouparg is unset when usinguser.presentit should not edit the groups of the user. This is documented behavior. This was changed in this PR #62503 to ensure optional_groups are fixed. This PR ensures we keep the optional_groups working and ensure the documented behavior whengroupargs is unset.What issues does this PR fix or reference?
Fixes: #64211
Previous Behavior
When
groupwas unset when using user.present it would edit the group list if it didn't mirror what groups where currently in the system, resulting in salt returning a changes directory each time.New Behavior
When
group is unset when usinguser.present` it does not edit the groups the user is a part of.