-
Notifications
You must be signed in to change notification settings - Fork 642
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.
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
Allow comma separated list of container names in dependsOn elements #810
Conversation
Codecov Report
@@ Coverage Diff @@
## master #810 +/- ##
=========================================
Coverage 47.52% 47.52%
Complexity 1069 1069
=========================================
Files 134 134
Lines 6923 6923
Branches 910 910
=========================================
Hits 3290 3290
Misses 3351 3351
Partials 282 282
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me (with some minor comments).
@@ -97,7 +97,7 @@ private void addVolumes(RunImageConfiguration runConfig, List<String> ret) { | |||
|
|||
private void addLinks(RunImageConfiguration runConfig, List<String> ret) { | |||
// Custom networks can have circular links, no need to be considered for the starting order. | |||
if (runConfig.getLinks() != null && !runConfig.getNetworkingConfig().isCustomNetwork()) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are you sure that getLinks() is never null ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've added @Nonnull
annotations to show the deduction chain. EnvUtil.splitAtCommasAndTrim(Iterable<String> input)
never returns null.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, I'm settled then ;-)
@@ -114,7 +114,7 @@ private void addContainerNetwork(RunImageConfiguration runConfig, List<String> r | |||
|
|||
private void addDependsOn(RunImageConfiguration runConfig, List<String> ret) { | |||
// Only used in custom networks. | |||
if (runConfig.getDependsOn() != null && runConfig.getNetworkingConfig().isCustomNetwork()) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why can't getDependsOn() be null ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
likewise.
Description
Allow comma separated list of elements. (Similar to #558)
Info