fixup! Migrate more logs to clog

cmoog · cmoog · commit 64aa1c141503 · 2020-10-21T13:21:57.000-05:00
diff --git a/internal/clog/error.go b/internal/clog/error.go
@@ -10,22 +10,22 @@ import (
 	"golang.org/x/xerrors"
 )
 
-// RichCLIMessage provides a human-readable message for CLI errors and messages.
-type RichCLIMessage struct {
+// CLIMessage provides a human-readable message for CLI errors and messages.
+type CLIMessage struct {
 	Level  string
 	Color  color.Attribute
 	Header string
 	Lines  []string
 }
 
-// RichCLIError wraps a RichCLIMessage a allows consumers to treat it as a normal error.
-type RichCLIError struct {
-	RichCLIMessage
+// CLIError wraps a RichCLIMessage a allows consumers to treat it as a normal error.
+type CLIError struct {
+	CLIMessage
 	error
 }
 
 // Error formats the CLI message for consumption by a human as an error.
-func (r RichCLIMessage) String() string {
+func (r CLIMessage) String() string {
 	var str strings.Builder
 	str.WriteString(fmt.Sprintf("%s: %s\n",
 		color.New(r.Color).Sprint(r.Level),
@@ -41,7 +41,7 @@ func (r RichCLIMessage) String() string {
 // If the error is a RichCLIError, the plain error chain is ignored and the rich error
 // is logged on its own.
 func Log(err error) {
-	var cliErr RichCLIError
+	var cliErr CLIError
 	if !xerrors.As(err, &cliErr) {
 		cliErr = Fatal(err.Error())
 	}
@@ -50,7 +50,7 @@ func Log(err error) {
 
 // LogInfo prints the given info message to stderr.
 func LogInfo(header string, lines ...string) {
-	fmt.Fprintln(os.Stderr, RichCLIMessage{
+	fmt.Fprintln(os.Stderr, CLIMessage{
 		Level:  "info",
 		Color:  color.FgBlue,
 		Header: header,
@@ -65,7 +65,7 @@ func F(format string, a ...interface{}) string {
 
 // LogSuccess prints the given info message to stderr.
 func LogSuccess(header string, lines ...string) {
-	fmt.Fprintln(os.Stderr, RichCLIMessage{
+	fmt.Fprintln(os.Stderr, CLIMessage{
 		Level:  "success",
 		Color:  color.FgGreen,
 		Header: header,
@@ -74,9 +74,9 @@ func LogSuccess(header string, lines ...string) {
 }
 
 // Warn creates an error with the level "warning".
-func Warn(header string, lines ...string) RichCLIError {
-	return RichCLIError{
-		RichCLIMessage: RichCLIMessage{
+func Warn(header string, lines ...string) CLIError {
+	return CLIError{
+		RichCLIMessage: CLIMessage{
 			Color:  color.FgYellow,
 			Level:  "warning",
 			Header: header,
@@ -87,9 +87,9 @@ func Warn(header string, lines ...string) RichCLIError {
 }
 
 // Error creates an error with the level "error".
-func Error(header string, lines ...string) RichCLIError {
-	return RichCLIError{
-		RichCLIMessage: RichCLIMessage{
+func Error(header string, lines ...string) CLIError {
+	return CLIError{
+		RichCLIMessage: CLIMessage{
 			Color:  color.FgRed,
 			Level:  "error",
 			Header: header,
@@ -100,9 +100,9 @@ func Error(header string, lines ...string) RichCLIError {
 }
 
 // Fatal creates an error with the level "fatal".
-func Fatal(header string, lines ...string) RichCLIError {
-	return RichCLIError{
-		RichCLIMessage: RichCLIMessage{
+func Fatal(header string, lines ...string) CLIError {
+	return CLIError{
+		RichCLIMessage: CLIMessage{
 			Color:  color.FgRed,
 			Level:  "fatal",
 			Header: header,
