Fail fast if container_name is set in Docker Compose file
#1581
Conversation
This file contains 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
rnorth
reviewed
Jul 16, 2019
core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
Show resolved
Hide resolved
rnorth
reviewed
Jul 16, 2019
rnorth
reviewed
Jul 16, 2019
core/src/test/java/org/testcontainers/containers/DockerComposeFileValidationTest.java
Show resolved
Hide resolved
rnorth
approved these changes
Jul 16, 2019
rnorth
approved these changes
Jul 16, 2019
kiview
approved these changes
Jul 16, 2019
core/src/test/java/org/testcontainers/containers/DockerComposeFileValidationTest.java
Show resolved
Hide resolved
|
|
||
| @VisibleForTesting | ||
| static void validate(Object template, String identifier) { | ||
| if (!(template instanceof Map)) { |
There was a problem hiding this comment.
I think we could extract 240-261 into a private function and then have
if (!hasKnownFormat(object)) {
log.debug("Compose file {} has an unknown format", identifier);
return
}
...
There was a problem hiding this comment.
extracted methods make it much harder to follow the structure IMO, especially when dealing with the format/structure validation
There was a problem hiding this comment.
I disagree, since it makes the responsibility of the part of the code clearer (therefore also increasing maintainability).
But we don't need to fight over this 😉
| servicesMap = map; | ||
| } | ||
|
|
||
| for (Map.Entry<String, ?> entry : servicesMap.entrySet()) { |
There was a problem hiding this comment.
for (Map.Entry<String, ?> entry : servicesMap.entrySet()) {
validateEntry(entry)
}
Just an idea?
We can't break in this case of course.
delete-merged-branch
bot
deleted the
docker-compose_fail_fast_on_container_name
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #1151. Submitting a new one since #1432 was closed by the author.