[inlong] branch master updated: [INLONG-8997][Sort] Keep the logic the same of mysql with flink v1.13 in end to end test

[zirui]

This is an automated email from the ASF dual-hosted git repository.

zirui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new f462e67f36 [INLONG-8997][Sort] Keep the logic the same of mysql with 
flink v1.13 in end to end test
f462e67f36 is described below

commit f462e67f366aa84e2d48808e9e11f34159b26766
Author: EpicMo <epicm...@gmail.com>
AuthorDate: Wed Oct 11 16:19:27 2023 +0800

    [INLONG-8997][Sort] Keep the logic the same of mysql with flink v1.13 in 
end to end test
---
 .../java/org/apache/inlong/sort/tests/utils/MySqlContainer.java   | 8 +++-----
 .../java/org/apache/inlong/sort/tests/utils/MySqlContainer.java   | 4 +---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git 
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/utils/MySqlContainer.java
 
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/utils/MySqlContainer.java
index 11635e5619..2400efcbc6 100644
--- 
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/utils/MySqlContainer.java
+++ 
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/utils/MySqlContainer.java
@@ -59,10 +59,6 @@ public class MySqlContainer extends JdbcDatabaseContainer {
 
     @Override
     protected void configure() {
-        // HERE is the difference, copy to /etc/mysql/, if copy to 
/etc/mysql/conf.d will be wrong
-        optionallyMapResourceParameterAsVolume(
-                MY_CNF_CONFIG_OVERRIDE_PARAM_NAME, "/etc/mysql/", 
"mysql-default-conf");
-
         if (parameters.containsKey(SETUP_SQL_PARAM_NAME)) {
             optionallyMapResourceParameterAsVolume(
                     SETUP_SQL_PARAM_NAME, "/docker-entrypoint-initdb.d/", 
"N/A");
@@ -79,6 +75,7 @@ public class MySqlContainer extends JdbcDatabaseContainer {
             throw new ContainerLaunchException(
                     "Empty password can be used only with the root user");
         }
+        withCommand("--default-authentication-plugin=mysql_native_password");
         setStartupAttempts(3);
     }
 
@@ -100,7 +97,8 @@ public class MySqlContainer extends JdbcDatabaseContainer {
                 + getDatabasePort()
                 + "/"
                 + databaseName
-                + additionalUrlParams;
+                + additionalUrlParams
+                + "?useSSL=false&allowPublicKeyRetrieval=true";
     }
 
     @Override
diff --git 
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/utils/MySqlContainer.java
 
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/utils/MySqlContainer.java
index 75ba466f1d..2400efcbc6 100644
--- 
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/utils/MySqlContainer.java
+++ 
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/utils/MySqlContainer.java
@@ -49,7 +49,7 @@ public class MySqlContainer extends JdbcDatabaseContainer {
 
     public MySqlContainer(MySqlVersion version) {
         super(DockerImageName.parse(IMAGE + ":" + version.getVersion()));
-        addFixedExposedPort(33306, 3306);
+        addExposedPort(MYSQL_PORT);
     }
 
     @Override
@@ -59,8 +59,6 @@ public class MySqlContainer extends JdbcDatabaseContainer {
 
     @Override
     protected void configure() {
-        // HERE is the difference, copy to /etc/mysql/, if copy to 
/etc/mysql/conf.d will be wrong
-
         if (parameters.containsKey(SETUP_SQL_PARAM_NAME)) {
             optionallyMapResourceParameterAsVolume(
                     SETUP_SQL_PARAM_NAME, "/docker-entrypoint-initdb.d/", 
"N/A");