feat(testcontainers): edit vshard and cartridge

Author: Alex-pvl

pom.xml

@@ -396,9 +396,6 @@
                 <include>**/integration/**/*Crud*Test.java</include>
                 <include>**/crud/**/*Test.java</include>
               </includes>
-              <excludes>
-                <exclude>**/io/tarantool/spring/data*/integration/**/*Test.java</exclude>
-              </excludes>
               <argLine>@{argLine} -Xmx1024m</argLine>
             </configuration>
           </plugin>

testcontainers/src/main/java/org/testcontainers/containers/TarantoolCartridgeContainer.java

@@ -54,6 +54,11 @@ public class TarantoolCartridgeContainer extends GenericContainer<TarantoolCartr
   protected static final int TIMEOUT_ROUTER_UP_CARTRIDGE_HEALTH_IN_SECONDS = 60;
 
   private static final String TMP_DIR = "/tmp";
+  private static final String TARANTOOL_VERSION =
+      System.getenv().getOrDefault("TARANTOOL_VERSION", "2.11.8-ubuntu20.04");
+  private static final boolean IS_TARANTOOL2 = TARANTOOL_VERSION.startsWith("2.");
+  private static final String TT_COMMAND = IS_TARANTOOL2 ? "tarantoolctl" : "tt";
+  private static final String ECHO_COMMAND_TEMPLATE = "echo \"%s\" | %s connect %s:%s@localhost:%d";
 
   /**
    * Runs a Lua command inside the container by connecting via net.box and returns YAML-encoded
@@ -662,8 +667,14 @@ public ExecResult executeCommand(String command) {
         throw new IllegalStateException("Cannot execute commands in stopped container");
       }
       command = command.replace("\"", "\\\"").replace("\'", "\\\'");
-      String bashCommand =
-          String.format(COMMAND_TEMPLATE, routerPort, routerUsername, routerPassword, command);
+      String bashCommand;
+      if (IS_TARANTOOL2) {
+        bashCommand = String.format(COMMAND_TEMPLATE, routerPort, routerUsername, routerPassword, command);
+      } else {
+        bashCommand =
+            String.format(
+                ECHO_COMMAND_TEMPLATE, command, TT_COMMAND, routerUsername, routerPassword, routerPort);
+      }
       return execInContainer("sh", "-c", bashCommand);
     } catch (IOException | InterruptedException e) {
       throw new RuntimeException(e);

testcontainers/src/main/java/org/testcontainers/containers/VshardClusterContainer.java

@@ -52,7 +52,11 @@ public class VshardClusterContainer extends GenericContainer<VshardClusterContai
   protected static final int TIMEOUT_CRUD_HEALTH_IN_SECONDS = 60;
 
   private static final String TMP_DIR = "/tmp";
-  private static final String ECHO_COMMAND_TEMPLATE = "echo \"%s\" | tt connect %s:%s@localhost:%d";
+  private static final String TARANTOOL_VERSION =
+      System.getenv().getOrDefault("TARANTOOL_VERSION", "2.11.8-ubuntu20.04");
+  private static final String TT_COMMAND = TARANTOOL_VERSION.startsWith("2.") ? "tarantoolctl" : "tt";
+  private static final String ECHO_COMMAND_TEMPLATE =
+      "echo \"%s\" | %s connect %s:%s@localhost:%d";
 
   protected final String TARANTOOL_RUN_DIR;
   private final TarantoolConfigParser configParser;
@@ -340,6 +344,7 @@ protected boolean crudIsUp() {
               String.format(
                   ECHO_COMMAND_TEMPLATE,
                   "return require('crud')._VERSION",
+                  TT_COMMAND,
                   routerUsername,
                   routerPassword,
                   routerPort));
@@ -374,7 +379,8 @@ public ExecResult executeCommand(String command) {
       }
       command = command.replace("\"", "\\\"");
       String bashCommand =
-          String.format(ECHO_COMMAND_TEMPLATE, command, routerUsername, routerPassword, routerPort);
+          String.format(
+              ECHO_COMMAND_TEMPLATE, command, TT_COMMAND, routerUsername, routerPassword, routerPort);
       return execInContainer("/bin/sh", "-c", bashCommand);
     } catch (IOException | InterruptedException e) {
       throw new RuntimeException(e);