Merge branch 'master' into master

Author: rnorth

.envrc

@@ -4,6 +4,10 @@ on:
   pull_request: {}
   push: { branches: [ master ] }
 
+env:
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
 jobs:
   find_gradle_jobs:
     runs-on: ubuntu-18.04

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ buildscript {
 
     dependencies {
         // https://github.com/melix/japicmp-gradle-plugin/issues/36
-        classpath 'com.google.guava:guava:28.2-jre'
+        classpath 'com.google.guava:guava:29.0-jre'
     }
 }
 
@@ -110,13 +110,13 @@ if (!org.gradle.internal.os.OperatingSystem.current().isWindows()) {
 }
 
 dependencies {
-    baseline 'org.testcontainers:testcontainers:1.14.0', {
+    baseline 'org.testcontainers:testcontainers:1.14.1', {
         exclude group: "*", module: "*"
     }
 
     compile 'junit:junit:4.12'
     compile 'org.slf4j:slf4j-api:1.7.30'
-    compile 'org.jetbrains:annotations:17.0.0'
+    compile 'org.jetbrains:annotations:19.0.0'
     compile 'org.apache.commons:commons-compress:1.20'
     compile ('org.rnorth.duct-tape:duct-tape:1.0.8') {
         exclude(group: 'org.jetbrains', module: 'annotations')
@@ -133,7 +133,7 @@ dependencies {
 
     compile "net.java.dev.jna:jna-platform:5.5.0"
 
-    shaded ('org.scala-sbt.ipcsocket:ipcsocket:1.0.0') {
+    shaded ('org.scala-sbt.ipcsocket:ipcsocket:1.0.1') {
         exclude(group: "net.java.dev.jna")
     }
 
@@ -146,7 +146,7 @@ dependencies {
 
     shaded "org.yaml:snakeyaml:1.25"
 
-    shaded 'com.squareup.okhttp3:okhttp:3.14.6'
+    shaded 'com.squareup.okhttp3:okhttp:3.14.8'
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 
@@ -155,21 +155,22 @@ dependencies {
     }
 
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
-    testCompile 'redis.clients:jedis:3.2.0'
-    testCompile 'com.rabbitmq:amqp-client:5.8.0'
-    testCompile 'org.mongodb:mongo-java-driver:3.12.3'
+    testCompile 'redis.clients:jedis:3.3.0'
+    testCompile 'com.rabbitmq:amqp-client:5.9.0'
+    testCompile 'org.mongodb:mongo-java-driver:3.12.4'
+
     testCompile ('org.mockito:mockito-core:3.3.3') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testCompile files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testCompile 'org.assertj:assertj-core:3.15.0'
+    testCompile 'org.assertj:assertj-core:3.16.0'
     testCompile project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
     jarFileTestCompile 'junit:junit:4.12'
-    jarFileTestCompile 'org.assertj:assertj-core:3.14.0'
+    jarFileTestCompile 'org.assertj:assertj-core:3.16.0'
     jarFileTestCompile 'org.ow2.asm:asm-debug-all:5.2'
 }

core/build.gradle

@@ -6,6 +6,7 @@
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.Uninterruptibles;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
@@ -216,6 +217,20 @@ private void createServices() {
 
     private void waitUntilServiceStarted() {
         listChildContainers().forEach(this::createServiceInstance);
+
+        Set<String> servicesToWaitFor = waitStrategyMap.keySet();
+        Set<String> instantiatedServices = serviceInstanceMap.keySet();
+        Sets.SetView<String> missingServiceInstances =
+            Sets.difference(servicesToWaitFor, instantiatedServices);
+
+        if (!missingServiceInstances.isEmpty()) {
+            throw new IllegalStateException(
+                "Services named " + missingServiceInstances + " " +
+                    "do not exist, but wait conditions have been defined " +
+                    "for them. This might mean that you misspelled " +
+                    "the service name when defining the wait condition.");
+        }
+
         serviceInstanceMap.forEach(this::waitUntilServiceStarted);
     }
 

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

@@ -307,7 +307,6 @@ protected void doStart() {
             Instant startedAt = Instant.now();
 
             logger().debug("Starting container: {}", getDockerImageName());
-            logger().debug("Trying to start container: {}", getDockerImageName());
 
             AtomicInteger attempt = new AtomicInteger(0);
             Unreliables.retryUntilSuccess(startupAttempts, () -> {

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

@@ -1,21 +1,40 @@
 package org.testcontainers.junit;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
+
+import java.io.File;
+import java.time.Duration;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.Description;
+import org.mockito.Mockito;
 import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
-
-import java.io.File;
-import java.time.Duration;
+import org.testcontainers.containers.wait.strategy.WaitStrategy;
 
 public class DockerComposeWaitStrategyTest {
 
     private static final int REDIS_PORT = 6379;
 
+    private DockerComposeContainer<?> environment;
+
+    @Before
+    public final void setUp() {
+        environment = new DockerComposeContainer<>(
+            new File("src/test/resources/compose-test.yml"));
+    }
+
+    @After
+    public final void cleanUp() {
+        environment.stop();
+    }
+
     @Test
     public void testWaitOnListeningPort() {
-        final DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
+        environment
             .withExposedService("redis_1", REDIS_PORT, Wait.forListeningPort());
 
         try {
@@ -28,7 +47,7 @@ public void testWaitOnListeningPort() {
 
     @Test
     public void testWaitOnMultipleStrategiesPassing() {
-        final DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
+        environment
             .withExposedService("redis_1", REDIS_PORT, Wait.forListeningPort())
             .withExposedService("db_1", 3306, Wait.forLogMessage(".*ready for connections.*\\s", 1))
             .withTailChildContainers(true);
@@ -43,7 +62,7 @@ public void testWaitOnMultipleStrategiesPassing() {
 
     @Test
     public void testWaitingFails() {
-        final DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
+        environment
             .withExposedService("redis_1", REDIS_PORT, Wait.forHttp("/test").withStartupTimeout(Duration.ofSeconds(10)));
         VisibleAssertions.assertThrows("waiting on an invalid http path times out",
             RuntimeException.class,
@@ -52,7 +71,7 @@ public void testWaitingFails() {
 
     @Test
     public void testWaitOnOneOfMultipleStrategiesFailing() {
-        final DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
+        environment
             .withExposedService("redis_1", REDIS_PORT, Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(10)))
             .waitingFor("db_1", Wait.forLogMessage(".*test test test.*\\s", 1).withStartupTimeout(Duration.ofSeconds(10)))
             .withTailChildContainers(true);
@@ -62,4 +81,26 @@ public void testWaitOnOneOfMultipleStrategiesFailing() {
             () -> environment.starting(Description.createTestDescription(Object.class, "name")));
     }
 
+    @Test
+    public void testWaitingForNonexistentServices() {
+        String existentServiceName = "db_1";
+        String nonexistentServiceName1 = "some_nonexistent_service_1";
+        String nonexistentServiceName2 = "some_nonexistent_service_2";
+        WaitStrategy someWaitStrategy = Mockito.mock(WaitStrategy.class);
+
+        environment
+            .waitingFor(existentServiceName, someWaitStrategy)
+            .waitingFor(nonexistentServiceName1, someWaitStrategy)
+            .waitingFor(nonexistentServiceName2, someWaitStrategy);
+
+        Throwable thrownWhenRequestedToWaitForNonexistentService =
+            catchThrowable(environment::start);
+
+        assertThat(thrownWhenRequestedToWaitForNonexistentService)
+            .isInstanceOf(IllegalStateException.class)
+            .hasMessageContaining(
+                nonexistentServiceName1,
+                nonexistentServiceName2)
+            .hasMessageNotContaining(existentServiceName);
+    }
 }

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

@@ -1,6 +1,6 @@
 redis:
   image: redis
 db:
-  image: orchardup/mysql
+  image: mysql:5.7.22
   environment:
-    MYSQL_DATABASE: wordpress
+    MYSQL_RANDOM_ROOT_PASSWORD: "true"

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

@@ -36,7 +36,7 @@ container.stop();
 ```
 
 Note that if you are still using the [TransportClient](https://www.elastic.co/guide/en/elasticsearch/client/java-api/6.3/transport-client.html)
-(not recommended as deprecated), the default cluster name is set to `docker-cluster` so you need to change `cluster.name` setting
+(not recommended as it is deprecated), the default cluster name is set to `docker-cluster` so you need to change `cluster.name` setting
 or set `client.transport.ignore_cluster_name` to `true`.
 
 ## Choose your Elasticsearch license

docs/modules/elasticsearch.md

@@ -42,7 +42,7 @@ new KafkaContainer().withExternalZookeeper("localhost:2181")
 
 If your test needs to run some other Docker container which needs access to the Kafka, do the following:
 
-* Run you other container on the same network as Kafka container. E.g. as following:
+* Run your other container on the same network as Kafka container, e.g.:
 ```java
 new GenericContainer("myImage").withNetwork(kafka.getNetwork())
 ```

docs/modules/kafka.md

@@ -29,13 +29,21 @@ We do this as follows:
 [Starting proxying connections to a target container](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:obtainProxyObject
 <!--/codeinclude-->
 
-Then, to establish a connection via Toxiproxy, we obtain **Toxiproxy's** proxy host IP and port:
+To establish a connection from the test code (on the host machine) to the target container via Toxiproxy, we obtain **Toxiproxy's** proxy host IP and port:
 
 <!--codeinclude-->
-[Obtaining proxied host and port](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:obtainProxiedHostAndPort
+[Obtaining proxied host and port for connections from the host machine](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:obtainProxiedHostAndPortForHostMachine
 <!--/codeinclude-->
 
-Code under test, or other containers, should connect to this proxied host IP and port.
+Code under test should connect to this proxied host IP and port.
+
+To establish a connection from a different container on the same network to the target container via Toxiproxy, we use **Toxiproxy's** network alias and original port:
+
+<!--codeinclude-->
+[Obtaining proxied host and port for connections from a different container](../../modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java) inside_block:obtainProxiedHostAndPortForDifferentContainer
+<!--/codeinclude-->
+
+Other containers should connect to this proxied host and port.
 
 Having done this, it is possible to trigger failure conditions ('Toxics') through the `proxy.toxics()` object:
 
@@ -82,4 +90,3 @@ testCompile "org.testcontainers:toxiproxy:{{latest_version}}"
 This module was inspired by a [hotels.com blog post](https://medium.com/hotels-com-technology/i-dont-know-about-resilience-testing-and-so-can-you-b3c59d80012d).
 
 [toxiproxy-java](https://github.com/trekawek/toxiproxy-java) is used to help control failure conditions.
-