Skip to content

Fix incorrect usage of errgroup.WithContext #13480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
htoyoda18 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix incorrect usage of errgroup.WithContext #13480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/compose/convergence.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/compose/down.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
Expand Down