This is an automated email from the ASF dual-hosted git repository.
caishunfeng pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 32f76e487f [fix-9428] [DataSource] delete the password and test again,
it is successful without password bug (#9428) (#9531)
32f76e487f is described below
commit 32f76e487f1d022d248e494c6bc624f09091761b
Author: wqxs <[email protected]>
AuthorDate: Mon Apr 18 20:46:37 2022 +0800
[fix-9428] [DataSource] delete the password and test again, it is
successful without password bug (#9428) (#9531)
* fix bug: After the test data source is successful, delete the password,
re-test, or success
* Modify the method of generating DatasourceUniqueId
---
.../datasource/api/datasource/AbstractDataSourceProcessor.java | 3 ++-
.../api/datasource/mysql/MySQLDataSourceProcessorTest.java | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/AbstractDataSourceProcessor.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/AbstractDataSourceProcessor.java
index d517edf3c9..04c619d955 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/AbstractDataSourceProcessor.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/AbstractDataSourceProcessor.java
@@ -17,6 +17,7 @@
package org.apache.dolphinscheduler.plugin.datasource.api.datasource;
+import org.apache.dolphinscheduler.plugin.datasource.api.utils.PasswordUtils;
import org.apache.dolphinscheduler.spi.datasource.BaseConnectionParam;
import org.apache.dolphinscheduler.spi.datasource.ConnectionParam;
import org.apache.dolphinscheduler.spi.enums.DbType;
@@ -84,6 +85,6 @@ public abstract class AbstractDataSourceProcessor implements
DataSourceProcessor
@Override
public String getDatasourceUniqueId(ConnectionParam connectionParam,
DbType dbType) {
BaseConnectionParam baseConnectionParam = (BaseConnectionParam)
connectionParam;
- return MessageFormat.format("{0}@{1}@{2}", dbType.getDescp(),
baseConnectionParam.getUser(), baseConnectionParam.getJdbcUrl());
+ return MessageFormat.format("{0}@{1}@{2}@{3}", dbType.getDescp(),
baseConnectionParam.getUser(),
PasswordUtils.encodePassword(baseConnectionParam.getPassword()),
baseConnectionParam.getJdbcUrl());
}
}
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/mysql/MySQLDataSourceProcessorTest.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/mysql/MySQLDataSourceProcessorTest.java
index 18b05ce1c0..b3c3f11fd4 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/mysql/MySQLDataSourceProcessorTest.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/mysql/MySQLDataSourceProcessorTest.java
@@ -99,6 +99,9 @@ public class MySQLDataSourceProcessorTest {
MySQLConnectionParam mysqlConnectionParam = new MySQLConnectionParam();
mysqlConnectionParam.setJdbcUrl("jdbc:mysql://localhost:3306/default");
mysqlConnectionParam.setUser("root");
- Assert.assertEquals("mysql@root@jdbc:mysql://localhost:3306/default",
mysqlDatasourceProcessor.getDatasourceUniqueId(mysqlConnectionParam,
DbType.MYSQL));
+ mysqlConnectionParam.setPassword("123456");
+ PowerMockito.mockStatic(PasswordUtils.class);
+
PowerMockito.when(PasswordUtils.encodePassword(Mockito.anyString())).thenReturn("123456");
+
Assert.assertEquals("mysql@root@123456@jdbc:mysql://localhost:3306/default",
mysqlDatasourceProcessor.getDatasourceUniqueId(mysqlConnectionParam,
DbType.MYSQL));
}
}
\ No newline at end of file
