From db38d1244cbf91c098a1bd062efdd34b3b081cd4 Mon Sep 17 00:00:00 2001
From: Nicolas De Loof <nicolas.deloof@gmail.com>
Date: Thu, 15 Apr 2021 14:19:59 +0200
Subject: [PATCH] Retrieve compose failure category by exit code

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
---
 cli/cmd/compose/remove.go  |  2 +-
 cli/cmd/compose/stop.go    |  2 +-
 cli/main.go                |  4 ++--
 cli/metrics/definitions.go | 23 +++++++++++++++++++++++
 cli/mobycli/exec.go        |  8 ++------
 5 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/cli/cmd/compose/remove.go b/cli/cmd/compose/remove.go
index 2757f9fcd..eda63a4fd 100644
--- a/cli/cmd/compose/remove.go
+++ b/cli/cmd/compose/remove.go
@@ -78,7 +78,7 @@ func runRemove(ctx context.Context, backend compose.Service, opts removeOptions,
 	}
 
 	reosurces, err := backend.Remove(ctx, project, compose.RemoveOptions{
-		DryRun: true,
+		DryRun:   true,
 		Services: services,
 	})
 	if err != nil {
diff --git a/cli/cmd/compose/stop.go b/cli/cmd/compose/stop.go
index 73e811562..2a12a55ba 100644
--- a/cli/cmd/compose/stop.go
+++ b/cli/cmd/compose/stop.go
@@ -65,7 +65,7 @@ func runStop(ctx context.Context, backend compose.Service, opts stopOptions, ser
 	}
 	_, err = progress.Run(ctx, func(ctx context.Context) (string, error) {
 		return "", backend.Stop(ctx, project, compose.StopOptions{
-			Timeout: timeout,
+			Timeout:  timeout,
 			Services: services,
 		})
 	})
diff --git a/cli/main.go b/cli/main.go
index ffcdc64f7..6b49bba7c 100644
--- a/cli/main.go
+++ b/cli/main.go
@@ -294,7 +294,7 @@ func exit(ctx string, err error, ctype string) {
 
 	if errors.Is(err, errdefs.ErrNotImplemented) {
 		name := metrics.GetCommand(os.Args[1:])
-		fmt.Fprintf(os.Stderr, "RootCommand %q not available in current context (%s)\n", name, ctx)
+		fmt.Fprintf(os.Stderr, "Command %q not available in current context (%s)\n", name, ctx)
 
 		os.Exit(1)
 	}
@@ -314,7 +314,7 @@ func checkIfUnknownCommandExistInDefaultContext(err error, currentContext string
 		dockerCommand := string(submatch[1])
 
 		if mobycli.IsDefaultContextCommand(dockerCommand) {
-			fmt.Fprintf(os.Stderr, "RootCommand %q not available in current context (%s), you can use the \"default\" context to run this command\n", dockerCommand, currentContext)
+			fmt.Fprintf(os.Stderr, "Command %q not available in current context (%s), you can use the \"default\" context to run this command\n", dockerCommand, currentContext)
 			metrics.Track(contextType, os.Args[1:], metrics.FailureStatus)
 			os.Exit(1)
 		}
diff --git a/cli/metrics/definitions.go b/cli/metrics/definitions.go
index 707af1af0..228e42aea 100644
--- a/cli/metrics/definitions.go
+++ b/cli/metrics/definitions.go
@@ -55,3 +55,26 @@ var (
 	// PullFailure failure while pulling image
 	PullFailure = FailureCategory{MetricsStatus: PullFailureStatus, ExitCode: 18}
 )
+
+//ByExitCode retrieve FailureCategory based on command exit code
+func ByExitCode(exitCode int) FailureCategory {
+	switch exitCode {
+	case 0:
+		return FailureCategory{MetricsStatus: SuccessStatus, ExitCode: 0}
+	case 14:
+		return FileNotFoundFailure
+	case 15:
+		return ComposeParseFailure
+	case 16:
+		return CommandSyntaxFailure
+	case 17:
+		return BuildFailure
+	case 18:
+		return PullFailure
+	case 130:
+		return FailureCategory{MetricsStatus: CanceledStatus, ExitCode: exitCode}
+	default:
+		return FailureCategory{MetricsStatus: FailureStatus, ExitCode: exitCode}
+	}
+
+}
diff --git a/cli/mobycli/exec.go b/cli/mobycli/exec.go
index fb0c7750f..e4fe42175 100644
--- a/cli/mobycli/exec.go
+++ b/cli/mobycli/exec.go
@@ -68,12 +68,8 @@ func Exec(root *cobra.Command) {
 	if err != nil {
 		if exiterr, ok := err.(*exec.ExitError); ok {
 			exitCode := exiterr.ExitCode()
-			if exitCode == 130 {
-				metrics.Track(store.DefaultContextType, os.Args[1:], metrics.CanceledStatus)
-			} else {
-				metrics.Track(store.DefaultContextType, os.Args[1:], metrics.FailureStatus)
-			}
-			os.Exit(exiterr.ExitCode())
+			metrics.Track(store.DefaultContextType, os.Args[1:], metrics.ByExitCode(exitCode).MetricsStatus)
+			os.Exit(exitCode)
 		}
 		metrics.Track(store.DefaultContextType, os.Args[1:], metrics.FailureStatus)
 		fmt.Fprintln(os.Stderr, err)