You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by mm...@apache.org on 2023/03/01 01:54:06 UTC
[bookkeeper] branch master updated: Update testcontainers to last version to support m1 (#3819)
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new a96317e353 Update testcontainers to last version to support m1 (#3819)
a96317e353 is described below
commit a96317e3537abff1d5759356ee27fc1044740f44
Author: ZhangJian He <sh...@gmail.com>
AuthorDate: Wed Mar 1 09:54:01 2023 +0800
Update testcontainers to last version to support m1 (#3819)
---
.../org/apache/bookkeeper/metadata/etcd/helpers/KeySetReaderTest.java | 2 +-
.../org/apache/bookkeeper/metadata/etcd/testing/EtcdContainer.java | 4 ++--
pom.xml | 2 +-
.../java/org/apache/bookkeeper/tests/containers/BookieContainer.java | 2 +-
.../main/java/org/apache/bookkeeper/tests/containers/ZKContainer.java | 2 +-
.../org/apache/bookkeeper/tests/containers/wait/HttpWaitStrategy.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/helpers/KeySetReaderTest.java b/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/helpers/KeySetReaderTest.java
index ad1084f066..b4bdf6ea79 100644
--- a/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/helpers/KeySetReaderTest.java
+++ b/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/helpers/KeySetReaderTest.java
@@ -41,7 +41,7 @@ import org.apache.bookkeeper.versioning.Version.Occurred;
import org.apache.bookkeeper.versioning.Versioned;
import org.apache.commons.compress.utils.Sets;
import org.junit.Test;
-import org.testcontainers.shaded.org.apache.commons.lang.RandomStringUtils;
+import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
/**
* Integration test {@link KeySetReader}.
diff --git a/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/testing/EtcdContainer.java b/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/testing/EtcdContainer.java
index 2ef547d1f3..0178e4d2ab 100644
--- a/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/testing/EtcdContainer.java
+++ b/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/testing/EtcdContainer.java
@@ -59,7 +59,7 @@ public class EtcdContainer extends GenericContainer<EtcdContainer> {
}
public String getExternalServiceUri() {
- return "etcd://" + getContainerIpAddress() + ":" + getEtcdClientPort() + "/clusters/" + clusterName;
+ return "etcd://" + getHost() + ":" + getEtcdClientPort() + "/clusters/" + clusterName;
}
public String getInternalServiceUri() {
@@ -113,7 +113,7 @@ public class EtcdContainer extends GenericContainer<EtcdContainer> {
}
public String getClientEndpoint() {
- return String.format("http://%s:%d", getContainerIpAddress(), getEtcdClientPort());
+ return String.format("http://%s:%d", getHost(), getEtcdClientPort());
}
private WaitStrategy waitStrategy() {
diff --git a/pom.xml b/pom.xml
index a46ffaeaf8..8efb42dcdd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,7 +171,7 @@
<snakeyaml.version>1.33</snakeyaml.version>
<spotbugs-annotations.version>4.6.0</spotbugs-annotations.version>
<javax-annotations-api.version>1.3.2</javax-annotations-api.version>
- <testcontainers.version>1.15.1</testcontainers.version>
+ <testcontainers.version>1.17.6</testcontainers.version>
<vertx.version>4.3.8</vertx.version>
<zookeeper.version>3.8.1</zookeeper.version>
<snappy.version>1.1.7.7</snappy.version>
diff --git a/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/BookieContainer.java b/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/BookieContainer.java
index 9e430e0fa0..4ba5c987ba 100644
--- a/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/BookieContainer.java
+++ b/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/BookieContainer.java
@@ -61,7 +61,7 @@ public class BookieContainer<SelfT extends BookieContainer<SelfT>> extends Chaos
}
public String getExternalGrpcEndpointStr() {
- return getContainerIpAddress() + ":" + getMappedPort(BOOKIE_GRPC_PORT);
+ return getHost() + ":" + getMappedPort(BOOKIE_GRPC_PORT);
}
public String getInternalGrpcEndpointStr() {
diff --git a/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/ZKContainer.java b/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/ZKContainer.java
index c417b03199..08767fec82 100644
--- a/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/ZKContainer.java
+++ b/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/ZKContainer.java
@@ -43,7 +43,7 @@ public class ZKContainer<SelfT extends ZKContainer<SelfT>> extends MetadataStore
@Override
public String getExternalServiceUri() {
- return "zk://" + getContainerIpAddress() + ":" + getMappedPort(ZK_PORT) + "/ledgers";
+ return "zk://" + getHost() + ":" + getMappedPort(ZK_PORT) + "/ledgers";
}
@Override
diff --git a/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/wait/HttpWaitStrategy.java b/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/wait/HttpWaitStrategy.java
index f41fb3870a..fbbf7c5e95 100644
--- a/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/wait/HttpWaitStrategy.java
+++ b/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/wait/HttpWaitStrategy.java
@@ -174,7 +174,7 @@ public class HttpWaitStrategy extends AbstractWaitStrategy {
*/
private URI buildLivenessUri(int livenessCheckPort) {
final String scheme = (tlsEnabled ? "https" : "http") + "://";
- final String host = waitStrategyTarget.getContainerIpAddress();
+ final String host = waitStrategyTarget.getHost();
final String portSuffix;
if ((tlsEnabled && 443 == livenessCheckPort) || (!tlsEnabled && 80 == livenessCheckPort)) {
portSuffix = "";