Skip to content

Commit 3f35a26

Browse files
committed
refactor(deprecation): updated addFileSystemBind to withCopyToContainer
1 parent e7828a2 commit 3f35a26

File tree

3 files changed

+13
-19
lines changed

3 files changed

+13
-19
lines changed

testcontainers/src/main/java/com/datastax/oss/cdc/PulsarDualNodeTests.java

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,7 @@
1919
import com.datastax.testcontainers.PulsarContainer;
2020
import com.datastax.testcontainers.cassandra.CassandraContainer;
2121
import lombok.extern.slf4j.Slf4j;
22-
import org.apache.pulsar.client.api.Consumer;
23-
import org.apache.pulsar.client.api.Message;
24-
import org.apache.pulsar.client.api.PulsarClient;
25-
import org.apache.pulsar.client.api.Schema;
26-
import org.apache.pulsar.client.api.SubscriptionInitialPosition;
27-
import org.apache.pulsar.client.api.SubscriptionMode;
28-
import org.apache.pulsar.client.api.SubscriptionType;
22+
import org.apache.pulsar.client.api.*;
2923
import org.apache.pulsar.client.api.schema.GenericRecord;
3024
import org.apache.pulsar.client.api.schema.RecordSchemaBuilder;
3125
import org.apache.pulsar.client.api.schema.SchemaBuilder;
@@ -39,14 +33,11 @@
3933
import org.junit.jupiter.api.Test;
4034
import org.testcontainers.containers.Container;
4135
import org.testcontainers.containers.Network;
36+
import org.testcontainers.images.builder.Transferable;
4237

4338
import java.io.IOException;
4439
import java.time.Duration;
45-
import java.util.ArrayList;
46-
import java.util.HashMap;
47-
import java.util.List;
48-
import java.util.Map;
49-
import java.util.UUID;
40+
import java.util.*;
5041
import java.util.concurrent.TimeUnit;
5142
import java.util.stream.Collectors;
5243

@@ -229,10 +220,12 @@ public void testUnorderedMutations() throws InterruptedException, IOException {
229220
String pulsarServiceUrl = "pulsar://pulsar:" + pulsarContainer.BROKER_PORT;
230221
Long testId = Math.abs(AgentTestUtil.random.nextLong());
231222
String randomDataDir = System.getProperty("buildDir") + "/data-" + testId + "-";
232-
try (CassandraContainer<?> cassandraContainer1 = createCassandraContainer(1, pulsarServiceUrl, testNetwork)
233-
.withFileSystemBind(randomDataDir + "1", "/var/lib/cassandra");
234-
CassandraContainer<?> cassandraContainer2 = createCassandraContainer(2, pulsarServiceUrl, testNetwork)
235-
.withFileSystemBind(randomDataDir + "2", "/var/lib/cassandra")) {
223+
try (
224+
CassandraContainer<?> cassandraContainer1 = createCassandraContainer(1, pulsarServiceUrl, testNetwork)
225+
.withCopyToContainer(Transferable.of(randomDataDir + "1"), "/var/lib/cassandra");
226+
CassandraContainer<?> cassandraContainer2 = createCassandraContainer(2, pulsarServiceUrl, testNetwork)
227+
.withCopyToContainer(Transferable.of(randomDataDir + "2"), "/var/lib/cassandra")
228+
) {
236229
cassandraContainer1.start();
237230
cassandraContainer2.start();
238231

testcontainers/src/main/java/com/datastax/testcontainers/ChaosNetworkContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class ChaosNetworkContainer<SELF extends ChaosNetworkContainer<SELF>> ext
3535
public ChaosNetworkContainer(String targetContainer, String pause) {
3636
super(PUMBA_IMAGE);
3737
setCommand("--log-level debug netem --tc-image gaiadocker/iproute2 --duration " + pause + " loss --percent 100 " + targetContainer);
38-
addFileSystemBind("/var/run/docker.sock", "/var/run/docker.sock", BindMode.READ_WRITE);
38+
withFileSystemBind("/var/run/docker.sock", "/var/run/docker.sock", BindMode.READ_WRITE);
3939
setWaitStrategy(Wait.forLogMessage(".*tc container created.*", 1));
4040
withLogConsumer(o -> {
4141
final String line = o.getUtf8String();

testcontainers/src/main/java/com/datastax/testcontainers/cassandra/CassandraContainer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.testcontainers.delegate.DatabaseDelegate;
3131
import org.testcontainers.ext.ScriptUtils;
3232
import org.testcontainers.ext.ScriptUtils.ScriptLoadException;
33+
import org.testcontainers.images.builder.Transferable;
3334
import org.testcontainers.utility.DockerImageName;
3435
import org.testcontainers.utility.MountableFile;
3536

@@ -288,8 +289,8 @@ public static CassandraContainer<?> createCassandraContainerWithAgent(DockerImag
288289
.withCreateContainerCmdModifier(c -> c.withName("cassandra-" + nodeIndex))
289290
.withNetwork(network)
290291
.withConfigurationOverride(configLocation)
291-
.withFileSystemBind(
292-
String.format(Locale.ROOT, "%s/libs/%s", agentBuildDir, jarFile),
292+
.withCopyToContainer(
293+
Transferable.of(String.format(Locale.ROOT, "%s/libs/%s", agentBuildDir, jarFile)),
293294
String.format(Locale.ROOT, "/%s", jarFile))
294295
.withEnv("JVM_EXTRA_OPTS", String.format(Locale.ROOT,
295296
"-javaagent:/%s=%s -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=" +

0 commit comments

Comments
 (0)