feat(testcontainers): fix after review

Alex-pvl · Alex-pvl · commit ff598a9bccff · 2026-04-06T08:51:02.000+03:00
diff --git a/tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientTest.java b/tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientTest.java
@@ -44,9 +44,9 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.msgpack.value.ValueFactory;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.CartridgeClusterContainer;
-import org.testcontainers.containers.ClusterContainer;
-import org.testcontainers.containers.VshardClusterContainer;
+import org.testcontainers.containers.cluster.ClusterContainer;
+import org.testcontainers.containers.cluster.cartridge.CartridgeClusterContainer;
+import org.testcontainers.containers.cluster.vshard.VshardClusterContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
diff --git a/tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientWithRetryTest.java b/tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientWithRetryTest.java
@@ -25,7 +25,7 @@
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.CartridgeClusterContainer;
+import org.testcontainers.containers.cluster.cartridge.CartridgeClusterContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
diff --git a/tarantool-spring-data/tarantool-spring-data-27/src/test/java/io/tarantool/spring/data27/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-27/src/test/java/io/tarantool/spring/data27/integration/BaseIntegrationTest.java
@@ -13,9 +13,9 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.CartridgeClusterContainer;
-import org.testcontainers.containers.ClusterContainer;
-import org.testcontainers.containers.VshardClusterContainer;
+import org.testcontainers.containers.cluster.ClusterContainer;
+import org.testcontainers.containers.cluster.cartridge.CartridgeClusterContainer;
+import org.testcontainers.containers.cluster.vshard.VshardClusterContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 
 import static io.tarantool.spring.data.utils.Constants.DEFAULT_PROPERTY_FILE_NAME;
diff --git a/tarantool-spring-data/tarantool-spring-data-31/src/test/java/io/tarantool/spring/data31/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-31/src/test/java/io/tarantool/spring/data31/integration/BaseIntegrationTest.java
@@ -13,9 +13,9 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.CartridgeClusterContainer;
-import org.testcontainers.containers.ClusterContainer;
-import org.testcontainers.containers.VshardClusterContainer;
+import org.testcontainers.containers.cluster.ClusterContainer;
+import org.testcontainers.containers.cluster.cartridge.CartridgeClusterContainer;
+import org.testcontainers.containers.cluster.vshard.VshardClusterContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 
 import static io.tarantool.spring.data.utils.Constants.DEFAULT_PROPERTY_FILE_NAME;
diff --git a/tarantool-spring-data/tarantool-spring-data-32/src/test/java/io/tarantool/spring/data32/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-32/src/test/java/io/tarantool/spring/data32/integration/BaseIntegrationTest.java
@@ -13,9 +13,9 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.CartridgeClusterContainer;
-import org.testcontainers.containers.ClusterContainer;
-import org.testcontainers.containers.VshardClusterContainer;
+import org.testcontainers.containers.cluster.ClusterContainer;
+import org.testcontainers.containers.cluster.cartridge.CartridgeClusterContainer;
+import org.testcontainers.containers.cluster.vshard.VshardClusterContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 
 import static io.tarantool.spring.data.utils.Constants.DEFAULT_PROPERTY_FILE_NAME;
diff --git a/tarantool-spring-data/tarantool-spring-data-33/src/test/java/io/tarantool/spring/data33/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-33/src/test/java/io/tarantool/spring/data33/integration/BaseIntegrationTest.java
@@ -13,9 +13,9 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.CartridgeClusterContainer;
-import org.testcontainers.containers.ClusterContainer;
-import org.testcontainers.containers.VshardClusterContainer;
+import org.testcontainers.containers.cluster.ClusterContainer;
+import org.testcontainers.containers.cluster.cartridge.CartridgeClusterContainer;
+import org.testcontainers.containers.cluster.vshard.VshardClusterContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 
 import static io.tarantool.spring.data.utils.Constants.DEFAULT_PROPERTY_FILE_NAME;
diff --git a/tarantool-spring-data/tarantool-spring-data-34/src/test/java/io/tarantool/spring/data34/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-34/src/test/java/io/tarantool/spring/data34/integration/BaseIntegrationTest.java
@@ -13,9 +13,9 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.CartridgeClusterContainer;
-import org.testcontainers.containers.ClusterContainer;
-import org.testcontainers.containers.VshardClusterContainer;
+import org.testcontainers.containers.cluster.ClusterContainer;
+import org.testcontainers.containers.cluster.cartridge.CartridgeClusterContainer;
+import org.testcontainers.containers.cluster.vshard.VshardClusterContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 
 import static io.tarantool.spring.data.utils.Constants.DEFAULT_PROPERTY_FILE_NAME;
diff --git a/tarantool-spring-data/tarantool-spring-data-35/src/test/java/io/tarantool/spring/data35/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-35/src/test/java/io/tarantool/spring/data35/integration/BaseIntegrationTest.java
@@ -13,9 +13,9 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.CartridgeClusterContainer;
-import org.testcontainers.containers.ClusterContainer;
-import org.testcontainers.containers.VshardClusterContainer;
+import org.testcontainers.containers.cluster.ClusterContainer;
+import org.testcontainers.containers.cluster.cartridge.CartridgeClusterContainer;
+import org.testcontainers.containers.cluster.vshard.VshardClusterContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 
 import static io.tarantool.spring.data.utils.Constants.DEFAULT_PROPERTY_FILE_NAME;
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/TarantoolConfigParser.java b/testcontainers/src/main/java/org/testcontainers/containers/TarantoolConfigParser.java
@@ -5,53 +5,148 @@
 
 package org.testcontainers.containers;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
+import java.util.Objects;
+import java.util.Optional;
 
-import org.yaml.snakeyaml.LoaderOptions;
+import org.testcontainers.containers.tarantool.config.ConfigurationUtils;
 import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.constructor.Constructor;
 
-class TarantoolConfigParser {
+import io.tarantool.autogen.Tarantool3Configuration;
+import io.tarantool.autogen.groups.groupsProperty.GroupsProperty;
+import io.tarantool.autogen.groups.groupsProperty.replicasets.replicasetsProperty.ReplicasetsProperty;
+import io.tarantool.autogen.groups.groupsProperty.replicasets.replicasetsProperty.instances.instancesProperty.InstancesProperty;
+import io.tarantool.autogen.groups.groupsProperty.replicasets.replicasetsProperty.instances.instancesProperty.iproto.Iproto;
+import io.tarantool.autogen.groups.groupsProperty.replicasets.replicasetsProperty.instances.instancesProperty.iproto.listen.Listen;
 
-  private final Config config;
+public class TarantoolConfigParser {
+
+  private static final String ROUTERS_GROUP_NAME = "routers";
+
+  private final Tarantool3Configuration config;
+  private final Config fallbackConfig;
 
   public TarantoolConfigParser(String instanceFileName) {
-    Yaml yaml = new Yaml(new Constructor(Config.class, new LoaderOptions()));
-    InputStream inputStream =
-        this.getClass().getClassLoader().getResourceAsStream(instanceFileName);
-    config = yaml.load(inputStream);
+    InputStream inputStream = getClass().getClassLoader().getResourceAsStream(instanceFileName);
+    if (inputStream == null) {
+      throw new IllegalArgumentException(
+          String.format("No resource path found for the specified resource %s", instanceFileName));
+    }
+    Tarantool3Configuration parsedConfig = null;
+    Config parsedFallbackConfig = null;
+    try (InputStream is = inputStream) {
+      String rawConfig = readAsString(is);
+      try {
+        parsedConfig = ConfigurationUtils.create(rawConfig);
+      } catch (LinkageError e) {
+        parsedFallbackConfig = new Yaml().loadAs(rawConfig, Config.class);
+      }
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+    this.config = parsedConfig;
+    this.fallbackConfig = parsedFallbackConfig;
   }
 
   public Integer[] getExposablePorts() {
+    if (config != null) {
+      return getExposablePortsFromTypedConfig();
+    }
+    return getExposablePortsFromFallbackConfig();
+  }
+
+  private Integer[] getExposablePortsFromTypedConfig() {
+    if (config.getGroups().isEmpty()) {
+      return new Integer[] {};
+    }
+    GroupsProperty routersGroup =
+        config.getGroups().get().getAdditionalProperties().get(ROUTERS_GROUP_NAME);
+    if (routersGroup == null || !routersGroup.getReplicasets().isPresent()) {
+      return new Integer[] {};
+    }
     List<Integer> ports =
-        config.getGroups().get("routers").getReplicasets().values().stream()
-            .map(replicaset -> replicaset.getInstances().values())
+        routersGroup.getReplicasets().get().getAdditionalProperties().values().stream()
+            .map(ReplicasetsProperty::getInstances)
+            .filter(Optional::isPresent)
+            .map(Optional::get)
+            .map(instances -> instances.getAdditionalProperties().values())
             .flatMap(Collection::stream)
-            .map(instance -> instance.getIproto().values())
+            .map(InstancesProperty::getIproto)
+            .filter(Optional::isPresent)
+            .map(Optional::get)
+            .map(Iproto::getListen)
+            .filter(Optional::isPresent)
+            .map(Optional::get)
+            .flatMap(List::stream)
+            .map(Listen::getUri)
+            .filter(Optional::isPresent)
+            .map(Optional::get)
+            .map(TarantoolConfigParser::parsePort)
+            .toList();
+
+    return ports.toArray(new Integer[] {});
+  }
+
+  private Integer[] getExposablePortsFromFallbackConfig() {
+    if (fallbackConfig == null
+        || fallbackConfig.getGroups() == null
+        || !fallbackConfig.getGroups().containsKey(ROUTERS_GROUP_NAME)) {
+      return new Integer[] {};
+    }
+    Group routersGroup = fallbackConfig.getGroups().get(ROUTERS_GROUP_NAME);
+    if (routersGroup == null || routersGroup.getReplicasets() == null) {
+      return new Integer[] {};
+    }
+    List<Integer> ports =
+        routersGroup.getReplicasets().values().stream()
+            .map(Replicaset::getInstances)
+            .filter(Objects::nonNull)
+            .map(Map::values)
+            .flatMap(Collection::stream)
+            .map(Instance::getIproto)
+            .filter(Objects::nonNull)
+            .map(Map::values)
             .flatMap(Collection::stream)
             .flatMap(Collection::stream)
             .map(Map::values)
             .flatMap(Collection::stream)
             .map(TarantoolConfigParser::parsePort)
-            .collect(Collectors.toList());
-
+            .toList();
     return ports.toArray(new Integer[] {});
   }
 
   private static Integer parsePort(String uri) {
-    if (uri == null || uri.isEmpty()) {
+    if (uri == null || uri.isBlank()) {
       throw new IllegalArgumentException("Listen URI must not be null or empty");
     }
-
     String normalized = uri.trim();
-    int lastColon = normalized.lastIndexOf(':');
-    if (lastColon >= 0) {
-      normalized = normalized.substring(lastColon + 1);
+    String uriWithScheme = normalized.contains("://") ? normalized : "tcp://" + normalized;
+    try {
+      URI parsed = URI.create(uriWithScheme);
+      int port = parsed.getPort();
+      if (port < 0) {
+        throw new IllegalArgumentException("Listen URI must contain a valid port: " + uri);
+      }
+      return port;
+    } catch (IllegalArgumentException e) {
+      throw new IllegalArgumentException("Failed to parse listen URI: " + uri, e);
+    }
+  }
+
+  private static String readAsString(InputStream inputStream) throws IOException {
+    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+    byte[] buffer = new byte[8192];
+    int bytesRead;
+    while ((bytesRead = inputStream.read(buffer)) != -1) {
+      outputStream.write(buffer, 0, bytesRead);
     }
-    return Integer.parseInt(normalized);
+    return outputStream.toString(StandardCharsets.UTF_8);
   }
 }
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/cluster/ClusterConfigurator.java b/testcontainers/src/main/java/org/testcontainers/containers/cluster/ClusterConfigurator.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 VK DIGITAL TECHNOLOGIES LIMITED LIABILITY COMPANY
+ * All Rights Reserved.
+ */
+
+package org.testcontainers.containers.cluster;
+
+import java.util.Map;
+
+/**
+ * Common configurator contract for single-router test clusters.
+ *
+ * @param <C> cluster container type
+ */
+public interface ClusterConfigurator<C extends ClusterContainer<?>> extends AutoCloseable {
+
+  /** Returns cluster name. */
+  String clusterName();
+
+  /** Returns all cluster nodes participating in configuration. */
+  Map<String, C> nodes();
+
+  /** Applies cluster-specific configuration after container startup. */
+  void configure();
+
+  /** Returns true if configuration was already applied for current lifecycle. */
+  boolean configured();
+
+  @Override
+  default void close() {}
+}
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/cluster/ClusterContainer.java b/testcontainers/src/main/java/org/testcontainers/containers/cluster/ClusterContainer.java
@@ -3,14 +3,36 @@
  * All Rights Reserved.
  */
 
-package org.testcontainers.containers;
+package org.testcontainers.containers.cluster;
+
+import java.util.Map;
+
+import org.testcontainers.containers.Container;
 
 /**
  * Common interface for Tarantool cluster containers (vshard-based and cartridge-based). Provides
  * access to the router endpoint and command execution.
  */
 public interface ClusterContainer<T extends Container<T>> extends Container<T> {
 
+  /** Returns cluster configurator used for post-startup cluster setup. */
+  ClusterConfigurator<? extends ClusterContainer<?>> getConfigurator();
+
+  /** Returns configured cluster name. */
+  default String clusterName() {
+    return getConfigurator().clusterName();
+  }
+
+  /** Returns all nodes handled by the configurator. */
+  default Map<String, ? extends ClusterContainer<?>> nodes() {
+    return getConfigurator().nodes();
+  }
+
+  /** Returns true if cluster topology was configured. */
+  default boolean configured() {
+    return getConfigurator().configured();
+  }
+
   /**
    * Get the router host.
    *
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/cluster/cartridge/CartridgeClusterConfigurator.java b/testcontainers/src/main/java/org/testcontainers/containers/cluster/cartridge/CartridgeClusterConfigurator.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2025 VK DIGITAL TECHNOLOGIES LIMITED LIABILITY COMPANY
+ * All Rights Reserved.
+ */
+
+package org.testcontainers.containers.cluster.cartridge;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.testcontainers.containers.cluster.ClusterConfigurator;
+
+/** Configures a cartridge-based cluster after container startup. */
+public class CartridgeClusterConfigurator
+    implements ClusterConfigurator<CartridgeClusterContainer> {
+
+  public static final String DEFAULT_CLUSTER_NAME = "cartridge-cluster";
+  private static final String ROUTER_NODE_NAME = "router";
+
+  private final CartridgeClusterContainer container;
+  private final String clusterName;
+  private final AtomicBoolean configured;
+
+  public CartridgeClusterConfigurator(CartridgeClusterContainer container) {
+    this(container, DEFAULT_CLUSTER_NAME);
+  }
+
+  public CartridgeClusterConfigurator(CartridgeClusterContainer container, String clusterName) {
+    this.container = container;
+    this.clusterName = clusterName;
+    this.configured = new AtomicBoolean(false);
+  }
+
+  @Override
+  public String clusterName() {
+    return this.clusterName;
+  }
+
+  @Override
+  public Map<String, CartridgeClusterContainer> nodes() {
+    return Collections.singletonMap(ROUTER_NODE_NAME, this.container);
+  }
+
+  @Override
+  public void configure() {
+    this.container.waitUntilRouterIsUp(
+        CartridgeClusterContainer.TIMEOUT_ROUTER_UP_CARTRIDGE_HEALTH_IN_SECONDS);
+    this.container.retryingSetupTopology();
+    this.container.waitUntilCartridgeIsHealthy(
+        CartridgeClusterContainer.TIMEOUT_ROUTER_UP_CARTRIDGE_HEALTH_IN_SECONDS);
+    this.container.bootstrapVshard();
+    this.configured.set(true);
+  }
+
+  @Override
+  public boolean configured() {
+    return this.configured.get();
+  }
+}
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/cluster/cartridge/CartridgeClusterContainer.java b/testcontainers/src/main/java/org/testcontainers/containers/cluster/cartridge/CartridgeClusterContainer.java
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/cluster/vshard/VshardClusterConfigurator.java b/testcontainers/src/main/java/org/testcontainers/containers/cluster/vshard/VshardClusterConfigurator.java
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/cluster/vshard/VshardClusterContainer.java b/testcontainers/src/main/java/org/testcontainers/containers/cluster/vshard/VshardClusterContainer.java
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/utils/CartridgeConfigParser.java b/testcontainers/src/main/java/org/testcontainers/containers/utils/CartridgeConfigParser.java
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/utils/TarantoolContainerClientHelper.java b/testcontainers/src/main/java/org/testcontainers/containers/utils/TarantoolContainerClientHelper.java
diff --git a/testcontainers/src/test/java/org/testcontainers/containers/integration/vshard/VshardClusterContainerTest.java b/testcontainers/src/test/java/org/testcontainers/containers/integration/vshard/VshardClusterContainerTest.java
