Merge pull request #5780 from thaJeztah/multierr_simplify

vvoland · web-flow · commit 4771abac9e8e · 2025-02-03T15:09:27.000Z
cli/command/stack/swarm: waitOnServices remove redundant check for multi-error
diff --git a/cli/command/stack/swarm/deploy_composefile.go b/cli/command/stack/swarm/deploy_composefile.go
@@ -292,10 +292,5 @@ func waitOnServices(ctx context.Context, dockerCli command.Cli, serviceIDs []str
 			errs = append(errs, fmt.Errorf("%s: %w", serviceID, err))
 		}
 	}
-
-	if len(errs) > 0 {
-		return errors.Join(errs...)
-	}
-
-	return nil
+	return errors.Join(errs...)
 }

Original file line number	Diff line number	Diff line change
`@@ -292,10 +292,5 @@ func waitOnServices(ctx context.Context, dockerCli command.Cli, serviceIDs []str`
`292`	`292`	`errs = append(errs, fmt.Errorf("%s: %w", serviceID, err))`
`293`	`293`	`}`
`294`	`294`	`}`
`295`		`-`
`296`		`- if len(errs) > 0 {`
`297`		`- return errors.Join(errs...)`
`298`		`- }`
`299`		`-`
`300`		`- return nil`
	`295`	`+ return errors.Join(errs...)`
`301`	`296`	`}`