Merge branch 'dev' into Fix-14397

apache · Jun 29, 2023 · 6c9d677 · 6c9d677
2 parents 6549956 + ab834b3
commit 6c9d677
Show file tree

Hide file tree

Showing 123 changed files with 1,329 additions and 743 deletions.
diff --git a/.github/workflows/api-test.yml b/.github/workflows/api-test.yml
@@ -92,6 +92,8 @@ jobs:
             class: org.apache.dolphinscheduler.api.test.cases.TenantAPITest
           - name: WorkerGroup
             class: org.apache.dolphinscheduler.api.test.cases.WorkerGroupAPITest
+          - name: Project
+            class: org.apache.dolphinscheduler.api.test.cases.ProjectAPITest
     env:
       RECORDING_PATH: /tmp/recording-${{ matrix.case.name }}
     steps:

diff --git a/docs/configs/docsdev.js b/docs/configs/docsdev.js
@@ -347,6 +347,10 @@ export default {
                                 title: 'Databend',
                                 link: '/en-us/docs/dev/user_doc/guide/datasource/databend.html',
                             },
+                            {
+                                title: 'HANA',
+                                link: '/en-us/docs/dev/user_doc/guide/datasource/hana.html',
+                            }
                         ],
                     },
                     {
@@ -1044,6 +1048,10 @@ export default {
                                 title: 'Databend',
                                 link: '/zh-cn/docs/dev/user_doc/guide/datasource/databend.html',
                             },
+                            {
+                                title: 'HANA',
+                                link: '/zh-cn/docs/dev/user_doc/guide/datasource/hana.html',
+                            }
                         ],
                     },
                     {

diff --git a/docs/docs/en/contribute/api-test.md b/docs/docs/en/contribute/api-test.md
@@ -80,7 +80,7 @@ When the preparation is complete, it is time for the formal test case writing. W
 
 The rest are similar cases and can be understood by referring to the specific source code.
 
-https://github.com/apache/dolphinscheduler/tree/dev/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api.test/cases
+https://github.com/apache/dolphinscheduler/tree/dev/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/cases
 
 ## Supplements
 

diff --git a/docs/docs/en/guide/datasource/hana.md b/docs/docs/en/guide/datasource/hana.md
@@ -0,0 +1,22 @@
+# HANA
+
+![hana](../../../../img/new_ui/dev/datasource/hana.png)
+
+## Datasource Parameters
+
+|       **Datasource**       |                     **Description**                     |
+|----------------------------|---------------------------------------------------------|
+| Datasource                 | Select HANA.                                            |
+| Datasource name            | Enter the name of the DataSource.                       |
+| Description                | Enter a description of the DataSource.                  |
+| IP/Host Name               | Enter the HANA service IP.                              |
+| Port                       | Enter the HANA service port.                            |
+| Username                   | Set the username for HANA connection.                   |
+| Password                   | Set the password for HANA connection.                   |
+| Database name              | Enter the database name of the HANA connection.         |
+| Jdbc connection parameters | Parameter settings for HANA connection, in JSON format. |
+
+## Native Supported
+
+No, read section example in [datasource-setting](../howto/datasource-setting.md) `DataSource Center` section to activate this datasource.
+
diff --git a/docs/docs/en/guide/upgrade/incompatible.md b/docs/docs/en/guide/upgrade/incompatible.md
@@ -9,6 +9,10 @@ This document records the incompatible updates between each version. You need to
 * Change the default unix shell executor from sh to bash ([#12180](https://github.com/apache/dolphinscheduler/pull/12180)).
 * Remove `deleteSource` in `download()` of `StorageOperate` ([#14084](https://github.com/apache/dolphinscheduler/pull/14084))
 
+## 3.2.0
+
+* Remove parameter `description` from public interfaces of new resource center  ([#14394](https://github.com/apache/dolphinscheduler/pull/14394))
+
 ## 3.0.0
 
 * Copy and import workflow without 'copy' suffix [#10607](https://github.com/apache/dolphinscheduler/pull/10607)

diff --git a/docs/docs/zh/contribute/api-test.md b/docs/docs/zh/contribute/api-test.md
@@ -80,7 +80,7 @@ public final class LoginPage {
 
 其余的都是类似的情况，可参考具体的源码来理解。
 
-https://github.com/apache/dolphinscheduler/tree/dev/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api.test/cases
+https://github.com/apache/dolphinscheduler/tree/dev/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/cases
 
 ## 补充
 

diff --git a/docs/docs/zh/guide/datasource/hana.md b/docs/docs/zh/guide/datasource/hana.md
@@ -0,0 +1,17 @@
+# HANA 数据源
+
+![hana](../../../../img/new_ui/dev/datasource/hana.png)
+
+- 数据源：选择 HANA
+- 数据源名称：输入数据源的名称
+- 描述：输入数据源的描述
+- IP 主机名：输入连接 HANA 的 IP
+- 端口：输入连接 HANA 的端口
+- 用户名：设置连接 HANA 的用户名
+- 密码：设置连接 HANA 的密码
+- 数据库名：输入连接 HANA 的数据库名称
+- Jdbc 连接参数：用于 HANA 连接的参数设置，以 JSON 形式填写
+
+## 是否原生支持
+
+否，使用前需请参考 [数据源配置](../howto/datasource-setting.md) 中的 "数据源中心" 章节激活数据源。
diff --git a/docs/docs/zh/guide/upgrade/incompatible.md b/docs/docs/zh/guide/upgrade/incompatible.md
@@ -9,6 +9,10 @@
 * Change the default unix shell executor from sh to bash ([#12180](https://github.com/apache/dolphinscheduler/pull/12180)).
 * Remove `deleteSource` in `download()` of `StorageOperate` ([#14084](https://github.com/apache/dolphinscheduler/pull/14084))
 
+## 3.2.0
+
+* 资源中心相关接口删除请求参数 `description` ([#14394](https://github.com/apache/dolphinscheduler/pull/14394))
+
 ## 3.0.0
 
 * Copy and import workflow without 'copy' suffix [#10607](https://github.com/apache/dolphinscheduler/pull/10607)

diff --git a/docs/img/new_ui/dev/datasource/hana.png b/docs/img/new_ui/dev/datasource/hana.png
diff --git a/...n/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannelFactory.java b/...n/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannelFactory.java
@@ -25,7 +25,6 @@
 import org.apache.dolphinscheduler.alert.api.AlertChannel;
 import org.apache.dolphinscheduler.alert.api.AlertChannelFactory;
 import org.apache.dolphinscheduler.alert.api.AlertInputTips;
-import org.apache.dolphinscheduler.spi.params.PasswordParam;
 import org.apache.dolphinscheduler.spi.params.base.DataType;
 import org.apache.dolphinscheduler.spi.params.base.ParamsOptions;
 import org.apache.dolphinscheduler.spi.params.base.PluginParams;
@@ -136,9 +135,10 @@ public List<PluginParams> params() {
                         .setRequired(false)
                         .build())
                 .build();
-        PasswordParam passwordParam = PasswordParam
+        InputParam passwordParam = InputParam
                 .newBuilder(DingTalkParamsConstants.NAME_DING_TALK_PASSWORD, DingTalkParamsConstants.DING_TALK_PASSWORD)
                 .setPlaceholder(AlertInputTips.PASSWORD.getMsg())
+                .setType("password")
                 .build();
 
         return Arrays.asList(webHookParam, keywordParam, secretParam, msgTypeParam, atMobilesParam, atUserIdsParam,

diff --git a/...rc/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactory.java b/...rc/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactory.java
@@ -27,7 +27,6 @@
 import org.apache.dolphinscheduler.alert.api.AlertConstants;
 import org.apache.dolphinscheduler.alert.api.AlertInputTips;
 import org.apache.dolphinscheduler.alert.api.ShowType;
-import org.apache.dolphinscheduler.spi.params.PasswordParam;
 import org.apache.dolphinscheduler.spi.params.base.DataType;
 import org.apache.dolphinscheduler.spi.params.base.ParamsOptions;
 import org.apache.dolphinscheduler.spi.params.base.PluginParams;
@@ -97,9 +96,10 @@ public List<PluginParams> params() {
                 .setPlaceholder(AlertInputTips.USERNAME.getMsg())
                 .build();
 
-        PasswordParam mailPassword =
-                PasswordParam.newBuilder(MailParamsConstants.NAME_MAIL_PASSWD, MailParamsConstants.MAIL_PASSWD)
+        InputParam mailPassword =
+                InputParam.newBuilder(MailParamsConstants.NAME_MAIL_PASSWD, MailParamsConstants.MAIL_PASSWD)
                         .setPlaceholder(AlertInputTips.PASSWORD.getMsg())
+                        .setType("password")
                         .build();
 
         RadioParam enableTls = RadioParam

diff --git a/...l/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelTest.java b/...l/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelTest.java
@@ -23,7 +23,6 @@
 import org.apache.dolphinscheduler.alert.api.AlertResult;
 import org.apache.dolphinscheduler.alert.api.ShowType;
 import org.apache.dolphinscheduler.common.utils.JSONUtils;
-import org.apache.dolphinscheduler.spi.params.PasswordParam;
 import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
 import org.apache.dolphinscheduler.spi.params.base.ParamsOptions;
 import org.apache.dolphinscheduler.spi.params.base.PluginParams;
@@ -107,9 +106,8 @@ public String getEmailAlertParams() {
                 .setValue("[email protected]")
                 .build();
 
-        PasswordParam mailPassword = PasswordParam.newBuilder(MailParamsConstants.NAME_MAIL_PASSWD, "passwd")
+        InputParam mailPassword = InputParam.newBuilder(MailParamsConstants.NAME_MAIL_PASSWD, "passwd")
                 .setPlaceholder("if enable use authentication, you need input password")
-                .setValue("escheduler123")
                 .build();
 
         RadioParam enableTls =

diff --git a/.../main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannelFactory.java b/.../main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannelFactory.java
@@ -25,7 +25,6 @@
 import org.apache.dolphinscheduler.alert.api.AlertChannel;
 import org.apache.dolphinscheduler.alert.api.AlertChannelFactory;
 import org.apache.dolphinscheduler.alert.api.AlertInputTips;
-import org.apache.dolphinscheduler.spi.params.PasswordParam;
 import org.apache.dolphinscheduler.spi.params.base.DataType;
 import org.apache.dolphinscheduler.spi.params.base.ParamsOptions;
 import org.apache.dolphinscheduler.spi.params.base.PluginParams;
@@ -85,9 +84,10 @@ public List<PluginParams> params() {
                         .addValidate(Validate.newBuilder()
                                 .setRequired(false).build())
                         .build();
-        PasswordParam passwordParam = PasswordParam
+        InputParam passwordParam = InputParam
                 .newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_PASSWORD, FeiShuParamsConstants.FEI_SHU_PASSWORD)
                 .setPlaceholder(AlertInputTips.PASSWORD.getMsg())
+                .setType("password")
                 .build();
 
         return Arrays.asList(webHookParam, isEnableProxy, proxyParam, portParam, userParam, passwordParam);

diff --git a/...n/java/org/apache/dolphinscheduler/plugin/alert/telegram/TelegramAlertChannelFactory.java b/...n/java/org/apache/dolphinscheduler/plugin/alert/telegram/TelegramAlertChannelFactory.java
@@ -25,7 +25,6 @@
 import org.apache.dolphinscheduler.alert.api.AlertChannel;
 import org.apache.dolphinscheduler.alert.api.AlertChannelFactory;
 import org.apache.dolphinscheduler.alert.api.AlertInputTips;
-import org.apache.dolphinscheduler.spi.params.PasswordParam;
 import org.apache.dolphinscheduler.spi.params.base.DataType;
 import org.apache.dolphinscheduler.spi.params.base.ParamsOptions;
 import org.apache.dolphinscheduler.spi.params.base.PluginParams;
@@ -131,12 +130,13 @@ public List<PluginParams> params() {
                                 .build())
                         .build();
 
-        PasswordParam passwordParam = PasswordParam
+        InputParam passwordParam = InputParam
                 .newBuilder(TelegramParamsConstants.NAME_TELEGRAM_PASSWORD, TelegramParamsConstants.TELEGRAM_PASSWORD)
                 .addValidate(Validate.newBuilder()
                         .setRequired(false)
                         .build())
                 .setPlaceholder("if enable use authentication, you need input password")
+                .setType("password")
                 .build();
 
         return Arrays.asList(webHookParam, botTokenParam, chatIdParam, parseMode, isEnableProxy, proxyParam, portParam,

diff --git a/dolphinscheduler-api-test/README.md b/dolphinscheduler-api-test/README.md
@@ -9,7 +9,7 @@ Every page of DolphinScheduler's api is abstracted into a class for better maint
 ### Example
 
 The login page's api is abstracted
-as [`LoginPage`](dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api.test/pages/LoginPage.java)
+as [`LoginPage`](dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/pages/LoginPage.java)
 , with the following fields,
 
 ```java