Return better error during group creation with invalid group name #46031
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
|
The PR changelog entry failed validation: Changelog entry not found in the PR body. Please add a "no-changelog" label to the PR, or changelog lines starting with |
eriktate
added
no-changelog
eriktate
force-pushed
the
eriktate/21165/better-host-group-creation-error
branch
from
b30f5d2 to
41a4b25
Compare
zmb3
reviewed
Aug 29, 2024
eriktate
force-pushed
the
eriktate/21165/better-host-group-creation-error
branch
from
41a4b25 to
996c9a2
Compare
zmb3
approved these changes
Aug 29, 2024
eriktate
force-pushed
the
eriktate/21165/better-host-group-creation-error
branch
from
996c9a2 to
9dcf95d
Compare
zmb3
reviewed
Aug 29, 2024
lib/utils/host/hostusers.go
Outdated
| @@ -53,9 +54,18 @@ func GroupAdd(groupname string, gid string) (exitCode int, err error) { | |||
| cmd := exec.Command(groupaddBin, args...) | |||
| output, err := cmd.CombinedOutput() | |||
| log.Debugf("%s output: %s", cmd.Path, string(output)) | |||
| if cmd.ProcessState.ExitCode() == GroupExistExit { | |||
|
|
|||
| switch cmd.ProcessState.ExitCode() { | |||
There was a problem hiding this comment.
Suggested change
| switch cmd.ProcessState.ExitCode() { | |
| switch code := cmd.ProcessState.ExitCode(); code { |
Then you don't have to call cmd.ProcessState.ExitCode() 3 more times.
There was a problem hiding this comment.
Good call, I totally forgot you could do that in a switch 😅
eriktate
force-pushed
the
eriktate/21165/better-host-group-creation-error
branch
from
9dcf95d to
139b38b
Compare
rosstimothy
approved these changes
Aug 29, 2024
eriktate
force-pushed
the
eriktate/21165/better-host-group-creation-error
branch
from
139b38b to
711bae1
Compare
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.
Fixes #21165
Returns a
trace.BadParametererror whengroupaddfails with exit code 3 ("invalid argument to option"). If the command output contains "not a valid group name" then the message wrapped bytrace.BadParameterspecifies that. Otherwise we just report there was an invalid parameter. Regardless of which specific error message is resolved, adding the group name to the error returned increateGroupIfNotExistsshould help make it more obvious that a role'shost_groupsarray has an invalid entry when session creation fails.