From 2c3ceec965d9e7750cd027c522321ec6d00086fc Mon Sep 17 00:00:00 2001 From: "hiroto.toyoda" Date: Sat, 27 Dec 2025 14:51:09 +0900 Subject: [PATCH] fix: correctly use errgroup.WithContext Signed-off-by: hiroto.toyoda --- pkg/compose/convergence.go | 4 ++-- pkg/compose/down.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/compose/convergence.go b/pkg/compose/convergence.go index 701d005821..0db3d1b104 100644 --- a/pkg/compose/convergence.go +++ b/pkg/compose/convergence.go @@ -121,7 +121,7 @@ func (c *convergence) ensureService(ctx context.Context, project *types.Project, actual := len(containers) updated := make(Containers, expected) - eg, _ := errgroup.WithContext(ctx) + eg, ctx := errgroup.WithContext(ctx) err = c.resolveServiceReferences(&service) if err != nil { @@ -451,7 +451,7 @@ func (s *composeService) waitDependencies(ctx context.Context, project *types.Pr defer cancelFunc() ctx = withTimeout } - eg, _ := errgroup.WithContext(ctx) + eg, ctx := errgroup.WithContext(ctx) for dep, config := range dependencies { if shouldWait, err := shouldWaitForDependency(dep, config, project); err != nil { return err diff --git a/pkg/compose/down.go b/pkg/compose/down.go index 7915e2dcb0..35eec82ebe 100644 --- a/pkg/compose/down.go +++ b/pkg/compose/down.go @@ -119,7 +119,7 @@ func (s *composeService) down(ctx context.Context, projectName string, options a logrus.Warnf("Warning: No resource found to remove for project %q.", projectName) } - eg, _ := errgroup.WithContext(ctx) + eg, ctx := errgroup.WithContext(ctx) for _, op := range ops { eg.Go(op) } @@ -335,7 +335,7 @@ func (s *composeService) stopContainers(ctx context.Context, serv *types.Service } func (s *composeService) removeContainers(ctx context.Context, containers []containerType.Summary, service *types.ServiceConfig, timeout *time.Duration, volumes bool) error { - eg, _ := errgroup.WithContext(ctx) + eg, ctx := errgroup.WithContext(ctx) for _, ctr := range containers { eg.Go(func() error { return s.stopAndRemoveContainer(ctx, ctr, service, timeout, volumes)