Improve error handling

duaraghav8 · Oct 22, 2019 · b9b08f2 · b9b08f2
1 parent 02f0990
commit b9b08f2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/command/assign_user_groups.go b/command/assign_user_groups.go
@@ -97,13 +97,13 @@ func (c *AssignUserGroupsCommand) Run(args []string) int {
 		select {
 		case u := <-getUserCh:
 			if u.Err != nil {
-				c.Logger.Printf("Failed to resolve user ID: %v\n", err)
+				c.Logger.Printf("Failed to resolve user ID: %v\n", u.Err)
 				return 1
 			}
 			user = u.User
 		case g := <-listGroupsCh:
 			if g.Err != nil {
-				c.Logger.Printf("Failed to fetch list of groups: %v\n", err)
+				c.Logger.Printf("Failed to fetch list of groups: %v\n", g.Err)
 				return 1
 			}
 			if g.Resp.StatusCode != http.StatusOK {

diff --git a/command/group.go b/command/group.go
@@ -70,7 +70,7 @@ Links
 		"Name":        g.Profile.Name,
 		"LinkUsers":   getLinkFromGroup(g, "users"),
 		"LinkApps":    getLinkFromGroup(g, "apps"),
-		"Description": FirstNonEmptyStr(g.Profile.Description, "[None]"),
+		"Description": Coalesce(g.Profile.Description, "[None]"),
 	})
 	return res
 }

diff --git a/command/util.go b/command/util.go
@@ -18,9 +18,9 @@ func FillTemplateMessage(msg string, filler map[string]interface{}) (string, err
 	return strings.TrimSpace(builder.String()), nil
 }
 
-// FirstNonEmptyString returns the first non-empty string
+// Coalesce returns the first non-empty string
 // it encounters amongst the arguments supplied to the function.
-func FirstNonEmptyStr(args ...string) string {
+func Coalesce(args ...string) string {
 	for _, v := range args {
 		if v != "" {
 			return v