aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Triguba <eugenetriguba@gmail.com>2024-02-25 15:48:14 -0500
committerEugene Triguba <eugenetriguba@gmail.com>2024-02-25 15:48:14 -0500
commitdf5dce753523e0e1eca7de91d272ff16c9c0d79c (patch)
tree3a9b104c4b8b90711215772c76c08646aa31e4c8
parentMove cli.Run (diff)
downloadcli-df5dce753523e0e1eca7de91d272ff16c9c0d79c.zip
Change Error in console outputter to accept error
-rw-r--r--internal/commands/status.go10
-rw-r--r--internal/commands/up.go12
-rw-r--r--internal/commands/version.go2
-rw-r--r--internal/output/console.go7
-rw-r--r--internal/output/console_test.go3
5 files changed, 21 insertions, 13 deletions
diff --git a/internal/commands/status.go b/internal/commands/status.go
index a58d587..85f3824 100644
--- a/internal/commands/status.go
+++ b/internal/commands/status.go
@@ -39,7 +39,7 @@ func (m *StatusCmd) Execute(
cfg, err := configloader.NewConfig()
if err != nil {
- consoleOutputter.Error(err.Error())
+ consoleOutputter.Error(err)
return subcommands.ExitFailure
}
@@ -48,20 +48,20 @@ func (m *StatusCmd) Execute(
storage.DBConnectionString(&cfg.Connection),
)
if err != nil {
- consoleOutputter.Error(err.Error())
+ consoleOutputter.Error(err)
return subcommands.ExitFailure
}
defer db.Close()
migrationDBRepo, err := repositories.NewMigrationDBRepo(db)
if err != nil {
- consoleOutputter.Error(err.Error())
+ consoleOutputter.Error(err)
return subcommands.ExitFailure
}
migrationFsRepo, err := repositories.NewMigrationFsRepo(&cfg.Migrations)
if err != nil {
- consoleOutputter.Error(err.Error())
+ consoleOutputter.Error(err)
return subcommands.ExitFailure
}
@@ -72,7 +72,7 @@ func (m *StatusCmd) Execute(
)
migrations, err := migrationService.ListMigrations(services.SortOrderAsc)
if err != nil {
- consoleOutputter.Error(err.Error())
+ consoleOutputter.Error(err)
return subcommands.ExitFailure
}
diff --git a/internal/commands/up.go b/internal/commands/up.go
index ba74299..5cbc262 100644
--- a/internal/commands/up.go
+++ b/internal/commands/up.go
@@ -49,7 +49,7 @@ func (cmd *UpCmd) Execute(
cfg, err := configloader.NewConfig()
if err != nil {
- consoleOutputter.Error(err.Error())
+ consoleOutputter.Error(err)
return subcommands.ExitFailure
}
@@ -58,20 +58,20 @@ func (cmd *UpCmd) Execute(
storage.DBConnectionString(&cfg.Connection),
)
if err != nil {
- consoleOutputter.Error(err.Error())
+ consoleOutputter.Error(err)
return subcommands.ExitFailure
}
defer db.Close()
migrationDBRepo, err := repositories.NewMigrationDBRepo(db)
if err != nil {
- consoleOutputter.Error(err.Error())
+ consoleOutputter.Error(err)
return subcommands.ExitFailure
}
migrationFsRepo, err := repositories.NewMigrationFsRepo(&cfg.Migrations)
if err != nil {
- consoleOutputter.Error(err.Error())
+ consoleOutputter.Error(err)
return subcommands.ExitFailure
}
@@ -84,13 +84,13 @@ func (cmd *UpCmd) Execute(
if cmd.version == "" {
err = migrationService.ApplyAllMigrations()
if err != nil {
- consoleOutputter.Error(err.Error())
+ consoleOutputter.Error(err)
return subcommands.ExitFailure
}
} else {
err = migrationService.ApplyUpToVersion(cmd.version)
if err != nil {
- consoleOutputter.Error(err.Error())
+ consoleOutputter.Error(err)
return subcommands.ExitFailure
}
}
diff --git a/internal/commands/version.go b/internal/commands/version.go
index 36891a2..c9101d0 100644
--- a/internal/commands/version.go
+++ b/internal/commands/version.go
@@ -34,7 +34,7 @@ func (cmd *VersionCmd) Execute(
consoleOutputter := output.NewConsoleOutputter()
err := consoleOutputter.Output("bolt v0.2.1")
if err != nil {
- consoleOutputter.Error(err.Error())
+ consoleOutputter.Error(err)
return subcommands.ExitFailure
}
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 {
diff --git a/internal/output/console_test.go b/internal/output/console_test.go
index 78e5d38..492d0a2 100644
--- a/internal/output/console_test.go
+++ b/internal/output/console_test.go
@@ -2,6 +2,7 @@ package output
import (
"bytes"
+ "errors"
"io"
"testing"
@@ -28,7 +29,7 @@ func TestConsoleOutputter_Error(t *testing.T) {
var stderr bytes.Buffer
consoleOutputter := NewConsoleOutputterWithWriters(&stdout, &stderr)
- consoleOutputter.Error("test string")
+ consoleOutputter.Error(errors.New("test string"))
check.Equal(t, stdout.String(), "")
check.Equal(t, stderr.String(), "test string\n")