rsp2k/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

errors: rewrite errors to follow go best practices

Browse source 
Errors should not start capitalised and they should not contain the word error
or state that they "failed" as we already know it is an error

Signed-off-by: Kristoffer Dalby <kristoffer@dalby.cc>
This commit is contained in:
Kristoffer Dalby 2026-02-05 16:29:54 +00:00
parent 4a9a329339
commit 3acce2da87
30 changed files with 300 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmd/headscale/cli/users.go
View file

@ -149,7 +149,7 @@ var destroyUserCmd = &cobra.Command{
}
if len(users.GetUsers()) != 1 {
err := errors.New("Unable to determine user to delete, query returned multiple users, use ID")
err := errors.New("multiple users match query, specify an ID")
ErrorOutput(
err,
"Error: "+status.Convert(err).Message(),
@ -277,7 +277,7 @@ var renameUserCmd = &cobra.Command{
}
if len(users.GetUsers()) != 1 {
err := errors.New("Unable to determine user to delete, query returned multiple users, use ID")
err := errors.New("multiple users match query, specify an ID")
ErrorOutput(
err,
"Error: "+status.Convert(err).Message(),

6
cmd/headscale/cli/utils.go
View file

@ -138,17 +138,17 @@ func output(result any, override string, outputFormat string) string {
case "json":
jsonBytes, err = json.MarshalIndent(result, "", "\t")
if err != nil {
log.Fatal().Err(err).Msg("failed to unmarshal output")
log.Fatal().Err(err).Msg("unmarshalling output")
}
case "json-line":
jsonBytes, err = json.Marshal(result)
if err != nil {
log.Fatal().Err(err).Msg("failed to unmarshal output")
log.Fatal().Err(err).Msg("unmarshalling output")
}
case "yaml":
jsonBytes, err = yaml.Marshal(result)
if err != nil {
log.Fatal().Err(err).Msg("failed to unmarshal output")
log.Fatal().Err(err).Msg("unmarshalling output")
}
default:
// nolint