From 15882d35035bbc7bab503d03e3ac155b42f24e6a Mon Sep 17 00:00:00 2001
From: Nicolas De Loof <nicolas.deloof@gmail.com>
Date: Fri, 12 Feb 2021 10:19:26 +0100
Subject: [PATCH] =?UTF-8?q?happy=20shinny=20linter=20=E2=98=9C(=E2=8C=92?=
 =?UTF-8?q?=E2=96=BD=E2=8C=92)=E2=98=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
---
 cli/cmd/compose/start.go |  2 ++
 cli/cmd/compose/up.go    |  4 ++--
 cli/formatter/logs.go    | 12 ++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cli/cmd/compose/start.go b/cli/cmd/compose/start.go
index 736d98a3..ed17ced8 100644
--- a/cli/cmd/compose/start.go
+++ b/cli/cmd/compose/start.go
@@ -18,9 +18,11 @@ package compose
 
 import (
 	"context"
+
 	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/api/compose"
 	"github.com/docker/compose-cli/api/progress"
+
 	"github.com/spf13/cobra"
 )
 
diff --git a/cli/cmd/compose/up.go b/cli/cmd/compose/up.go
index 27080231..2e5ba521 100644
--- a/cli/cmd/compose/up.go
+++ b/cli/cmd/compose/up.go
@@ -19,7 +19,6 @@ package compose
 import (
 	"context"
 	"fmt"
-	"golang.org/x/sync/errgroup"
 	"os"
 	"os/signal"
 	"path/filepath"
@@ -37,6 +36,7 @@ import (
 	"github.com/compose-spec/compose-go/types"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"golang.org/x/sync/errgroup"
 )
 
 // composeOptions hold options common to `up` and `run` to run compose project
@@ -223,7 +223,7 @@ func runCreateStart(ctx context.Context, opts upOptions, services []string) erro
 		return err
 	}
 
-	eg.Wait()
+	err = eg.Wait()
 	if exitCode != 0 {
 		return cmd.ExitCodeError{ExitCode: exitCode}
 	}
diff --git a/cli/formatter/logs.go b/cli/formatter/logs.go
index 4b9de003..c5e2e0ab 100644
--- a/cli/formatter/logs.go
+++ b/cli/formatter/logs.go
@@ -30,7 +30,7 @@ import (
 func NewLogConsumer(ctx context.Context, w io.Writer, color bool, prefix bool) compose.LogConsumer {
 	return &logConsumer{
 		ctx:        ctx,
-		presenters: map[string]*Presenter{},
+		presenters: map[string]*presenter{},
 		width:      0,
 		writer:     w,
 		color:      color,
@@ -42,12 +42,12 @@ func (l *logConsumer) Register(service string, source string) {
 	l.register(service, source)
 }
 
-func (l *logConsumer) register(service string, source string) *Presenter {
+func (l *logConsumer) register(service string, source string) *presenter {
 	cf := monochrome
 	if l.color {
 		cf = <-loop
 	}
-	p := &Presenter{
+	p := &presenter{
 		colors:    cf,
 		service:   service,
 		container: source,
@@ -98,20 +98,20 @@ func (l *logConsumer) computeWidth() {
 // LogConsumer consume logs from services and format them
 type logConsumer struct {
 	ctx        context.Context
-	presenters map[string]*Presenter
+	presenters map[string]*presenter
 	width      int
 	writer     io.Writer
 	color      bool
 	prefix     bool
 }
 
-type Presenter struct {
+type presenter struct {
 	colors    colorFunc
 	service   string
 	container string
 	prefix    string
 }
 
-func (p *Presenter) setPrefix(width int) {
+func (p *presenter) setPrefix(width int) {
 	p.prefix = p.colors(fmt.Sprintf("%-"+strconv.Itoa(width)+"s |", p.container))
 }