Drop link in favor of networks

testcontainers · May 2, 2023 · 337e0c7 · 337e0c7
1 parent 196d180
commit 337e0c7
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 5 deletions.
diff --git a/core/src/main/java/org/testcontainers/containers/ComposeDelegate.java b/core/src/main/java/org/testcontainers/containers/ComposeDelegate.java
@@ -2,6 +2,7 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.api.model.Network;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
@@ -273,7 +274,29 @@ List<Container> listChildContainers() {
 
     void startAmbassadorContainer() {
         if (!this.ambassadorPortMappings.isEmpty()) {
+            //            if (this.composeVersion.equals(ComposeVersion.V2)) {
+            //                this.ambassadorContainer.withCreateContainerCmdModifier(createContainerCmd ->
+            //                    createContainerCmd.withNetworkMode(this.project + "_default")
+            //                );
+            //            }
             this.ambassadorContainer.start();
+            List<Container> containers = this.dockerClient.listContainersCmd().exec();
+            Set<String> networks = containers
+                .stream()
+                .filter(container ->
+                    Arrays.stream(container.getNames()).allMatch(name -> name.startsWith("/" + this.project))
+                )
+                .flatMap(container -> container.getNetworkSettings().getNetworks().keySet().stream())
+                .collect(Collectors.toSet());
+            for (String network : networks) {
+                Network networkContent = this.dockerClient.inspectNetworkCmd().withNetworkId(network).exec();
+                if (!networkContent.getContainers().containsKey(this.ambassadorContainer.getContainerId())) {
+                    this.dockerClient.connectToNetworkCmd()
+                        .withContainerId(this.ambassadorContainer.getContainerId())
+                        .withNetworkId(network)
+                        .exec();
+                }
+            }
         }
     }
 
@@ -311,11 +334,19 @@ public void withExposedService(String serviceName, int servicePort, @NonNull Wai
         ambassadorPortMappings
             .computeIfAbsent(serviceInstanceName, __ -> new ConcurrentHashMap<>())
             .put(servicePort, ambassadorPort);
-        ambassadorContainer.withTarget(ambassadorPort, serviceInstanceName, servicePort);
-        ambassadorContainer.addLink(
-            new FutureContainer(this.project + this.composeSeparator + serviceInstanceName),
-            serviceInstanceName
-        );
+        //        if (this.composeVersion.equals(ComposeVersion.V1)) {
+        //            this.ambassadorContainer.withTarget(ambassadorPort, serviceInstanceName, servicePort);
+        //            this.ambassadorContainer.addLink(
+        //                new FutureContainer(this.project + this.composeSeparator + serviceInstanceName),
+        //                serviceInstanceName
+        //            );
+        //        } else {
+        this.ambassadorContainer.withTarget(
+                ambassadorPort,
+                this.project + this.composeSeparator + serviceInstanceName,
+                servicePort
+            );
+        //        }
         addWaitStrategy(serviceInstanceName, waitStrategy);
     }
 

diff --git a/core/src/test/java/org/testcontainers/junit/ComposeServiceTest.java b/core/src/test/java/org/testcontainers/junit/ComposeServiceTest.java
@@ -0,0 +1,32 @@
+package org.testcontainers.junit;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.testcontainers.containers.ComposeContainer;
+
+import java.io.File;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ComposeServiceTest extends BaseComposeTest {
+
+    @Rule
+    public ComposeContainer environment = new ComposeContainer(new File("src/test/resources/compose-v2-test.yml"))
+        .withServices("redis")
+        .withExposedService("redis-1", REDIS_PORT);
+
+    @Override
+    protected ComposeContainer getEnvironment() {
+        return this.environment;
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testDbIsNotStarting() {
+        this.environment.getServicePort("db-1", 10001);
+    }
+
+    @Test
+    public void testRedisIsStarting() {
+        assertThat(this.environment.getServicePort("redis-1", REDIS_PORT)).as("Redis server started").isNotNull();
+    }
+}
diff --git a/core/src/test/resources/compose-v2-test.yml b/core/src/test/resources/compose-v2-test.yml
@@ -0,0 +1,7 @@
+services:
+  redis:
+    image: redis
+  db:
+    image: mysql:5.7.34
+    environment:
+      MYSQL_RANDOM_ROOT_PASSWORD: "true"