Skip to content

feat(testcontainers): refactor vshard and cartridge containers #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Alex-pvl wants to merge 3 commits into
base: master
Choose a base branch
from
Open

feat(testcontainers): refactor vshard and cartridge containers #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
519dbbe
feat(testcontainers): refactor vshard and cartridge containers
Alex-pvl Mar 4, 2026
81234ce
feat(testcontainers): edit crud_aux.lua
Alex-pvl Mar 4, 2026
8e032bb
feat(testcontainers): edit vshard
Alex-pvl Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import com.fasterxml.jackson.core.type.TypeReference;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
Expand All @@ -45,10 +44,12 @@
import org.junit.jupiter.params.provider.MethodSource;
import org.msgpack.value.ValueFactory;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.ClusterContainer;
import org.testcontainers.containers.Network;
import org.testcontainers.containers.TarantoolCartridgeContainer;
import org.testcontainers.containers.TarantoolContainerOperations;
import org.testcontainers.containers.VshardClusterContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
import org.testcontainers.junit.jupiter.Testcontainers;

import static io.tarantool.client.crud.ConditionOperator.EQ;
Expand Down Expand Up @@ -86,7 +87,6 @@
import io.tarantool.pool.IProtoClientPool;
import io.tarantool.pool.InstanceConnectionGroup;

@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
@Timeout(value = 10)
@Testcontainers
public class TarantoolCrudClientTest extends BaseTest {
Expand All @@ -103,7 +103,8 @@ public class TarantoolCrudClientTest extends BaseTest {
public static final Person STUB_PERSON = new Person(0, true, String.valueOf(0));
private static TarantoolCartridgeContainer cartridgeContainer;
private static VshardClusterContainer vshardClusterContainer;
private static TarantoolContainerOperations clusterContainer;
private static ClusterContainer clusterContainer;
private static final Network NETWORK = Network.newNetwork();
public static final String ROUTER_1 = "ROUTER_1";
public static final String ROUTER_2 = "ROUTER_2";
private static TarantoolCrudClient client;
Expand Down Expand Up @@ -133,16 +134,19 @@ public static void setUp() throws Exception {
if (!isCartridgeAvailable()) {
vshardClusterContainer =
new VshardClusterContainer(
"vshard_cluster/Dockerfile",
dockerRegistry + "vshard-cluster-java",
"vshard_cluster/instances.yaml",
"vshard_cluster/config.yaml",
"tarantool/tarantool");
"vshard_cluster/Dockerfile",
dockerRegistry + "vshard-cluster-java",
"vshard_cluster/instances.yaml",
"vshard_cluster/config.yaml",
"tarantool/tarantool")
.withNetwork(NETWORK)
.withWaitingStrategy(new HostPortWaitStrategy().forPorts(3301));

if (!vshardClusterContainer.isRunning()) {
vshardClusterContainer
.withCreateContainerCmdModifier(cmd -> cmd.withUser("root"))
.withPrivilegedMode(true);
.withPrivilegedMode(true)
.withStartupTimeout(Duration.ofMinutes(5));
vshardClusterContainer.start();
}
clusterContainer = vshardClusterContainer;
Expand Down
2 changes: 0 additions & 2 deletions ...lient/src/test/java/io/tarantool/client/integration/TarantoolCrudClientWithRetryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
Expand All @@ -36,7 +35,6 @@
import io.tarantool.core.exceptions.BoxError;
import io.tarantool.mapping.Tuple;

@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
@Timeout(value = 5)
@Testcontainers
public class TarantoolCrudClientWithRetryTest {
Expand Down
3 changes: 3 additions & 0 deletions tarantool-shared-resources/cartridge/app/api/crud_aux.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ local crud_methods_to_patch = {
'update',
'upsert',
'insert_many',
'insert_object_many',
'replace_many',
'replace_object_many',
'upsert_many',
'upsert_object_many',
'truncate',
'count',
'len',
Expand Down
2 changes: 1 addition & 1 deletion tarantool-shared-resources/vshard_cluster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ COPY "cluster" "$TARANTOOL_WORKDIR"

# install dependencies
RUN apt-get -y update && \
apt-get -y install build-essential cmake make gcc git unzip cartridge-cli && \
apt-get -y install build-essential cmake make gcc git unzip && \
apt-get -y clean

CMD tt init && tt build && tt start && sleep infinity
3 changes: 3 additions & 0 deletions tarantool-shared-resources/vshard_cluster/crud_aux.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ local crud_methods_to_patch = {
'update',
'upsert',
'insert_many',
'insert_object_many',
'replace_many',
'replace_object_many',
'upsert_many',
'upsert_object_many',
'truncate',
'count',
'len',
Expand Down
26 changes: 16 additions & 10 deletions ...ing-data-27/src/test/java/io/tarantool/spring/data27/integration/BaseIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,26 @@

import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Timeout;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.ClusterContainer;
import org.testcontainers.containers.Network;
import org.testcontainers.containers.TarantoolCartridgeContainer;
import org.testcontainers.containers.TarantoolContainerOperations;
import org.testcontainers.containers.VshardClusterContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;

import static io.tarantool.spring.data.utils.Constants.DEFAULT_PROPERTY_FILE_NAME;
import static io.tarantool.spring.data27.utils.TarantoolTestSupport.DEFAULT_TEST_PROPERTY_DIR;
import static io.tarantool.spring.data27.utils.TarantoolTestSupport.writeTestPropertiesYaml;
import io.tarantool.spring.data27.config.properties.TarantoolProperties;

@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
@Timeout(60)
public abstract class BaseIntegrationTest {

protected static TarantoolContainerOperations<?> clusterContainer;
protected static ClusterContainer clusterContainer;

private static final Network NETWORK = Network.newNetwork();

private static final String dockerRegistry =
System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "");
Expand All @@ -43,14 +45,18 @@ private static void configureContainer() {
if (!isCartridgeAvailable()) {
VshardClusterContainer vshardClusterContainer =
new VshardClusterContainer(
"vshard_cluster/Dockerfile",
dockerRegistry + "vshard-cluster-java",
"vshard_cluster/instances.yaml",
"vshard_cluster/config.yaml",
"tarantool/tarantool");
"vshard_cluster/Dockerfile",
dockerRegistry + "vshard-cluster-java",
"vshard_cluster/instances.yaml",
"vshard_cluster/config.yaml",
"tarantool/tarantool")
.withNetwork(NETWORK)
.withWaitingStrategy(new HostPortWaitStrategy().forPorts(3301));

if (!vshardClusterContainer.isRunning()) {
vshardClusterContainer.withPrivilegedMode(true);
vshardClusterContainer
.withPrivilegedMode(true)
.withStartupTimeout(Duration.ofMinutes(5));
vshardClusterContainer.start();
}
clusterContainer = vshardClusterContainer;
Expand Down
2 changes: 0 additions & 2 deletions ...data-27/src/test/java/io/tarantool/spring/data27/integration/crud/CrudConfigurations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
Expand All @@ -34,7 +33,6 @@
import io.tarantool.spring.data27.integration.BaseIntegrationTest;
import io.tarantool.spring.data27.repository.config.EnableTarantoolRepositories;

@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
@TestPropertySource(properties = {DEFAULT_PROPERTY_FILE_LOCATION_CLASSPATH})
abstract class CrudConfigurations extends BaseIntegrationTest {

Expand Down
26 changes: 16 additions & 10 deletions ...ing-data-31/src/test/java/io/tarantool/spring/data31/integration/BaseIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,26 @@

import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Timeout;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.ClusterContainer;
import org.testcontainers.containers.Network;
import org.testcontainers.containers.TarantoolCartridgeContainer;
import org.testcontainers.containers.TarantoolContainerOperations;
import org.testcontainers.containers.VshardClusterContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;

import static io.tarantool.spring.data.utils.Constants.DEFAULT_PROPERTY_FILE_NAME;
import static io.tarantool.spring.data31.utils.TarantoolTestSupport.DEFAULT_TEST_PROPERTY_DIR;
import static io.tarantool.spring.data31.utils.TarantoolTestSupport.writeTestPropertiesYaml;
import io.tarantool.spring.data31.config.properties.TarantoolProperties;

@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
@Timeout(60)
public abstract class BaseIntegrationTest {

protected static TarantoolContainerOperations<?> clusterContainer;
protected static ClusterContainer clusterContainer;

private static final Network NETWORK = Network.newNetwork();

private static final String dockerRegistry =
System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "");
Expand All @@ -43,14 +45,18 @@ private static void configureContainer() {
if (!isCartridgeAvailable()) {
VshardClusterContainer vshardClusterContainer =
new VshardClusterContainer(
"vshard_cluster/Dockerfile",
dockerRegistry + "vshard-cluster-java",
"vshard_cluster/instances.yaml",
"vshard_cluster/config.yaml",
"tarantool/tarantool");
"vshard_cluster/Dockerfile",
dockerRegistry + "vshard-cluster-java",
"vshard_cluster/instances.yaml",
"vshard_cluster/config.yaml",
"tarantool/tarantool")
.withNetwork(NETWORK)
.withWaitingStrategy(new HostPortWaitStrategy().forPorts(3301));

if (!vshardClusterContainer.isRunning()) {
vshardClusterContainer.withPrivilegedMode(true);
vshardClusterContainer
.withPrivilegedMode(true)
.withStartupTimeout(Duration.ofMinutes(5));
vshardClusterContainer.start();
}
clusterContainer = vshardClusterContainer;
Expand Down
2 changes: 0 additions & 2 deletions ...data-31/src/test/java/io/tarantool/spring/data31/integration/crud/CrudConfigurations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
Expand All @@ -34,7 +33,6 @@
import io.tarantool.spring.data31.integration.BaseIntegrationTest;
import io.tarantool.spring.data31.repository.config.EnableTarantoolRepositories;

@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
@TestPropertySource(properties = {DEFAULT_PROPERTY_FILE_LOCATION_CLASSPATH})
abstract class CrudConfigurations extends BaseIntegrationTest {

Expand Down
26 changes: 16 additions & 10 deletions ...ing-data-32/src/test/java/io/tarantool/spring/data32/integration/BaseIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,26 @@

import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Timeout;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.ClusterContainer;
import org.testcontainers.containers.Network;
import org.testcontainers.containers.TarantoolCartridgeContainer;
import org.testcontainers.containers.TarantoolContainerOperations;
import org.testcontainers.containers.VshardClusterContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;

import static io.tarantool.spring.data.utils.Constants.DEFAULT_PROPERTY_FILE_NAME;
import static io.tarantool.spring.data32.utils.TarantoolTestSupport.DEFAULT_TEST_PROPERTY_DIR;
import static io.tarantool.spring.data32.utils.TarantoolTestSupport.writeTestPropertiesYaml;
import io.tarantool.spring.data32.config.properties.TarantoolProperties;

@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
@Timeout(60)
public abstract class BaseIntegrationTest {

protected static TarantoolContainerOperations<?> clusterContainer;
protected static ClusterContainer clusterContainer;

private static final Network NETWORK = Network.newNetwork();

private static final String dockerRegistry =
System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "");
Expand All @@ -43,14 +45,18 @@ private static void configureContainer() {
if (!isCartridgeAvailable()) {
VshardClusterContainer vshardClusterContainer =
new VshardClusterContainer(
"vshard_cluster/Dockerfile",
dockerRegistry + "vshard-cluster-java",
"vshard_cluster/instances.yaml",
"vshard_cluster/config.yaml",
"tarantool/tarantool");
"vshard_cluster/Dockerfile",
dockerRegistry + "vshard-cluster-java",
"vshard_cluster/instances.yaml",
"vshard_cluster/config.yaml",
"tarantool/tarantool")
.withNetwork(NETWORK)
.withWaitingStrategy(new HostPortWaitStrategy().forPorts(3301));

if (!vshardClusterContainer.isRunning()) {
vshardClusterContainer.withPrivilegedMode(true);
vshardClusterContainer
.withPrivilegedMode(true)
.withStartupTimeout(Duration.ofMinutes(5));
vshardClusterContainer.start();
}
clusterContainer = vshardClusterContainer;
Expand Down
2 changes: 0 additions & 2 deletions ...data-32/src/test/java/io/tarantool/spring/data32/integration/crud/CrudConfigurations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
Expand All @@ -34,7 +33,6 @@
import io.tarantool.spring.data32.integration.BaseIntegrationTest;
import io.tarantool.spring.data32.repository.config.EnableTarantoolRepositories;

@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
@TestPropertySource(properties = {DEFAULT_PROPERTY_FILE_LOCATION_CLASSPATH})
abstract class CrudConfigurations extends BaseIntegrationTest {

Expand Down
26 changes: 16 additions & 10 deletions ...ing-data-33/src/test/java/io/tarantool/spring/data33/integration/BaseIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,26 @@

import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Timeout;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.ClusterContainer;
import org.testcontainers.containers.Network;
import org.testcontainers.containers.TarantoolCartridgeContainer;
import org.testcontainers.containers.TarantoolContainerOperations;
import org.testcontainers.containers.VshardClusterContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;

import static io.tarantool.spring.data.utils.Constants.DEFAULT_PROPERTY_FILE_NAME;
import static io.tarantool.spring.data33.utils.TarantoolTestSupport.DEFAULT_TEST_PROPERTY_DIR;
import static io.tarantool.spring.data33.utils.TarantoolTestSupport.writeTestPropertiesYaml;
import io.tarantool.spring.data33.config.properties.TarantoolProperties;

@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
@Timeout(60)
public abstract class BaseIntegrationTest {

protected static TarantoolContainerOperations<?> clusterContainer;
protected static ClusterContainer clusterContainer;

private static final Network NETWORK = Network.newNetwork();

private static final String dockerRegistry =
System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "");
Expand All @@ -43,14 +45,18 @@ private static void configureContainer() {
if (!isCartridgeAvailable()) {
VshardClusterContainer vshardClusterContainer =
new VshardClusterContainer(
"vshard_cluster/Dockerfile",
dockerRegistry + "vshard-cluster-java",
"vshard_cluster/instances.yaml",
"vshard_cluster/config.yaml",
"tarantool/tarantool");
"vshard_cluster/Dockerfile",
dockerRegistry + "vshard-cluster-java",
"vshard_cluster/instances.yaml",
"vshard_cluster/config.yaml",
"tarantool/tarantool")
.withNetwork(NETWORK)
.withWaitingStrategy(new HostPortWaitStrategy().forPorts(3301));

if (!vshardClusterContainer.isRunning()) {
vshardClusterContainer.withPrivilegedMode(true);
vshardClusterContainer
.withPrivilegedMode(true)
.withStartupTimeout(Duration.ofMinutes(5));
vshardClusterContainer.start();
}
clusterContainer = vshardClusterContainer;
Expand Down
Loading
Loading