From 29971c36a0fa068510772b8267fe1098772827a4 Mon Sep 17 00:00:00 2001
From: Roxie Gibson <me@roxxers.xyz>
Date: Wed, 21 Jul 2021 09:04:34 +0100
Subject: [PATCH] refactor: moved all fatal errors to logrus

This will allow us to test commands that would normally exit
---
 cli/app.go           | 6 +++---
 cli/cli.go           | 4 ++--
 client/client.go     | 5 ++---
 client/connection.go | 7 +++++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/cli/app.go b/cli/app.go
index ee42b0f2..8baffad3 100644
--- a/cli/app.go
+++ b/cli/app.go
@@ -101,7 +101,7 @@ var appPsCommand = &cli.Command{
 		cl := client.NewClientWithContext(Context)
 		tasks, err := cl.TaskList(ctx, types.TaskListOptions{})
 		if err != nil {
-			panic(err)
+			logrus.Fatal(err)
 		}
 		for _, task := range tasks {
 			resolver := idresolver.New(cl, false)
@@ -113,7 +113,7 @@ var appPsCommand = &cli.Command{
 		}
 		containers, err := cl.ContainerList(ctx, types.ContainerListOptions{})
 		if err != nil {
-			panic(err)
+			logrus.Fatal(err)
 		}
 		table := createTable([]string{"ID", "Image", "Command", "Created", "Status", "Ports", "Names"})
 		var conTable [][]string
@@ -166,7 +166,7 @@ var appSecretCommand = &cli.Command{
 			passgen.WordListDefault,
 		)
 		if err != nil {
-			panic(err)
+			logrus.Fatal(err)
 		}
 
 		for _, password := range passwords {
diff --git a/cli/cli.go b/cli/cli.go
index e8b7ce67..a3315f1d 100644
--- a/cli/cli.go
+++ b/cli/cli.go
@@ -2,9 +2,9 @@ package cli
 
 import (
 	"fmt"
-	"log"
 	"os"
 
+	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
@@ -46,6 +46,6 @@ func RunApp(version string, commit string) {
 
 	err := app.Run(os.Args)
 	if err != nil {
-		log.Fatal(err)
+		logrus.Fatal(err)
 	}
 }
diff --git a/client/client.go b/client/client.go
index ce85567d..05e5b110 100644
--- a/client/client.go
+++ b/client/client.go
@@ -2,7 +2,6 @@ package client
 
 import (
 	"errors"
-	"fmt"
 	"net/http"
 	"os"
 
@@ -12,6 +11,7 @@ import (
 	dCliContextStore "github.com/docker/cli/cli/context/store"
 	dClient "github.com/docker/docker/client"
 	"github.com/moby/term"
+	"github.com/sirupsen/logrus"
 )
 
 func NewClientWithContext(contextURL string) *dClient.Client {
@@ -44,8 +44,7 @@ func NewClientWithContext(contextURL string) *dClient.Client {
 	cl, err := dClient.NewClientWithOpts(clientOpts...)
 
 	if err != nil {
-		fmt.Println("Unable to create docker client")
-		panic(err)
+		logrus.Fatalf("unable to create Docker client: %s", err)
 	}
 	return cl
 }
diff --git a/client/connection.go b/client/connection.go
index 672b6a5d..c1f76345 100644
--- a/client/connection.go
+++ b/client/connection.go
@@ -1,12 +1,15 @@
 package client
 
-import "github.com/docker/cli/cli/connhelper"
+import (
+	"github.com/docker/cli/cli/connhelper"
+	"github.com/sirupsen/logrus"
+)
 
 func newConnectionHelper(daemonURL string) *connhelper.ConnectionHelper {
 	helper, err := connhelper.GetConnectionHelper(daemonURL)
 
 	if err != nil {
-		panic(err)
+		logrus.Fatal(err)
 	}
 	return helper
 }