From 95eea2a07198576e3f4b0a246dd5e2b0cd4ef219 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 28 Jan 2024 17:47:31 -0500 Subject: Wrap db repo and console errs to give better errors --- internal/output/console.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'internal/output/console.go') diff --git a/internal/output/console.go b/internal/output/console.go index d2946ed..50534dd 100644 --- a/internal/output/console.go +++ b/internal/output/console.go @@ -18,12 +18,12 @@ func NewConsoleOutputter() ConsoleOutputter { func (c ConsoleOutputter) Output(message string) error { _, err := fmt.Fprintln(c.stdout, message) - return err + return fmt.Errorf("unable to print message %s: %w", message, err) } func (c ConsoleOutputter) Error(message string) error { _, err := fmt.Fprintln(c.stderr, message) - return err + return fmt.Errorf("unable to print message %s: %w", message, err) } func (c ConsoleOutputter) Table(headers []string, rows [][]string) error { @@ -32,13 +32,13 @@ func (c ConsoleOutputter) Table(headers []string, rows [][]string) error { for _, header := range headers { _, err := fmt.Fprintf(w, "%s\t", header) if err != nil { - return err + return fmt.Errorf("unable to print table header %s: %w", header, err) } } if len(headers) > 0 { _, err := fmt.Fprint(w, "\n") if err != nil { - return err + return fmt.Errorf("unable to print newline after table header: %w", err) } } @@ -46,12 +46,12 @@ func (c ConsoleOutputter) Table(headers []string, rows [][]string) error { for _, cell := range row { _, err := fmt.Fprintf(w, "%s\t", cell) if err != nil { - return err + return fmt.Errorf("unable to print table cell %s: %w", cell, err) } } _, err := fmt.Fprint(w, "\n") if err != nil { - return err + return fmt.Errorf("unable to print newline for table row %s: %w", row, err) } } -- cgit v1.2.3 From b3595cd1f9793eaf8c1f80d1cfadbbebe328f0c4 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Wed, 7 Feb 2024 21:44:22 -0500 Subject: Fix return value for console outputter output and error funcs --- internal/output/console.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'internal/output/console.go') diff --git a/internal/output/console.go b/internal/output/console.go index 50534dd..7f04b28 100644 --- a/internal/output/console.go +++ b/internal/output/console.go @@ -18,12 +18,18 @@ func NewConsoleOutputter() ConsoleOutputter { func (c ConsoleOutputter) Output(message string) error { _, err := fmt.Fprintln(c.stdout, message) - return fmt.Errorf("unable to print message %s: %w", message, err) + if err != nil { + return fmt.Errorf("unable to print message %s: %w", message, err) + } + return nil } func (c ConsoleOutputter) Error(message string) error { _, err := fmt.Fprintln(c.stderr, message) - return fmt.Errorf("unable to print message %s: %w", message, err) + if err != nil { + return fmt.Errorf("unable to print message %s: %w", message, err) + } + return nil } func (c ConsoleOutputter) Table(headers []string, rows [][]string) error { -- cgit v1.2.3 From df5dce753523e0e1eca7de91d272ff16c9c0d79c Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 25 Feb 2024 15:48:14 -0500 Subject: Change Error in console outputter to accept error --- internal/output/console.go | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'internal/output/console.go') diff --git a/internal/output/console.go b/internal/output/console.go index 7f04b28..42b0e3f 100644 --- a/internal/output/console.go +++ b/internal/output/console.go @@ -24,12 +24,19 @@ func (c ConsoleOutputter) Output(message string) error { return nil } +<<<<<<< Updated upstream func (c ConsoleOutputter) Error(message string) error { _, err := fmt.Fprintln(c.stderr, message) if err != nil { return fmt.Errorf("unable to print message %s: %w", message, err) } return nil +======= +func (c ConsoleOutputter) Error(err error) error { + msg := err.Error() + _, printErr := fmt.Fprintln(c.stderr, msg) + return fmt.Errorf("unable to print message %s: %w", msg, printErr) +>>>>>>> Stashed changes } func (c ConsoleOutputter) Table(headers []string, rows [][]string) error { -- cgit v1.2.3 From 29b5f58de7a5f027ea70932bf3c6d4a02de3ffdd Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 25 Feb 2024 15:49:31 -0500 Subject: fix merge conflict --- internal/output/console.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'internal/output/console.go') diff --git a/internal/output/console.go b/internal/output/console.go index 42b0e3f..1a4efad 100644 --- a/internal/output/console.go +++ b/internal/output/console.go @@ -24,19 +24,13 @@ func (c ConsoleOutputter) Output(message string) error { return nil } -<<<<<<< Updated upstream -func (c ConsoleOutputter) Error(message string) error { - _, err := fmt.Fprintln(c.stderr, message) - if err != nil { - return fmt.Errorf("unable to print message %s: %w", message, err) - } - return nil -======= func (c ConsoleOutputter) Error(err error) error { msg := err.Error() _, printErr := fmt.Fprintln(c.stderr, msg) - return fmt.Errorf("unable to print message %s: %w", msg, printErr) ->>>>>>> Stashed changes + if printErr != nil { + return fmt.Errorf("unable to print message %s: %w", msg, printErr) + } + return nil } func (c ConsoleOutputter) Table(headers []string, rows [][]string) error { -- cgit v1.2.3