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/17 02:00:54 UTC

(shardingsphere) branch master updated: Unify e2e default database user and password (#36594)

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 67201b0dee5 Unify e2e default database user and password (#36594)
67201b0dee5 is described below

commit 67201b0dee5b294c6d0bb38413d74d77cff64922
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Sep 17 10:00:48 2025 +0800

    Unify e2e default database user and password (#36594)
---
 .../impl/ShardingSphereJdbcEmbeddedContainer.java        |  5 +++--
 .../test/e2e/env/runtime/E2ETestEnvironment.java         |  5 +++--
 .../operation/pipeline/env/PipelineE2EEnvironment.java   |  5 +++--
 .../pipeline/src/test/resources/env/it-env.properties    | 16 ++++++++--------
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereJdbcEmbeddedContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereJdbcEmbeddedContainer.java
index bebba8d3a25..4741edaf0ec 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereJdbcEmbeddedContainer.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereJdbcEmbeddedContainer.java
@@ -21,6 +21,7 @@ import com.zaxxer.hikari.HikariDataSource;
 import lombok.SneakyThrows;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.EmbeddedITContainer;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainer;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
 
 import javax.sql.DataSource;
@@ -68,8 +69,8 @@ public final class ShardingSphereJdbcEmbeddedContainer implements EmbeddedITCont
         HikariDataSource result = new HikariDataSource();
         result.setDriverClassName("org.apache.shardingsphere.driver.ShardingSphereDriver");
         result.setJdbcUrl("jdbc:shardingsphere:absolutepath:" + processFile(configPath, storageContainer.getLinkReplacements()));
-        result.setUsername("root");
-        result.setPassword("Root@123");
+        result.setUsername(StorageContainerConstants.OPERATION_USER);
+        result.setPassword(StorageContainerConstants.OPERATION_PASSWORD);
         result.setMaximumPoolSize(2);
         result.setTransactionIsolation("TRANSACTION_READ_COMMITTED");
         result.setLeakDetectionThreshold(10000L);
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
index b2411b32883..fe4f63a7c3e 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.test.e2e.env.runtime;
 
 import com.google.common.base.Splitter;
 import lombok.Getter;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
 import org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment;
 import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioCommonPath;
 
@@ -66,8 +67,8 @@ public final class E2ETestEnvironment {
         clusterEnvironment = new ClusterEnvironment(props);
         nativeStorageHost = props.getProperty("it.native.storage.host", "127.0.0.1");
         nativeStoragePort = Integer.parseInt(props.getProperty("it.native.storage.port", "0"));
-        nativeStorageUsername = props.getProperty("it.native.storage.username", "root");
-        nativeStoragePassword = props.getProperty("it.native.storage.password", "Root@123");
+        nativeStorageUsername = props.getProperty("it.native.storage.username", StorageContainerConstants.OPERATION_USER);
+        nativeStoragePassword = props.getProperty("it.native.storage.password", StorageContainerConstants.OPERATION_PASSWORD);
         governanceCenter = props.getProperty("it.env.governance.center");
     }
     
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
index fce97080031..006a074a14a 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
@@ -21,6 +21,7 @@ import com.google.common.base.Strings;
 import lombok.Getter;
 import lombok.SneakyThrows;
 import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.dialect.MariaDBStorageContainerConfigurationOption;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.dialect.MySQLStorageContainerConfigurationOption;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.dialect.OpenGaussStorageContainerConfigurationOption;
@@ -120,7 +121,7 @@ public final class PipelineE2EEnvironment {
      * @return actual data source username
      */
     public String getActualDataSourceUsername(final DatabaseType databaseType) {
-        return String.valueOf(props.getProperty(String.format("pipeline.it.native.%s.username", databaseType.getType().toLowerCase()), "Root@123"));
+        return String.valueOf(props.getProperty(String.format("pipeline.it.native.%s.username", databaseType.getType().toLowerCase()), StorageContainerConstants.OPERATION_USER));
     }
     
     /**
@@ -130,7 +131,7 @@ public final class PipelineE2EEnvironment {
      * @return actual data source username
      */
     public String getActualDataSourcePassword(final DatabaseType databaseType) {
-        return String.valueOf(props.getProperty(String.format("pipeline.it.native.%s.password", databaseType.getType().toLowerCase()), "Root@123"));
+        return String.valueOf(props.getProperty(String.format("pipeline.it.native.%s.password", databaseType.getType().toLowerCase()), StorageContainerConstants.OPERATION_PASSWORD));
     }
     
     /**
diff --git a/test/e2e/operation/pipeline/src/test/resources/env/it-env.properties b/test/e2e/operation/pipeline/src/test/resources/env/it-env.properties
index e21c893d003..1a1912dfce2 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/it-env.properties
+++ b/test/e2e/operation/pipeline/src/test/resources/env/it-env.properties
@@ -25,15 +25,15 @@ pipeline.it.docker.postgresql.version=
 pipeline.it.docker.opengauss.version=
 # pipeline.it.native.database=mysql or postgresql or opengauss
 pipeline.it.native.database=
-pipeline.it.native.mysql.username=root
-pipeline.it.native.mysql.password=Root@123
+pipeline.it.native.mysql.username=test_user
+pipeline.it.native.mysql.password=Test@123
 pipeline.it.native.mysql.port=3306
-pipeline.it.native.mariadb.username=root
-pipeline.it.native.mariadb.password=Root@123
+pipeline.it.native.mariadb.username=test_user
+pipeline.it.native.mariadb.password=Test@123
 pipeline.it.native.mariadb.port=3306
-pipeline.it.native.postgresql.username=postgres
-pipeline.it.native.postgresql.password=Root@123
+pipeline.it.native.postgresql.username=test_user
+pipeline.it.native.postgresql.password=Test@123
 pipeline.it.native.postgresql.port=5432
-pipeline.it.native.opengauss.username=gaussdb
-pipeline.it.native.opengauss.password=Root@123
+pipeline.it.native.opengauss.username=test_user
+pipeline.it.native.opengauss.password=Test@123
 pipeline.it.native.opengauss.port=5432