From 6a03c4ff030514051a3f4434346956caa5f9077f Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Tue, 26 Jan 2021 18:20:00 +0100 Subject: [PATCH] Fixing linter after rebasing Signed-off-by: Guillaume Tardif --- kube/charts/kubernetes/context.go | 1 + kube/compose.go | 5 +++++ kube/context.go | 1 + local/compose/down.go | 5 +++++ local/compose/stop.go | 3 +++ 5 files changed, 15 insertions(+) diff --git a/kube/charts/kubernetes/context.go b/kube/charts/kubernetes/context.go index 57c6ce059..264b0760c 100644 --- a/kube/charts/kubernetes/context.go +++ b/kube/charts/kubernetes/context.go @@ -25,6 +25,7 @@ import ( "k8s.io/client-go/tools/clientcmd" ) +// ListAvailableKubeConfigContexts list kube contexts func ListAvailableKubeConfigContexts(kubeconfig string) ([]string, error) { config, err := clientcmd.NewDefaultPathOptions().GetStartingConfig() if err != nil { diff --git a/kube/compose.go b/kube/compose.go index 5160a48d0..520e389b4 100644 --- a/kube/compose.go +++ b/kube/compose.go @@ -85,6 +85,11 @@ func (s *composeService) Start(ctx context.Context, project *types.Project, cons return errdefs.ErrNotImplemented } +// Stop executes the equivalent to a `compose stop` +func (s *composeService) Stop(ctx context.Context, project *types.Project, consumer compose.LogConsumer) error { + return errdefs.ErrNotImplemented +} + // Logs executes the equivalent to a `compose logs` func (s *composeService) Logs(ctx context.Context, projectName string, consumer compose.LogConsumer, options compose.LogOptions) error { return errdefs.ErrNotImplemented diff --git a/kube/context.go b/kube/context.go index d094d335b..0b9201b00 100644 --- a/kube/context.go +++ b/kube/context.go @@ -35,6 +35,7 @@ type ContextParams struct { FromEnvironment bool } +// CreateContextData create Docker context data func (cp ContextParams) CreateContextData() (interface{}, string, error) { if cp.FromEnvironment { // we use the current kubectl context from a $KUBECONFIG path diff --git a/local/compose/down.go b/local/compose/down.go index 14d3bc834..64c857946 100644 --- a/local/compose/down.go +++ b/local/compose/down.go @@ -113,7 +113,12 @@ func (s *composeService) removeContainers(ctx context.Context, w progress.Writer toDelete := container eg.Go(func() error { eventName := "Container " + getCanonicalContainerName(toDelete) + w.Event(progress.StoppingEvent(eventName)) err := s.stopContainers(ctx, w, []moby.Container{container}) + if err != nil { + w.Event(progress.ErrorMessageEvent(eventName, "Error while Removing")) + return err + } w.Event(progress.RemovingEvent(eventName)) err = s.apiClient.ContainerRemove(ctx, toDelete.ID, moby.ContainerRemoveOptions{Force: true}) if err != nil { diff --git a/local/compose/stop.go b/local/compose/stop.go index cb616d8ab..c8c105b64 100644 --- a/local/compose/stop.go +++ b/local/compose/stop.go @@ -48,6 +48,9 @@ func (s *composeService) Stop(ctx context.Context, project *types.Project, consu containers = others return err }) + if err != nil { + return err + } return eg.Wait() }