Remove ssl support from TarantoolCartridgeContainer

Author: iDneprov

README.md

@@ -14,7 +14,7 @@ Add the Maven dependency:
 <dependency>
   <groupId>io.tarantool</groupId>
   <artifactId>testcontainers-java-tarantool</artifactId>
-  <version>0.6.0</version>
+  <version>0.5.4</version>
 </dependency>
 ```
 

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

@@ -17,16 +17,4 @@ public class SslContext {
     private String keyFile;
     @NonNull
     private String certFile;
-
-//    public SslContext(@NonNull String keyFile, @NonNull String certFile) {
-//        if (keyFile.isEmpty()) {
-//            throw new RuntimeException("Parameter keyFile can not be empty String");
-//        }
-//        if (certFile.isEmpty()) {
-//            throw new RuntimeException("Parameter certFile can not be empty String");
-//        }
-//
-//        this.keyFile = keyFile;
-//        this.certFile = certFile;
-//    }
 }

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

@@ -191,20 +191,21 @@ public TarantoolCartridgeContainer(String dockerFile, String buildImageName, Str
         this(buildImage(dockerFile, buildImageName), instancesFile, topologyConfigurationFile, buildArgs);
     }
 
-    /**
-     * 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());
-    }
+// 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) {
@@ -263,18 +264,19 @@ private static ImageFromDockerfile buildImage(String dockerFile, String buildIma
         return new ImageFromDockerfile().withFileFromClasspath("Dockerfile", dockerFile);
     }
 
-    /**
-     * 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;
-    }
+// 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

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

@@ -24,9 +24,9 @@ public final class TarantoolContainerClientHelper {
     private final TarantoolContainerOperations<? extends Container<?>> container;
     private final String EXECUTE_SCRIPT_ERROR_TEMPLATE =
         "Executed script %s with exit code %d, stderr: \"%s\", stdout: \"%s\"";
-    private final String EXECUTE_COMMAND_ERROR_TEMPLATE =
+    private static final String EXECUTE_COMMAND_ERROR_TEMPLATE =
         "Executed command \"%s\" with exit code %d, stderr: \"%s\", stdout: \"%s\"";
-    private final String MTLS_COMMAND_TEMPLATE =
+    private static final String MTLS_COMMAND_TEMPLATE =
         "echo \" " +
         "    print(require('yaml').encode( " +
         "        require('net.box').connect( " +
@@ -36,7 +36,7 @@ public final class TarantoolContainerClientHelper {
         "        ); " +
         "    os.exit(); " +
         "\" | tarantool";
-    private final String SSL_COMMAND_TEMPLATE =
+    private static final String SSL_COMMAND_TEMPLATE =
         "echo \" " +
         "    print(require('yaml').encode( " +
         "        require('net.box').connect( " +
@@ -46,7 +46,7 @@ public final class TarantoolContainerClientHelper {
         "        ); " +
         "    os.exit(); " +
         "\" | tarantool";
-    private final String COMMAND_TEMPLATE = "echo \" " +
+    private static final String COMMAND_TEMPLATE = "echo \" " +
         "    print(require('yaml').encode( " +
         "        require('net.box').connect( " +
         "            { uri='%s:%d' },  " +

src/test/java/org/testcontainers/containers/Enterprise/TarantoolCartridgeMtlsContainerTestEnterprise.java

@@ -32,13 +32,13 @@ public static void setUp() throws Exception {
         );
         final Map<String, String> buildArgs = new HashMap<>();
         buildArgs.put("DOWNLOAD_SDK_URI", System.getenv("DOWNLOAD_SDK_URI"));
-        buildArgs.put("SDK_VERSION", System.getenv("SDK_VERSION"));
+        buildArgs.put("SDK_VERSION", "tarantool-enterprise-sdk-nogc64-2.10.6-0-r557.linux.x86_64");
 
         containerWithSsl = new TarantoolContainer(
             new TarantoolImageParams("tarantool-enterprise", dockerfile, buildArgs))
             .withScriptFileName("mtls_server.lua")
-            .withUsername("test_user")
-            .withPassword("test_password")
+            .withUsername("api_user")
+            .withPassword("secret")
             .withMemtxMemory(256 * 1024 * 1024)
             .withDirectoryBinding("enterprise/ssl/mtls")
             .withSslContext(SslContext.getSslContext("/app/ca.key", "/app/ca.crt"))

src/test/java/org/testcontainers/containers/Enterprise/TarantoolMTlsContainerTestEnterprise.java

@@ -19,15 +19,15 @@ public class TarantoolSdkContainerTestEnterprise {
     @Test
     void test_should_createTarantoolContainerFromSdk() throws Exception {
         final File dockerfile = new File(
-                TarantoolSdkContainerTestEnterprise.class.getClassLoader().getResource("testsdk/Dockerfile").toURI()
+                TarantoolSdkContainerTestEnterprise.class.getClassLoader().getResource("enterprise/Dockerfile").toURI()
         );
         final Map<String, String> buildArgs = new HashMap<>();
         buildArgs.put("DOWNLOAD_SDK_URI", System.getenv("DOWNLOAD_SDK_URI"));
         buildArgs.put("SDK_VERSION", "tarantool-enterprise-sdk-nogc64-2.10.6-0-r557.linux.x86_64");
 
         try (final TarantoolContainer tarantoolContainer = new TarantoolContainer(
                 new TarantoolImageParams("tarantool-enterprise-bundle:latest", dockerfile, buildArgs))
-                .withDirectoryBinding("testsdk")) {
+                .withDirectoryBinding("enterprise")) {
 
             tarantoolContainer.start();
 

src/test/java/org/testcontainers/containers/Enterprise/TarantoolSdkContainerTestEnterprise.java

@@ -32,13 +32,13 @@ public static void setUp() throws Exception {
         );
         final Map<String, String> buildArgs = new HashMap<>();
         buildArgs.put("DOWNLOAD_SDK_URI", System.getenv("DOWNLOAD_SDK_URI"));
-        buildArgs.put("SDK_VERSION", System.getenv("SDK_VERSION"));
+        buildArgs.put("SDK_VERSION", "tarantool-enterprise-sdk-nogc64-2.10.6-0-r557.linux.x86_64");
 
         containerWithSsl = new TarantoolContainer(
             new TarantoolImageParams("tarantool-enterprise", dockerfile, buildArgs))
             .withScriptFileName("ssl_server.lua")
-            .withUsername("test_user")
-            .withPassword("test_password")
+            .withUsername("api_user")
+            .withPassword("secret")
             .withMemtxMemory(256 * 1024 * 1024)
             .withDirectoryBinding("enterprise/ssl")
             .withSslContext(SslContext.getSslContext())

src/test/java/org/testcontainers/containers/Enterprise/TarantoolSslContainerTestEnterprise.java

@@ -1,4 +1,10 @@
-box.cfg { listen = 3301 }
-
-box.schema.user.create('test_user', { password = 'test_password', if_not_exists = true })
-box.schema.user.grant('test_user', 'read, write, execute', 'universe', nil, { if_not_exists = true })
+box.cfg {
+    listen = 3301,
+    memtx_memory = 128 * 1024 * 1024, -- 128 Mb
+    -- log = 'file:/tmp/tarantool.log',
+    log_level = 6,
+}
+-- API user will be able to login with this password
+box.schema.user.create('api_user', { password = 'secret', if_not_exists = true })
+-- API user will be able to create spaces, add or remove data, execute functions
+box.schema.user.grant('api_user', 'read,write,execute', 'universe', nil, { if_not_exists = true })

src/test/resources/enterprise/server.lua

@@ -8,5 +8,5 @@ box.cfg { listen = {
     }
 } }
 
-box.schema.user.create('test_user', { password = 'test_password', if_not_exists = true })
-box.schema.user.grant('test_user', 'read, write, execute', 'universe', nil, { if_not_exists = true })
+box.schema.user.create('api_user', { password = 'secret', if_not_exists = true })
+box.schema.user.grant('api_user', 'read, write, execute', 'universe', nil, { if_not_exists = true })

src/test/resources/enterprise/ssl/Dockerfile

@@ -7,5 +7,5 @@ box.cfg { listen = {
     }
 } }
 
-box.schema.user.create('test_user', { password = 'test_password', if_not_exists = true })
-box.schema.user.grant('test_user', 'read, write, execute', 'universe', nil, { if_not_exists = true })
+box.schema.user.create('api_user', { password = 'secret', if_not_exists = true })
+box.schema.user.grant('api_user', 'read, write, execute', 'universe', nil, { if_not_exists = true })