Merge branch 'main' into test-java-versions

Author: eddumelendez

.github/settings.yml

@@ -13,7 +13,7 @@ repository:
   homepage: https://testcontainers.org
 
   # A comma-separated list of topics to set on the repository
-  topics: java,testing,docker,docker-compose,jvm,test-automation,junit,hacktoberfest
+  topics: java,testing,docker,docker-compose,jvm,test-automation,junit,hacktoberfest,integration-testing
 
   # Either `true` to make the repository private, or `false` to make it public.
   private: false

core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java

@@ -11,6 +11,8 @@
 import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.SafeConstructor;
+import org.yaml.snakeyaml.nodes.Node;
+import org.yaml.snakeyaml.nodes.Tag;
 import org.yaml.snakeyaml.representer.Representer;
 import org.yaml.snakeyaml.resolver.Resolver;
 
@@ -44,13 +46,17 @@ class ParsedDockerComposeFile {
         LoaderOptions options = new LoaderOptions();
         options.setMaxAliasesForCollections(1_000);
         DumperOptions dumperOptions = new DumperOptions();
-        Yaml yaml = new Yaml(
-            new SafeConstructor(options),
-            new Representer(dumperOptions),
-            dumperOptions,
-            options,
-            new Resolver()
-        );
+
+        SafeConstructor constructor = new SafeConstructor(options) {
+            @Override
+            protected Object constructObject(Node node) {
+                if (node.getTag().equals(new Tag("!reset"))) {
+                    return null;
+                }
+                return super.constructObject(node);
+            }
+        };
+        Yaml yaml = new Yaml(constructor, new Representer(dumperOptions), dumperOptions, options, new Resolver());
         try (FileInputStream fileInputStream = FileUtils.openInputStream(composeFile)) {
             composeFileContent = yaml.load(fileInputStream);
         } catch (Exception e) {

core/src/test/java/org/testcontainers/containers/DockerComposeProfilesOptionTest.java

@@ -31,6 +31,9 @@ public void setUp() {
                 .assumeThat(CommandLine.executableExists(DockerComposeContainer.COMPOSE_EXECUTABLE))
                 .as("docker-compose executable exists")
                 .isTrue();
+            Assumptions
+                .assumeThat(CommandLine.runShellCommand("docker-compose", "--version"))
+                .doesNotStartWith("Docker Compose version v2");
         }
     }
 

core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java

@@ -0,0 +1,41 @@
+package org.testcontainers.junit;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import org.junit.Test;
+import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.containers.ContainerState;
+
+import java.io.File;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ComposeContainerOverrideTest {
+
+    private static final File BASE = new File("src/test/resources/compose-override/compose.yml");
+
+    private static final File OVERRIDE = new File("src/test/resources/compose-override/compose-override.yml");
+
+    @Test
+    public void readEnvironment() {
+        try (ComposeContainer compose = new ComposeContainer(BASE).withExposedService("redis", 6379)) {
+            compose.start();
+            InspectContainerResponse container = compose
+                .getContainerByServiceName("redis-1")
+                .map(ContainerState::getContainerInfo)
+                .get();
+            assertThat(container.getConfig().getEnv()).contains("foo=bar");
+        }
+    }
+
+    @Test
+    public void resetEnvironment() {
+        try (ComposeContainer compose = new ComposeContainer(BASE, OVERRIDE).withExposedService("redis", 6379)) {
+            compose.start();
+            InspectContainerResponse container = compose
+                .getContainerByServiceName("redis-1")
+                .map(ContainerState::getContainerInfo)
+                .get();
+            assertThat(container.getConfig().getEnv()).doesNotContain("foo=bar");
+        }
+    }
+}

core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithOptionsTest.java

@@ -83,6 +83,9 @@ public void setUp() {
                 .assumeThat(CommandLine.executableExists(DockerComposeContainer.COMPOSE_EXECUTABLE))
                 .as("docker-compose executable exists")
                 .isTrue();
+            Assumptions
+                .assumeThat(CommandLine.runShellCommand("docker-compose", "--version"))
+                .doesNotStartWith("Docker Compose version v2");
         }
     }
 

core/src/test/java/org/testcontainers/junit/FixedHostPortContainerTest.java

@@ -1,8 +1,7 @@
 package org.testcontainers.junit;
 
-import com.google.common.util.concurrent.Uninterruptibles;
+import org.awaitility.Awaitility;
 import org.junit.Test;
-import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.TestImages;
 import org.testcontainers.containers.FixedHostPortGenericContainer;
 import org.testcontainers.containers.GenericContainer;
@@ -11,7 +10,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.Socket;
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -71,7 +70,7 @@ public void testFixedHostPortMapping() throws IOException {
                 .as("Port mapping does not seem to match given fixed port")
                 .isEqualTo(unusedHostPort);
 
-            final String content = this.readResponse(echoServer, unusedHostPort);
+            final String content = readResponse(echoServer, unusedHostPort);
             assertThat(content).as("Returned echo from fixed port does not match expected").isEqualTo(TEST_RESPONSE);
         }
     }
@@ -86,15 +85,11 @@ public void testFixedHostPortMapping() throws IOException {
      */
     private String readResponse(GenericContainer container, Integer port) throws IOException {
         try (
-            final BufferedReader reader = Unreliables.retryUntilSuccess(
-                10,
-                TimeUnit.SECONDS,
-                () -> {
-                    Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
-                    final Socket socket = new Socket(container.getHost(), port);
-                    return new BufferedReader(new InputStreamReader(socket.getInputStream()));
-                }
-            )
+            Socket socket = Awaitility
+                .await()
+                .pollDelay(Duration.ofSeconds(1))
+                .until(() -> new Socket(container.getHost(), port), Socket::isConnected);
+            BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream()))
         ) {
             return reader.readLine();
         }

core/src/test/resources/compose-override/compose-override.yml

@@ -0,0 +1,7 @@
+services:
+  redis:
+    image: redis:6-alpine
+    ports:
+      - 6379
+    environment:
+      foo: !reset null

core/src/test/resources/compose-override/compose.yml

@@ -0,0 +1,7 @@
+services:
+  redis:
+    image: redis:6-alpine
+    ports:
+      - 6379
+    environment:
+      foo: bar

docs/modules/databases/cassandra.md

@@ -6,12 +6,12 @@ This example connects to the Cassandra cluster:
 
 1. Define a container:
     <!--codeinclude-->
-    [Container definition](../../../modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraDriver4Test.java) inside_block:container-definition
+    [Container definition](../../../modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java) inside_block:container-definition
     <!--/codeinclude-->
 
 2. Build a `CqlSession`:
     <!--codeinclude-->
-    [Building CqlSession](../../../modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraDriver4Test.java) inside_block:cql-session
+    [Building CqlSession](../../../modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java) inside_block:cql-session
     <!--/codeinclude-->
 
 3. Define a container with custom `cassandra.yaml` located in a directory `cassandra-auth-required-configuration`:

docs/modules/databases/mongodb.md

@@ -1,9 +1,13 @@
 # MongoDB Module
 
-!!! note
-    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
+The MongoDB module provides two Testcontainers for MongoDB unit testing:
+
+* [MongoDBContainer](#mongodbcontainer) - the core MongoDB database
+* [MongoDBAtlasLocalContainer](#mongodbatlaslocalcontainer) - the core MongoDB database combined with MongoDB Atlas Search + Atlas Vector Search
+
+## MongoDBContainer
 
-## Usage example
+### Usage example
 
 The following example shows how to create a MongoDBContainer:
 
@@ -36,6 +40,37 @@ For instance, to initialize a single node replica set on fixed ports via Docker,
 As we can see, there is a lot of operations to execute and we even haven't touched a non-fixed port approach.
 That's where the MongoDBContainer might come in handy. 
 
+## MongoDBAtlasLocalContainer
+
+### Usage example
+
+The following example shows how to create a MongoDBAtlasLocalContainer:
+
+<!--codeinclude-->
+[Creating a MongoDB Atlas Local Container](../../../modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainerTest.java) inside_block:creatingAtlasLocalContainer
+<!--/codeinclude-->
+
+And how to start it:
+
+<!--codeinclude-->
+[Start the Container](../../../modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainerTest.java) inside_block:startingAtlasLocalContainer
+<!--/codeinclude-->
+
+The connection string provided by the MongoDBAtlasLocalContainer's getConnectionString() method includes the dynamically allocated port:
+
+<!--codeinclude-->
+[Get the Connection String](../../../modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBAtlasLocalContainerTest.java) inside_block:getConnectionStringAtlasLocalContainer
+<!--/codeinclude-->
+
+e.g. `mongodb://localhost:12345/?directConnection=true`
+
+### References
+MongoDB Atlas Local combines the MongoDB database engine with MongoT, a sidecar process for advanced searching capabilities built by MongoDB and powered by [Apache Lucene](https://lucene.apache.org/). 
+
+The container (mongodb/mongodb-atlas-local) documentation can be found [here](https://www.mongodb.com/docs/atlas/cli/current/atlas-cli-deploy-docker/).
+
+General information about Atlas Search can be found [here](https://www.mongodb.com/docs/atlas/atlas-search/).
+
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:
@@ -55,7 +90,7 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
     ```
 
 !!! hint
-Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency
+    Adding this Testcontainers library JAR will not automatically add a database driver JAR to your project. You should ensure that your project also has a suitable database driver as a dependency
 
 #### Copyright
 Copyright (c) 2019 Konstantin Silaev <[email protected]>