Remove cartridge-java from dependencies

- Update executeScript and executeCommand methods to execute code viva execInContainer
  (now it returns yaml string in Container.ExecResult not CompletableFuture).
- Remove TarantoolContainer containers with TarantoolClientBuilder parameter.
- Remove getClient method from TarantoolContainerClientHelper.
- Remove io.tarantool.cartridge-driver dependency.
  because cartridge-java client was also removed.
- Add executeScriptDecoded and executeCommandDecoded methods to return parsed yaml not string.
- Add withSsl and withKeyAndCertFiles methods to TarantoolContainer and TarantoolCartridgeContainer.
- Rewrite tests and add new cases to support new API.
- Update org.yaml.snakeyaml to 2.0 version.

Closes #69

Author: iDneprov

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## [Unreleased]
 - Fix problem if topology isn't applied correctly
+- Bump testcontainers to 1.18.0
+- Move rocks building in build phase
+- **[breaking change]** Update executeScript and executeCommand methods to execute code viva execInContainer  
+  (now it returns yaml string in Container.ExecResult not CompletableFuture).
+- **[breaking change]** Remove TarantoolContainer containers with TarantoolClientBuilder parameter.
+- **[breaking change]** Remove getClient method from TarantoolContainerClientHelper.
+- **[breaking change]** Remove io.tarantool.cartridge-driver dependency.
+  because cartridge-java client was also removed.
+- Add executeScriptDecoded and executeCommandDecoded methods to return parsed yaml not string.
+- Add withSsl and withKeyAndCertFiles methods to TarantoolContainer and TarantoolCartridgeContainer.
+- Rewrite tests and add new cases to support new API.
+- Update org.yaml.snakeyaml to 2.0 version.
 
 ## [0.5.4] - 2023-03-31
 - Use tarantool image as base instead of centos in cartridge container

README.md

@@ -52,9 +52,9 @@ public class SomeTest {
     @BeforeAll
     public void setUp() {
         // Run some setup commands
-        container.executeCommand("return 1, 2").get();
+        container.executeCommand("return 1, 2");
         // Or execute a script
-        container.executeScript("org/testcontainers/containers/test.lua").get();
+        container.executeScript("org/testcontainers/containers/test.lua");
     }
 
     @Test
@@ -72,7 +72,7 @@ public class SomeTest {
             ...
 
             // Execute some commands in Tarantool instance for verification
-            List<Object> result = container.executeCommand("return 1, 2").get();
+            List<Object> result = container.executeCommand("return 1, 2");
             ...
         }
     ...
@@ -181,7 +181,7 @@ public class SomeOtherTest {
     // Use the created container in tests
     public void testFoo() {
         // Execute Lua commands in the router instance
-        List<Object> result = container.executeCommand("return profile_get(...)", 1).get();
+        List<Object> result = container.executeCommand("return profile_get(1)");
 
         // Instantiate a client connected to the router node
         TarantoolCredentials credentials = new SimpleTarantoolCredentials(getRouterUsername(), getRouterPassword());

pom.xml

@@ -53,7 +53,7 @@
     </scm>
 
     <properties>
-        <testcontainers.version>1.17.4</testcontainers.version>
+        <testcontainers.version>1.18.0</testcontainers.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <logging.config>${project.basedir}/src/test/resources/logback-test.xml</logging.config>
@@ -81,20 +81,21 @@
             <artifactId>testcontainers</artifactId>
             <version>${testcontainers.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.tarantool</groupId>
-            <artifactId>cartridge-driver</artifactId>
-            <version>0.9.1</version>
-        </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.33</version>
+            <version>2.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.28</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>
@@ -103,6 +104,12 @@
             <version>1.3.4</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>org.junit.jupiter</groupId>
+          <artifactId>junit-jupiter</artifactId>
+          <version>5.8.1</version>
+          <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>

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

@@ -0,0 +1,20 @@
+package org.testcontainers.containers;
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.ToString;
+
+@Getter
+@NoArgsConstructor(staticName = "getSslContext")
+@AllArgsConstructor(staticName = "getSslContext")
+@ToString(includeFieldNames=true)
+@EqualsAndHashCode
+public class SslContext {
+    @NonNull
+    private String keyFile;
+    @NonNull
+    private String certFile;
+}

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

@@ -1,7 +1,6 @@
 package org.testcontainers.containers;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import io.tarantool.driver.exceptions.TarantoolConnectionException;
 
 import org.testcontainers.containers.exceptions.CartridgeTopologyException;
 import org.testcontainers.images.builder.ImageFromDockerfile;
@@ -12,7 +11,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Supplier;
@@ -82,6 +80,9 @@
  * specified in the http_port options, will be exposed.
  *
  * @author Alexey Kuzin
+ * @authorm Artyom Dubinin
+ * @author Ivan Dneprov
+ *
  */
 public class TarantoolCartridgeContainer extends GenericContainer<TarantoolCartridgeContainer>
         implements TarantoolContainerOperations<TarantoolCartridgeContainer> {
@@ -119,6 +120,7 @@ public class TarantoolCartridgeContainer extends GenericContainer<TarantoolCartr
     private String directoryResourcePath = SCRIPT_RESOURCE_DIRECTORY;
     private String instanceDir = INSTANCE_DIR;
     private String topologyConfigurationFile;
+    private SslContext sslContext ;
 
     /**
      * Create a container with default image and specified instances file from the classpath resources. Assumes that
@@ -186,8 +188,24 @@ public TarantoolCartridgeContainer(String dockerFile, String buildImageName,
      */
     public TarantoolCartridgeContainer(String dockerFile, String buildImageName, String instancesFile,
                                        String topologyConfigurationFile, final Map<String, String> buildArgs) {
-        this(buildImage(dockerFile, buildImageName), instancesFile, topologyConfigurationFile, buildArgs);
-    }
+        this(buildImage(dockerFile, buildImageName, buildArgs), instancesFile, topologyConfigurationFile, buildArgs);
+    }
+
+// todo add SSL and mTLS cartridge test
+//    /**
+//     * Create a container with specified image and specified instances file from the classpath resources. By providing
+//     * the result Cartridge container image name, you can cache the image and avoid rebuilding on each test run (the
+//     * image is tagged with the provided name and not deleted after tests finishing).
+//     *
+//     * @param tarantoolImageParams params for cached image creating
+//     * @param instancesFile             URL resource path to instances.yml relative in the classpath
+//     * @param topologyConfigurationFile URL resource path to a topology bootstrap script in the classpath
+//     */
+//    public TarantoolCartridgeContainer(TarantoolImageParams tarantoolImageParams, String instancesFile,
+//                                       String topologyConfigurationFile) {
+//        this(new ImageFromDockerfile(TarantoolContainerImageHelper.getImage(tarantoolImageParams)), instancesFile,
+//            topologyConfigurationFile, tarantoolImageParams.getBuildArgs());
+//    }
 
     private TarantoolCartridgeContainer(ImageFromDockerfile image, String instancesFile, String topologyConfigurationFile,
                                         Map<String, String> buildArgs) {
@@ -238,13 +256,32 @@ private static Map<String, String> mergeBuildArguments(Map<String, String> build
         return args;
     }
 
-    private static ImageFromDockerfile buildImage(String dockerFile, String buildImageName) {
+    private static ImageFromDockerfile buildImage(String dockerFile, String buildImageName,
+            final Map<String, String> buildArgs) {
+        ImageFromDockerfile image;
         if (buildImageName != null && !buildImageName.isEmpty()) {
-            return new ImageFromDockerfile(buildImageName, false)
-                    .withFileFromClasspath("Dockerfile", dockerFile);
+            image = new ImageFromDockerfile(buildImageName, false);
+        } else {
+            image = new ImageFromDockerfile();
         }
-        return new ImageFromDockerfile().withFileFromClasspath("Dockerfile", dockerFile);
-    }
+        return image.withFileFromClasspath("Dockerfile", dockerFile)
+                   .withFileFromClasspath("cartridge", buildArgs.get("CARTRIDGE_SRC_DIR") == null ?
+                                                           "cartridge" : buildArgs.get("CARTRIDGE_SRC_DIR"));
+    }
+
+// todo add SSL and mTLS cartridge test
+//    /**
+//     * Specify SSL as connection transport. And path to key and cert files inside your container for mTLS connection
+//     * Warning! SSL must be set as default transport on your tarantool cluster.
+//     * Supported only in Tarantool Enterprise
+//     *
+//     * @return this container instance
+//     */
+//    public TarantoolCartridgeContainer withSslContext(SslContext sslContext) {
+//        checkNotRunning();
+//        this.sslContext = sslContext;
+//        return this;
+//    }
 
     /**
      * Get the router host
@@ -328,6 +365,11 @@ public String getInstanceDir() {
         return instanceDir;
     }
 
+    @Override
+    public int getInternalPort() {
+        return routerPort;
+    }
+
     /**
      * Get Cartridge router HTTP API hostname
      *
@@ -475,7 +517,7 @@ private boolean setupTopology() {
                     .substring(topologyConfigurationFile.lastIndexOf('/') + 1);
 
             try {
-                Container.ExecResult result = execInContainer("cartridge",
+                ExecResult result = execInContainer("cartridge",
                         "replicasets",
                         "--run-dir=" + TARANTOOL_RUN_DIR,
                         "--file=" + replicasetsFileName, "setup", "--bootstrap-vshard");
@@ -489,7 +531,7 @@ private boolean setupTopology() {
 
         } else {
             try {
-                List<?> res = executeScript(topologyConfigurationFile).get();
+                List<?> res = executeScriptDecoded(topologyConfigurationFile);
                 if (res.size() >= 2 && res.get(1) != null && res.get(1) instanceof Map) {
                     HashMap<?, ?> error = ((HashMap<?, ?>) res.get(1));
                     // that means topology already exists
@@ -501,10 +543,6 @@ private boolean setupTopology() {
                     if (e.getCause() instanceof TimeoutException) {
                         return true;
                         // Do nothing, the cluster is reloading
-                    } else if (e.getCause() instanceof TarantoolConnectionException) {
-                        // Probably cluster is not ready
-                        logger().error("Failed to setup topology: {}", e.getMessage());
-                        return false;
                     }
                 } else {
                     throw new CartridgeTopologyException(e);
@@ -530,7 +568,7 @@ private void retryingSetupTopology() {
 
     private void bootstrapVshard() {
         try {
-            executeCommand(VSHARD_BOOTSTRAP_COMMAND).get();
+            executeCommand(VSHARD_BOOTSTRAP_COMMAND);
         } catch (Exception e) {
             logger().error("Failed to bootstrap vshard cluster", e);
             throw new RuntimeException(e);
@@ -580,8 +618,8 @@ private boolean routerIsUp() {
         String healthyCmd = " local cartridge = package.loaded['cartridge']" +
                 " return assert(cartridge ~= nil)";
         try {
-            List<?> result = executeCommand(healthyCmd).get();
-            return (Boolean) result.get(0);
+            ExecResult result = executeCommand(healthyCmd);
+            return result.getStdout().equals("---\n- true\n...\n\n");
         } catch (Exception e) {
             logger().warn("Error while waiting for router instance to be up: " + e.getMessage());
             return false;
@@ -592,21 +630,31 @@ private boolean isCartridgeHealthy() {
         String healthyCmd = " local cartridge = package.loaded['cartridge']" +
                 " return assert(cartridge) and assert(cartridge.is_healthy())";
         try {
-            List<?> result = executeCommand(healthyCmd).get();
-            return (Boolean) result.get(0);
+            ExecResult result = executeCommand(healthyCmd);
+            return result.getStdout().equals("---\n- true\n...\n\n");
         } catch (Exception e) {
             logger().warn("Error while waiting for cartridge healthy state: " + e.getMessage());
             return false;
         }
     }
 
     @Override
-    public CompletableFuture<List<?>> executeScript(String scriptResourcePath) throws Exception {
-        return clientHelper.executeScript(scriptResourcePath);
+    public ExecResult executeScript(String scriptResourcePath) throws Exception {
+        return clientHelper.executeScript(scriptResourcePath, this.sslContext);
+    }
+
+    @Override
+    public <T> T executeScriptDecoded(String scriptResourcePath) throws Exception {
+        return clientHelper.executeScriptDecoded(scriptResourcePath, this.sslContext);
+    }
+
+    @Override
+    public ExecResult executeCommand(String command) throws Exception {
+        return clientHelper.executeCommand(command, this.sslContext);
     }
 
     @Override
-    public CompletableFuture<List<?>> executeCommand(String command, Object... arguments) throws Exception {
-        return clientHelper.executeCommand(command, arguments);
+    public <T> T executeCommandDecoded(String command) throws Exception {
+        return clientHelper.executeCommandDecoded(command, this.sslContext);
     }
 }