Upgrade docker-compose image to latest version and perform dire… #1847
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| package org.testcontainers.containers; | ||
|
|
||
| import com.google.common.annotations.VisibleForTesting; | ||
| import lombok.EqualsAndHashCode; | ||
| import lombok.Getter; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.apache.commons.io.FileUtils; | ||
| import org.yaml.snakeyaml.Yaml; | ||
|
|
||
| import java.io.File; | ||
| import java.io.FileInputStream; | ||
| import java.util.HashSet; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * Representation of a docker-compose file, with partial parsing for validation and extraction of a minimal set of | ||
| * data. | ||
| */ | ||
| @Slf4j | ||
| @EqualsAndHashCode | ||
| class ParsedDockerComposeFile { | ||
|
|
||
| private final Map<String, Object> composeFileContent; | ||
| private final String composeFileName; | ||
|
|
||
| @Getter | ||
| private Set<String> serviceImageNames = new HashSet<>(); | ||
|
|
||
| ParsedDockerComposeFile(File composeFile) { | ||
| Yaml yaml = new Yaml(); | ||
| try (FileInputStream fileInputStream = FileUtils.openInputStream(composeFile)) { | ||
| composeFileContent = yaml.load(fileInputStream); | ||
| } catch (Exception e) { | ||
| throw new IllegalArgumentException("Unable to parse YAML file from " + composeFile.getAbsolutePath(), e); | ||
| } | ||
| this.composeFileName = composeFile.getAbsolutePath(); | ||
|
|
||
| parseAndValidate(); | ||
| } | ||
|
|
||
| @VisibleForTesting | ||
| ParsedDockerComposeFile(Map<String, Object> testContent) { | ||
| this.composeFileContent = testContent; | ||
| this.composeFileName = ""; | ||
|
|
||
| parseAndValidate(); | ||
| } | ||
|
|
||
| private void parseAndValidate() { | ||
| final Map<String, ?> servicesMap; | ||
| if (composeFileContent.containsKey("version")) { | ||
| if ("2.0".equals(composeFileContent.get("version"))) { | ||
| log.warn("Testcontainers may not be able to clean up networks spawned using Docker Compose v2.0 files. " + | ||
| "Please see https://github.com/testcontainers/moby-ryuk/issues/2, and specify 'version: \"2.1\"' or " + | ||
| "higher in {}", composeFileName); | ||
| } | ||
|
|
||
| final Object servicesElement = composeFileContent.get("services"); | ||
| if (servicesElement == null) { | ||
| log.debug("Compose file {} has an unknown format: 'version' is set but 'services' is not defined", composeFileName); | ||
| return; | ||
| } | ||
| if (!(servicesElement instanceof Map)) { | ||
| log.debug("Compose file {} has an unknown format: 'services' is not Map", composeFileName); | ||
| return; | ||
| } | ||
|
|
||
| servicesMap = (Map<String, ?>) servicesElement; | ||
| } else { | ||
| servicesMap = composeFileContent; | ||
| } | ||
|
|
||
| for (Map.Entry<String, ?> entry : servicesMap.entrySet()) { | ||
| String serviceName = entry.getKey(); | ||
| Object serviceDefinition = entry.getValue(); | ||
| if (!(serviceDefinition instanceof Map)) { | ||
| log.debug("Compose file {} has an unknown format: service '{}' is not Map", composeFileName, serviceName); | ||
| break; | ||
| } | ||
|
|
||
| final Map serviceDefinitionMap = (Map) serviceDefinition; | ||
| if (serviceDefinitionMap.containsKey("container_name")) { | ||
| throw new IllegalStateException(String.format( | ||
| "Compose file %s has 'container_name' property set for service '%s' but this property is not supported by Testcontainers, consider removing it", | ||
| composeFileName, | ||
| serviceName | ||
| )); | ||
| } | ||
| if (serviceDefinitionMap.containsKey("image") && serviceDefinitionMap.get("image") instanceof String) { | ||
| serviceImageNames.add((String) serviceDefinitionMap.get("image")); | ||
| } | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.
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.
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.
These two sets were never being written to, so they and all code that read them was redundant. Removed.