Merge branch 'master' into 2050-sqlserver-eula

KyleAure · web-flow · commit 513e99b5888f · 2019-12-20T09:45:30.000-06:00
diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
@@ -0,0 +1,27 @@
+name: Update docs version
+
+on:
+    release:
+        types: [published]
+
+jobs:
+    build:
+        runs-on: ubuntu-18.04
+        steps:
+            -   uses: actions/checkout@v1
+            -   name: Checkout master
+                run: git checkout master
+            -   name: Update latest_version property in mkdocs.yml
+                run: |
+                    sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
+                    git diff
+            -   name: Commit changes
+                run: |
+                    git config user.email "nobody@testcontainers.org"
+                    git config user.name "GitHub Action - Update docs version"
+                    git add mkdocs.yml
+                    git commit -m "Update documentation version to ${GITHUB_REF##*/}" -m "skip-checks: true" || echo "not changed"
+            -   name: Push changes
+                uses: ad-m/github-push-action@68af9897f2b021035ca3952bf354bbb4675c1762 # v0.5.0
+                with:
+                    github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/core/build.gradle b/core/build.gradle
@@ -57,7 +57,7 @@ project.tasks.check.dependsOn(jarFileTest)
 
 dependencies {
     compile 'junit:junit:4.12'
-    compile 'org.slf4j:slf4j-api:1.7.29'
+    compile 'org.slf4j:slf4j-api:1.7.30'
     compile 'org.jetbrains:annotations:17.0.0'
     compile 'javax.annotation:javax.annotation-api:1.3.2'
     compile 'org.apache.commons:commons-compress:1.19'
@@ -106,10 +106,10 @@ dependencies {
     }
 
     testCompile 'org.apache.httpcomponents:httpclient:4.5.9'
-    testCompile 'redis.clients:jedis:3.1.0'
-    testCompile 'com.rabbitmq:amqp-client:5.7.3'
-    testCompile 'org.mongodb:mongo-java-driver:3.11.2'
-    testCompile ('org.mockito:mockito-core:3.2.0') {
+    testCompile 'redis.clients:jedis:3.2.0'
+    testCompile 'com.rabbitmq:amqp-client:5.8.0'
+    testCompile 'org.mongodb:mongo-java-driver:3.12.0'
+    testCompile ('org.mockito:mockito-core:3.2.4') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java
@@ -43,8 +43,10 @@ public class DockerClientConfigUtils {
             .map(StringUtils::trimToEmpty)
             .filter(StringUtils::isNotBlank);
 
-
-
+    /**
+     * Use {@link DockerClientFactory#dockerHostIpAddress()}
+     */
+    @Deprecated
     public static String getDockerHostIpAddress(DockerClientConfig config) {
         switch (config.getDockerHost().getScheme()) {
             case "http":
diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -1,8 +1,10 @@
 package org.testcontainers.dockerclient;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
@@ -17,6 +19,7 @@
 import org.testcontainers.dockerclient.transport.okhttp.OkHttpDockerCmdExecFactory;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -33,6 +36,8 @@ public abstract class DockerClientProviderStrategy {
     protected DockerClient client;
     protected DockerClientConfig config;
 
+    private String dockerHostIpAddress;
+
     private static final RateLimiter PING_RATE_LIMITER = RateLimiterBuilder.newBuilder()
             .withRate(2, TimeUnit.SECONDS)
             .withConstantThroughput()
@@ -188,8 +193,38 @@ protected void ping(DockerClient client, int timeoutInSeconds) {
         }
     }
 
-    public String getDockerHostIpAddress() {
-        return DockerClientConfigUtils.getDockerHostIpAddress(this.config);
+    public synchronized String getDockerHostIpAddress() {
+        if (dockerHostIpAddress == null) {
+            dockerHostIpAddress = resolveDockerHostIpAddress(client, config.getDockerHost());
+        }
+        return dockerHostIpAddress;
+    }
+
+    @VisibleForTesting
+    static String resolveDockerHostIpAddress(DockerClient client, URI dockerHost) {
+        switch (dockerHost.getScheme()) {
+            case "http":
+            case "https":
+            case "tcp":
+                return dockerHost.getHost();
+            case "unix":
+            case "npipe":
+                if (DockerClientConfigUtils.IN_A_CONTAINER) {
+                    return client.inspectNetworkCmd()
+                        .withNetworkId("bridge")
+                        .exec()
+                        .getIpam()
+                        .getConfig()
+                        .stream()
+                        .filter(it -> it.getGateway() != null)
+                        .findAny()
+                        .map(Network.Ipam.Config::getGateway)
+                        .orElse("localhost");
+                }
+                return "localhost";
+            default:
+                return null;
+        }
     }
 
     protected void checkOSType() {
diff --git a/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java b/core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java
@@ -35,6 +35,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.Consumer;
 
@@ -362,23 +364,34 @@ public void accept(BufferedSource source) {
             try {
                 while (!source.exhausted()) {
                     // See https://docs.docker.com/engine/api/v1.37/#operation/ContainerAttach
-                    if(!source.request(HEADER_SIZE)) {
+                    // [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}[]byte{OUTPUT}
+
+                    if (!source.request(HEADER_SIZE)) {
                         return;
                     }
-                    StreamType streamType = streamType(source.readByte());
-                    source.skip(3);
-                    int payloadSize = source.readInt();
+                    byte[] bytes = source.readByteArray(HEADER_SIZE);
+
+                    StreamType streamType = streamType(bytes[0]);
 
-                    if (streamType != StreamType.RAW) {
-                        if (!source.request(payloadSize)) {
-                            return;
+                    if (streamType == StreamType.RAW) {
+                        resultCallback.onNext(new Frame(StreamType.RAW, bytes));
+                        byte[] buffer = new byte[1024];
+                        while (!source.exhausted()) {
+                            int readBytes = source.read(buffer);
+                            if (readBytes != -1) {
+                                resultCallback.onNext(new Frame(StreamType.RAW, Arrays.copyOf(buffer, readBytes)));
+                            }
                         }
-                        byte[] payload = source.readByteArray(payloadSize);
+                        return;
+                    }
 
-                        resultCallback.onNext(new Frame(streamType, payload));
-                    } else {
-                        resultCallback.onNext(new Frame(streamType, source.readByteArray()));
+                    int payloadSize = ByteBuffer.wrap(bytes, 4, 4).getInt();
+                    if (!source.request(payloadSize)) {
+                        return;
                     }
+                    byte[] payload = source.readByteArray(payloadSize);
+
+                    resultCallback.onNext(new Frame(streamType, payload));
                 }
             } catch (Exception e) {
                 resultCallback.onError(e);
diff --git a/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java b/core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
@@ -1,54 +1,40 @@
 package org.testcontainers.dockerclient;
 
-import com.github.dockerjava.core.DefaultDockerClientConfig;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.junit.Ignore;
+import com.github.dockerjava.api.DockerClient;
 import org.junit.Test;
+import org.testcontainers.DockerClientFactory;
+
+import java.net.URI;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 public class DockerClientConfigUtilsTest {
 
+    DockerClient client = DockerClientFactory.lazyClient();
+
     @Test
     public void getDockerHostIpAddressShouldReturnLocalhostWhenUnixSocket() {
-        DockerClientConfig configuration = DefaultDockerClientConfig.createDefaultConfigBuilder()
-                .withDockerHost("unix:///var/run/docker.sock")
-                .withDockerTlsVerify(false) // TODO - check wrt. https://github.com/docker-java/docker-java/issues/588
-                .build();
-        String actual = DockerClientConfigUtils.getDockerHostIpAddress(configuration);
+        String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(client, URI.create("unix:///var/run/docker.sock"));
         assertEquals("localhost", actual);
     }
 
-    @Test @Ignore
-    public void getDockerHostIpAddressShouldReturnDockerHostIpWhenHttpUri() {
-        DockerClientConfig configuration = DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost("http://12.23.34.45").build();
-        String actual = DockerClientConfigUtils.getDockerHostIpAddress(configuration);
-        assertEquals("12.23.34.45", actual);
-    }
-
-    @Test @Ignore
+    @Test
     public void getDockerHostIpAddressShouldReturnDockerHostIpWhenHttpsUri() {
-        DockerClientConfig configuration = DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost("https://12.23.34.45").build();
-        String actual = DockerClientConfigUtils.getDockerHostIpAddress(configuration);
+        String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(client, URI.create("http://12.23.34.45"));
         assertEquals("12.23.34.45", actual);
     }
 
     @Test
     public void getDockerHostIpAddressShouldReturnDockerHostIpWhenTcpUri() {
-        DockerClientConfig configuration = DefaultDockerClientConfig.createDefaultConfigBuilder()
-                .withDockerHost("tcp://12.23.34.45")
-                .withDockerTlsVerify(false) // TODO - check wrt. https://github.com/docker-java/docker-java/issues/588
-                .build();
-        String actual = DockerClientConfigUtils.getDockerHostIpAddress(configuration);
+        String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(client, URI.create("tcp://12.23.34.45"));
         assertEquals("12.23.34.45", actual);
     }
 
-    @Test @Ignore
+    @Test
     public void getDockerHostIpAddressShouldReturnNullWhenUnsupportedUriScheme() {
-        DockerClientConfig configuration = DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost("gopher://12.23.34.45").build();
-        String actual = DockerClientConfigUtils.getDockerHostIpAddress(configuration);
+        String actual = DockerClientProviderStrategy.resolveDockerHostIpAddress(client, URI.create("gopher://12.23.34.45"));
         assertNull(actual);
     }
 
diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
@@ -16,7 +16,7 @@ public static class ValidNames {
 
         @Parameterized.Parameters(name = "{0}")
         public static String[] getNames() {
-            return new String[]{"myname:latest",
+            return new String[]{
                 "myname:latest",
                 "repo/my-name:1.0",
                 "registry.foo.com:1234/my-name:1.0",
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
@@ -6,10 +6,10 @@ repositories {
     jcenter()
 }
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.29'
+    compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'com.squareup.okhttp3:okhttp:3.14.4'
     implementation 'org.json:json:20180813'
-    testImplementation 'org.postgresql:postgresql:42.2.8'
+    testImplementation 'org.postgresql:postgresql:42.2.9'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:postgresql'
 }
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
@@ -7,13 +7,13 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.29'
-    implementation 'redis.clients:jedis:3.1.0'
+    compileOnly 'org.slf4j:slf4j-api:1.7.30'
+    implementation 'redis.clients:jedis:3.2.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
-    testImplementation 'org.testng:testng:7.0.0'
+    testImplementation 'org.testng:testng:7.1.0'
 }
 
 test {
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.29'
-    implementation 'redis.clients:jedis:3.1.0'
+    compileOnly 'org.slf4j:slf4j-api:1.7.30'
+    implementation 'redis.clients:jedis:3.2.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '2.2.1.RELEASE'
+    id 'org.springframework.boot' version '2.2.2.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
@@ -8,10 +8,10 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:3.1.0'
+    implementation 'redis.clients:jedis:3.2.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
-    compileOnly 'org.slf4j:slf4j-api:1.7.29'
+    compileOnly 'org.slf4j:slf4j-api:1.7.30'
 
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '2.2.1.RELEASE'
+    id 'org.springframework.boot' version '2.2.2.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
@@ -2,6 +2,6 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     compile project(':testcontainers')
-    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.5.0"
+    testCompile "org.elasticsearch.client:elasticsearch-rest-client:7.5.1"
     testCompile "org.elasticsearch.client:transport:6.7.1"
 }
diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: InfluxDB"
 dependencies {
     compile project(':testcontainers')
 
-    compileOnly 'org.influxdb:influxdb-java:2.16'
-    testCompile 'org.influxdb:influxdb-java:2.15'
+    compileOnly 'org.influxdb:influxdb-java:2.17'
+    testCompile 'org.influxdb:influxdb-java:2.17'
 }
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
@@ -7,13 +7,13 @@ dependencies {
     testCompile project(':mysql')
     testCompile project(':postgresql')
     testCompile 'com.zaxxer:HikariCP:3.4.1'
-    testCompile 'redis.clients:jedis:3.1.0'
+    testCompile 'redis.clients:jedis:3.2.0'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.10'
-    testCompile ('org.mockito:mockito-core:3.2.0') {
+    testCompile ('org.mockito:mockito-core:3.2.4') {
         exclude(module: 'hamcrest-core')
     }
 
-    testRuntime 'org.postgresql:postgresql:42.2.8'
+    testRuntime 'org.postgresql:postgresql:42.2.9'
     testRuntime 'mysql:mysql-connector-java:8.0.18'
     testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
 }
diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     compile project(':testcontainers')
 
-    testCompile 'org.apache.kafka:kafka-clients:2.3.1'
+    testCompile 'org.apache.kafka:kafka-clients:2.4.0'
     testCompile 'org.assertj:assertj-core:3.14.0'
     testCompile 'com.google.guava:guava:23.0'
 }
diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.5.2'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.29'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.30'
     testCompile 'org.vibur:vibur-dbcp:25.0'
 }
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testCompile 'mysql:mysql-connector-java:8.0.18'
     testCompile 'com.zaxxer:HikariCP-java6:2.3.13'
-    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.29'
+    testCompile 'org.apache.tomcat:tomcat-jdbc:9.0.30'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
     testCompile 'org.vibur:vibur-dbcp:25.0'
 }
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,10 @@ repositories {`
`6`	`6`	`jcenter()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- compileOnly 'org.slf4j:slf4j-api:1.7.29'`
	`9`	`+ compileOnly 'org.slf4j:slf4j-api:1.7.30'`
`10`	`10`	`implementation 'com.squareup.okhttp3:okhttp:3.14.4'`
`11`	`11`	`implementation 'org.json:json:20180813'`
`12`		`- testImplementation 'org.postgresql:postgresql:42.2.8'`
	`12`	`+ testImplementation 'org.postgresql:postgresql:42.2.9'`
`13`	`13`	`testImplementation 'ch.qos.logback:logback-classic:1.2.3'`
`14`	`14`	`testImplementation 'org.testcontainers:postgresql'`
`15`	`15`	`}`