Fix a KeyError if group is provided but not user in cmd states #33538
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
| @@ -1041,7 +1041,7 @@ def script(name, | |||
| 'Replace them with runas. ' | |||
| 'These arguments will be removed in Salt Oxygen.' | |||
| ) | |||
| if kwargs['user'] is not None and runas is None: | |||
| if 'user' in kwargs and kwargs['user'] is not None and runas is None: | |||
There was a problem hiding this comment.
Can we just write if kwargs.get('user') and runas is None here?
There was a problem hiding this comment.
I was considering that, but wasn't sure if there was some special case behavior if you provide False or an empty string that needs to be preserved. I'd be happy to change it to that if you think it's OK.
There was a problem hiding this comment.
It was just a thought. I can't think of one offhand, since I'd expect strings to be the only case we operate on. I'm fine either way. Just let me know.
cachedout
added
the
Pending-Discussion
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.
I replaced
userwithrunasbut forgot to removegroupand a KeyError happened for natural reasons.