test: update tt3 version

Author: Alex-pvl

tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientTest.java

@@ -89,8 +89,8 @@
 @Testcontainers
 public class TarantoolCrudClientTest extends BaseTest {
 
-  public static final String SECRET_CLUSTER_COOKIE = "secret";
-  public static final String ADMIN = "api_user";
+  public static final String SECRET_CLUSTER_COOKIE = "secret-cluster-cookie";
+  public static final String ADMIN = "admin";
   public static final int PERSON_COUNT = 1000;
   public static final Map<String, Object> OPTIONS =
       new HashMap<String, Object>() {

tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientWithRetryTest.java

@@ -109,8 +109,8 @@ public static void setUp() throws Exception {
           TarantoolFactory.crud()
               .withHost(tt.getHost())
               .withPort(tt.getPort())
-              .withUser("api_user")
-              .withPassword("secret")
+              .withUser("admin")
+              .withPassword("secret-cluster-cookie")
               .build();
     }
   }

tarantool-shared-resources/vshard_cluster/config.yaml

@@ -1,7 +1,7 @@
 credentials:
   users:
-    api_user:
-      password: 'secret'
+    admin:
+      password: 'secret-cluster-cookie'
       roles: [ super ]
     replicator:
       password: 'secret'

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

@@ -28,8 +28,8 @@ public class TarantoolCartridgeContainer extends GenericContainer<TarantoolCartr
 
   protected static final String ROUTER_HOST = "localhost";
   protected static final int ROUTER_PORT = 3301;
-  protected static final String CARTRIDGE_DEFAULT_USERNAME = "api_user";
-  protected static final String CARTRIDGE_DEFAULT_PASSWORD = "secret";
+  protected static final String CARTRIDGE_DEFAULT_USERNAME = "admin";
+  protected static final String CARTRIDGE_DEFAULT_PASSWORD = "secret-cluster-cookie";
   protected static final String DOCKERFILE = "Dockerfile";
   protected static final int API_PORT = 8081;
   protected static final String VSHARD_BOOTSTRAP_COMMAND =

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

@@ -31,8 +31,8 @@ public class VshardClusterContainer extends GenericContainer<VshardClusterContai
 
   protected static final String ROUTER_HOST = "localhost";
   protected static final int ROUTER_PORT = 3301;
-  protected static final String VSHARD_CLUSTER_DEFAULT_USERNAME = "api_user";
-  protected static final String VSHARD_CLUSTER_DEFAULT_PASSWORD = "secret";
+  protected static final String VSHARD_CLUSTER_DEFAULT_USERNAME = "admin";
+  protected static final String VSHARD_CLUSTER_DEFAULT_PASSWORD = "secret-cluster-cookie";
   protected static final String DOCKERFILE = "Dockerfile";
   protected static final String SCRIPT_RESOURCE_DIRECTORY = "";
   protected static final String INSTANCE_DIR = "/app";

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

@@ -67,16 +67,17 @@ public final class TarantoolContainerClientHelper {
       "Executed command \"%s\" with exit code %d, stderr: \"%s\", stdout: \"%s\"";
 
   private static final String ECHO_COMMAND = "echo \"%s\" | tt connect %s:%s@%s:%d";
-  private static final String COMMAND_TEMPLATE = "echo \" " +
-      "    print(require('yaml').encode( " +
-      "        {require('net.box').connect( " +
-      "            '%s:%d',  " +
-      "            { user = '%s', password = '%s' } " +
-      "            ):eval('%s')}) " +
-      "        ); " +
-      "    os.exit(); " +
-      "\" > container-tmp.lua &&" +
-      " tarantool container-tmp.lua";
+  private static final String COMMAND_TEMPLATE =
+      "echo \" "
+          + "    print(require('yaml').encode( "
+          + "        {require('net.box').connect( "
+          + "            '%s:%d',  "
+          + "            { user = '%s', password = '%s' } "
+          + "            ):eval('%s')}) "
+          + "        ); "
+          + "    os.exit(); "
+          + "\" > container-tmp.lua &&"
+          + " tarantool container-tmp.lua";
   private static final String MTLS_COMMAND_TEMPLATE =
       "echo \"     print(require('yaml').encode(         {require('net.box').connect(             {"
           + " uri='%s:%d', params = { transport='ssl', ssl_key_file = '%s', ssl_cert_file = '%s'"
@@ -220,8 +221,9 @@ public static TarantoolContainer<?> createTarantoolContainer(Integer... exposedP
                   .withNetwork(NETWORK)
                   .waitingFor(
                       new Tarantool3WaitStrategy("localhost", API_USER, CREDS.get(API_USER)))
-                  .withCreateContainerCmdModifier(cmd -> cmd.withUser("root"))
-                  .withPrivilegedMode(true);
+                  .withPrivilegedMode(true)
+                  .withCreateContainerCmdModifier(
+                      cmd -> cmd.withUser("root").withName("test-node"));
           default ->
               throw new RuntimeException(
                   String.format("Unsupported Tarantool version, %s", TARANTOOL_VERSION));
@@ -357,8 +359,8 @@ public static Container.ExecResult executeCommand(
               COMMAND_TEMPLATE,
               container.getHost(),
               container.getInternalPort(),
-              API_USER,
-              CREDS.get(API_USER),
+              container.getUsername(),
+              container.getPassword(),
               command);
     } else if (sslContext.getKeyFile() != null && sslContext.getCertFile() != null) { // mTLS
       bashCommand =
@@ -368,17 +370,17 @@ public static Container.ExecResult executeCommand(
               container.getInternalPort(),
               sslContext.getKeyFile(),
               sslContext.getCertFile(),
-              API_USER,
-              CREDS.get(API_USER),
+              container.getUsername(),
+              container.getPassword(),
               command);
     } else { // SSL
       bashCommand =
           String.format(
               SSL_COMMAND_TEMPLATE,
               container.getHost(),
               container.getInternalPort(),
-              API_USER,
-              CREDS.get(API_USER),
+              container.getUsername(),
+              container.getPassword(),
               command);
     }