Merged
Conversation
Includes all commands and files run as part of integrated support bundle
Allow setting timeouts within specs if they are lower than the global timeout
Allow setting global timeout on command line, and per spec timeouts if lower than global timeout
areed
approved these changes
Oct 27, 2017
|
|
||
| if spec.Config.ContainerID == "" || len(fullCommand) == 0 || spec.Config.Command == "" { | ||
| err := errors.New("spec requires a container ID and command within config") | ||
| if (spec.Config.ContainerID == "" && spec.Config.ContainerName == "") || len(fullCommand) == 0 || spec.Config.Command == "" { |
There was a problem hiding this comment.
This would be easier to read if broken up into separate checks for Id/Name and missing command. Also the resulting error would be more precise.
Contributor
Author
There was a problem hiding this comment.
True, it could be [""] at worst.
And I'll break up the error messages, here and elsewhere with similar issues
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The default bundle contents have been greatly expanded
Commands referring to docker containers can now use the container name instead of id
(use the container_name field where you would have used container_id)
Also includes timeout improvements - global timeout can be set via the command line, and per-task timeouts in the yaml spec. The first timeout to fire is the one used. (global 1m, task 30s -> task timeout dominates; global 1m, task 5m -> global timeout dominates) It may be worth warning if task timeouts are set to be set longer than global timeouts.