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 2022/07/29 23:45:32 UTC
[shardingsphere] branch master updated: Refactor : refactor the user for Proxy container (#19678) (#19681)
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 7f6076abde9 Refactor : refactor the user for Proxy container (#19678) (#19681)
7f6076abde9 is described below
commit 7f6076abde9c957d75dba247738539fc3b124915
Author: 孙念君 Nianjun Sun <su...@sphere-ex.com>
AuthorDate: Sat Jul 30 07:45:26 2022 +0800
Refactor : refactor the user for Proxy container (#19678) (#19681)
---
.../atomic/adapter/impl/ShardingSphereProxyClusterContainer.java | 6 +++---
.../atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java | 4 ++--
.../src/test/resources/env/common/cluster/proxy/conf/server.yaml | 2 +-
.../src/test/resources/env/common/standalone/proxy/conf/server.yaml | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
index efba475ba22..0c6e1507355 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
@@ -66,7 +66,7 @@ public final class ShardingSphereProxyClusterContainer extends DockerITContainer
@Override
protected void configure() {
mapConfigurationFiles();
- setWaitStrategy(new JDBCConnectionWaitStrategy(() -> DriverManager.getConnection(DataSourceEnvironment.getURL(databaseType, getHost(), getMappedPort(3307), scenario), "root", "Root@123")));
+ setWaitStrategy(new JDBCConnectionWaitStrategy(() -> DriverManager.getConnection(DataSourceEnvironment.getURL(databaseType, getHost(), getMappedPort(3307), scenario), "proxy", "Proxy@123")));
}
private void mapConfigurationFiles() {
@@ -88,8 +88,8 @@ public final class ShardingSphereProxyClusterContainer extends DockerITContainer
HikariDataSource result = new HikariDataSource();
result.setDriverClassName(DataSourceEnvironment.getDriverClassName(databaseType));
result.setJdbcUrl(DataSourceEnvironment.getURL(databaseType, getHost(), getMappedPort(3307), scenario));
- result.setUsername("root");
- result.setPassword("Root@123");
+ result.setUsername("proxy");
+ result.setPassword("Proxy@123");
result.setMaximumPoolSize(2);
result.setTransactionIsolation("TRANSACTION_READ_COMMITTED");
return result;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
index a75f4529864..dc8bb13c4c2 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
@@ -90,8 +90,8 @@ public final class ShardingSphereProxyStandaloneContainer extends DockerITContai
HikariDataSource result = new HikariDataSource();
result.setDriverClassName(DataSourceEnvironment.getDriverClassName(databaseType));
result.setJdbcUrl(DataSourceEnvironment.getURL(databaseType, getHost(), getMappedPort(3307), scenario));
- result.setUsername("root");
- result.setPassword("Root@123");
+ result.setUsername("proxy");
+ result.setPassword("Proxy@123");
result.setMaximumPoolSize(2);
result.setTransactionIsolation("TRANSACTION_READ_COMMITTED");
return result;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/common/cluster/proxy/conf/server.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/common/cluster/proxy/conf/server.yaml
index e83de94ba30..c1aaa3000ac 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/common/cluster/proxy/conf/server.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/common/cluster/proxy/conf/server.yaml
@@ -31,7 +31,7 @@ mode:
rules:
- !AUTHORITY
users:
- - root@:Root@123
+ - proxy@:Proxy@123
provider:
type: ALL_PERMITTED
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/common/standalone/proxy/conf/server.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/common/standalone/proxy/conf/server.yaml
index a479162dd08..8ee889b7c8d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/common/standalone/proxy/conf/server.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/common/standalone/proxy/conf/server.yaml
@@ -31,7 +31,7 @@
rules:
- !AUTHORITY
users:
- - root@:Root@123
+ - proxy@:Proxy@123
provider:
type: ALL_PERMITTED