You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/09/12 02:46:46 UTC

(shardingsphere) branch master updated: Use StorageContainerConfigurationOptionFactory on AgentE2ETestEnvironment (#36535)

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 528fe1d7876 Use StorageContainerConfigurationOptionFactory on AgentE2ETestEnvironment (#36535)
528fe1d7876 is described below

commit 528fe1d78768aef5a1739f35d84a249ad3e9a127
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Sep 12 10:46:40 2025 +0800

    Use StorageContainerConfigurationOptionFactory on AgentE2ETestEnvironment (#36535)
---
 .../agent/engine/env/AgentE2ETestEnvironment.java  | 22 +++++++++-------------
 .../mysql/init-sql/20-env-initdb.sql}              |  5 -----
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
index 5be82b08b31..6e1b0ae1f69 100644
--- a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
+++ b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
@@ -38,7 +38,8 @@ import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyCo
 import org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainer;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainerFactory;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfigurationFactory;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOptionFactory;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.impl.MySQLContainer;
 import org.awaitility.Awaitility;
 import org.testcontainers.containers.output.OutputFrame;
@@ -62,6 +63,8 @@ public final class AgentE2ETestEnvironment {
     
     private static final AgentE2ETestEnvironment INSTANCE = new AgentE2ETestEnvironment();
     
+    private final DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, "MySQL");
+    
     private final AgentE2ETestConfiguration testConfig = AgentE2ETestConfiguration.getInstance();
     
     private final AgentE2ETestImageConfiguration imageConfig = AgentE2ETestImageConfiguration.getInstance();
@@ -112,9 +115,10 @@ public final class AgentE2ETestEnvironment {
     @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
     private void createProxyEnvironment(final Optional<DockerITContainer> agentPluginContainer) {
         containers = new ITContainers();
-        ShardingSphereProxyClusterContainer proxyContainer = new ShardingSphereProxyClusterContainer(TypedSPILoader.getService(DatabaseType.class, "MySQL"), getAdaptorContainerConfiguration());
+        ShardingSphereProxyClusterContainer proxyContainer = new ShardingSphereProxyClusterContainer(databaseType, getAdaptorContainerConfiguration());
         proxyContainer.withLogConsumer(testConfig.isLogEnabled() ? this::collectLogs : null);
-        MySQLContainer storageContainer = new MySQLContainer(imageConfig.getMysqlImage(), getStorageContainerConfiguration());
+        MySQLContainer storageContainer = new MySQLContainer(
+                imageConfig.getMysqlImage(), StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, 5));
         proxyContainer.dependsOn(storageContainer);
         containers.registerContainer(storageContainer);
         GovernanceContainer governanceContainer = GovernanceContainerFactory.newInstance("ZooKeeper");
@@ -131,15 +135,6 @@ public final class AgentE2ETestEnvironment {
         }
     }
     
-    private static StorageContainerConfiguration getStorageContainerConfiguration() {
-        Map<String, String> environments = new HashMap<>(2, 1F);
-        environments.put("LANG", "C.UTF-8");
-        environments.put("MYSQL_RANDOM_ROOT_PASSWORD", "yes");
-        Map<String, String> mountedResources = Collections.singletonMap("/env/mysql/init.sql", "/docker-entrypoint-initdb.d/init.sql");
-        return new StorageContainerConfiguration(
-                null, "--sql_mode= --default-authentication-plugin=mysql_native_password", environments, mountedResources, Collections.emptyMap(), Collections.emptyMap());
-    }
-    
     private AdaptorContainerConfiguration getAdaptorContainerConfiguration() {
         Map<String, String> mountedResources = new HashMap<>(3, 1F);
         mountedResources.put("/env/proxy/conf/global.yaml", ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "global.yaml");
@@ -153,7 +148,8 @@ public final class AgentE2ETestEnvironment {
     @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
     private void createJDBCEnvironment(final Optional<DockerITContainer> agentPluginContainer) {
         containers = new ITContainers();
-        MySQLContainer storageContainer = new MySQLContainer(imageConfig.getMysqlImage(), getStorageContainerConfiguration());
+        MySQLContainer storageContainer = new MySQLContainer(imageConfig.getMysqlImage(),
+                StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, 5));
         ShardingSphereJdbcAgentContainer jdbcAgentContainer = new ShardingSphereJdbcAgentContainer(
                 imageConfig.getJdbcProjectImage(), testConfig.getPluginType(), testConfig.isLogEnabled() ? this::collectLogs : null);
         jdbcAgentContainer.dependsOn(storageContainer);
diff --git a/test/e2e/agent/engine/src/test/resources/env/mysql/init.sql b/test/e2e/agent/engine/src/test/resources/env/container/mysql/init-sql/20-env-initdb.sql
similarity index 91%
rename from test/e2e/agent/engine/src/test/resources/env/mysql/init.sql
rename to test/e2e/agent/engine/src/test/resources/env/container/mysql/init-sql/20-env-initdb.sql
index cda5ed86b92..44a4c009d93 100644
--- a/test/e2e/agent/engine/src/test/resources/env/mysql/init.sql
+++ b/test/e2e/agent/engine/src/test/resources/env/container/mysql/init-sql/20-env-initdb.sql
@@ -15,9 +15,6 @@
 -- limitations under the License.
 --
 
-SET character_set_database='utf8';
-SET character_set_server='utf8';
-
 DROP DATABASE IF EXISTS demo_ds_0;
 DROP DATABASE IF EXISTS demo_ds_1;
 
@@ -32,5 +29,3 @@ CREATE TABLE demo_ds_1.t_order_1 (order_id INT NOT NULL, user_id INT NOT NULL, s
 
 CREATE USER IF NOT EXISTS 'test_user'@'%' IDENTIFIED BY 'Test@123';
 GRANT ALL ON *.* TO 'test_user'@'%';
-
-CREATE USER IF NOT EXISTS 'ready_user'@'%' IDENTIFIED BY 'Ready@123';