Merge branch 'dev' into Fix-17817-2

Author: SbloodyS

.github/workflows/backend.yml

@@ -136,7 +136,6 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     strategy:
-      fail-fast: false
       matrix:
         version: ["3.1.9", "3.2.0", "3.3.1"]
         case:

.github/workflows/unit-test.yml

@@ -49,6 +49,18 @@ jobs:
             not-ignore:
               - '!(docs/**)'
 
+  sanity-check:
+    name: Sanity Check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          submodules: true
+      - name: Sanity Check
+        uses: ./.github/actions/sanity-check
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
   generate-matrix:
     name: Generate Module Matrix
     runs-on: ubuntu-latest
@@ -84,11 +96,10 @@ jobs:
 
   unit-test:
     name: Unit-Test (${{ matrix.module }} | Java ${{ matrix.java }})
-    needs: [ paths-filter, generate-matrix ]
+    needs: [ paths-filter, generate-matrix, sanity-check ]
     if: ${{ (needs.paths-filter.outputs.not-ignore == 'true') || (github.event_name == 'push') }}
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: false
       matrix:
         java: [ '8', '11' ]
         module: ${{ fromJSON(needs.generate-matrix.outputs.matrix).module }}
@@ -101,11 +112,6 @@ jobs:
       - name: Collect Workflow Metrics
         uses: ./.github/actions/actions-workflow-metrics
 
-      - name: Sanity Check
-        uses: ./.github/actions/sanity-check
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v5
         with:
@@ -264,7 +270,7 @@ jobs:
     name: Unit Test
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: [ unit-test, paths-filter, sonar ]
+    needs: [ unit-test, paths-filter, sonar, sanity-check ]
     if: always()
     steps:
       - name: Status
@@ -273,6 +279,10 @@ jobs:
             echo "Skip Unit Test!"
             exit 0
           fi
+          if [[ ${{ needs.sanity-check.result }} != 'success' ]]; then
+            echo "Sanity Check Failed!"
+            exit -1
+          fi
           if [[ ${{ needs.unit-test.result }} != 'success' ]]; then
             echo "Unit Test Failed!"
             exit -1

dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-aliyunVoice/src/main/java/org/apache/dolphinscheduler/plugin/alert/voice/VoiceAlertConstants.java

@@ -43,11 +43,6 @@ public class VoiceAlertConstants {
      * tts Code
      */
     static final String TTS_CODE = "$t('ttsCode')";
-    /**
-     * tts Param
-     */
-    static final String TTS_PARAM = "ttsParam";
-
     /**
      * address
      */

dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertInputTips.java

@@ -31,8 +31,6 @@ public enum AlertInputTips {
     URL("input request URL", "请输入请求的URL"),
     HEADER("input request headers as JSON format", "请输入JSON格式的请求头"),
     JSON_BODY("input request body as JSON format", "请输入JSON格式的请求体"),
-    FIELD_NAME("input alert msg field name", "请输入告警信息的内容字段名称"),
-    HTTP_METHOD("input request type POST or GET", "请输入HTTP请求类型POST或GET"),
     CUSTOMIZED_PARAMS("the custom parameters passed when calling scripts", "请输入调用脚本时传入的自定义参数"),
     SCRIPT_PATH("the absolute script path under alert-server, and make sure access rights",
             "请输入alert-server机器的脚本的绝对路径，并确保文件有权接入"),

dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailParamsConstants.java

@@ -25,8 +25,6 @@ public final class MailParamsConstants {
     public static final String PLUGIN_DEFAULT_EMAIL_RECEIVERCCS = "$t('receiverCcs')";
     public static final String NAME_PLUGIN_DEFAULT_EMAIL_RECEIVERCCS = "receiverCcs";
 
-    public static final String NAME_MAIL_PROTOCOL = "mail.protocol";
-
     public static final String MAIL_SMTP_HOST = "mail.smtp.host";
     public static final String NAME_MAIL_SMTP_HOST = "serverHost";
 

dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/MailUtilsTest.java

@@ -44,7 +44,7 @@ public class MailUtilsTest {
 
     @BeforeAll
     public static void initEmailConfig() {
-        emailConfig.put(MailParamsConstants.NAME_MAIL_PROTOCOL, "smtp");
+        emailConfig.put("mail.protocol", "smtp");
         emailConfig.put(MailParamsConstants.NAME_MAIL_SMTP_HOST, "xxx.xxx.com");
         emailConfig.put(MailParamsConstants.NAME_MAIL_SMTP_PORT, "25");
         emailConfig.put(MailParamsConstants.NAME_MAIL_SENDER, "xxx1.xxx.com");

dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertConstants.java

@@ -38,10 +38,6 @@ public final class HttpAlertConstants {
 
     public static final String NAME_BODY_PARAMS = "bodyParams";
 
-    public static final String CONTENT_FIELD = "$t('contentField')";
-
-    public static final String NAME_CONTENT_FIELD = "contentField";
-
     public static final String REQUEST_TYPE = "$t('requestType')";
 
     public static final String NAME_REQUEST_TYPE = "requestType";

dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertConstants.java

@@ -33,12 +33,8 @@ public final class WeChatAlertConstants {
 
     static final String WE_CHAT_CONTENT_KEY = "content";
 
-    static final String WE_CHAT_MESSAGE_TYPE_TEXT = "text";
-
     static final Integer WE_CHAT_MESSAGE_SAFE_PUBLICITY = 0;
 
-    static final Integer WE_CHAT_MESSAGE_SAFE_PRIVACY = 1;
-
     static final Integer WE_CHAT_ENABLE_ID_TRANS = 0;
 
     static final Integer WE_CHAT_DUPLICATE_CHECK_INTERVAL_ZERO = 0;

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java

@@ -225,7 +225,7 @@ public Result<Boolean> connectDataSource(@Parameter(hidden = true) @RequestAttri
      *
      * @param loginUser login user
      * @param id data source id
-     * @return connect result code
+     * @return A Result wrapping {@code true} if the connection is successful; otherwise, throws an exception.
      */
     @Operation(summary = "connectionTest", description = "CONNECT_DATA_SOURCE_TEST_NOTES")
     @Parameters({
@@ -236,7 +236,7 @@ public Result<Boolean> connectDataSource(@Parameter(hidden = true) @RequestAttri
     @ApiException(CONNECTION_TEST_FAILURE)
     public Result<Boolean> connectionTest(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                           @PathVariable("id") int id) {
-        dataSourceService.connectionTest(id);
+        dataSourceService.connectionTest(loginUser, id);
         return Result.success(true);
     }
 
@@ -337,6 +337,14 @@ public Result<Object> getKerberosStartupState(@Parameter(hidden = true) @Request
         return success(Status.SUCCESS.getMsg(), CommonUtils.getKerberosStartupState());
     }
 
+    /**
+     * Retrieves the list of tables within a specific database of a data source.
+     *
+     * @param loginUser the current logged-in user (injected from session)
+     * @param datasourceId the unique identifier of the data source
+     * @param database the name of the database to query
+     * @return a list of table names/options accessible to the user
+     */
     @Operation(summary = "tables", description = "GET_DATASOURCE_TABLES_NOTES")
     @Parameters({
             @Parameter(name = "datasourceId", description = "DATA_SOURCE_ID", required = true, schema = @Schema(implementation = int.class, example = "1")),
@@ -345,37 +353,56 @@ public Result<Object> getKerberosStartupState(@Parameter(hidden = true) @Request
     @GetMapping(value = "/tables")
     @ResponseStatus(HttpStatus.OK)
     @ApiException(GET_DATASOURCE_TABLES_ERROR)
-    public Result<Object> getTables(@RequestParam("datasourceId") Integer datasourceId,
-                                    @RequestParam(value = "database") String database) {
-        List<ParamsOptions> options = dataSourceService.getTables(datasourceId, database);
+    public Result<Object> getTables(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+                                    @RequestParam("datasourceId") Integer datasourceId,
+                                    @RequestParam("database") String database) {
+        List<ParamsOptions> options = dataSourceService.getTables(loginUser, datasourceId, database);
         return Result.success(options);
     }
 
+    /**
+     * Retrieves the column details (schema) for a specific table.
+     *
+     * @param loginUser the current logged-in user (injected from session)
+     * @param datasourceId the unique identifier of the data source
+     * @param database the name of the database containing the table
+     * @param tableName the name of the table to query columns for
+     * @return a list of column definitions (name, type, etc.) for the specified table
+     */
     @Operation(summary = "tableColumns", description = "GET_DATASOURCE_TABLE_COLUMNS_NOTES")
     @Parameters({
             @Parameter(name = "datasourceId", description = "DATA_SOURCE_ID", required = true, schema = @Schema(implementation = int.class, example = "1")),
-            @Parameter(name = "tableName", description = "TABLE_NAME", required = true, schema = @Schema(implementation = String.class, example = "test")),
-            @Parameter(name = "database", description = "DATABASE", required = true, schema = @Schema(implementation = String.class, example = "test"))
+            @Parameter(name = "database", description = "DATABASE", required = true, schema = @Schema(implementation = String.class, example = "test")),
+            @Parameter(name = "tableName", description = "TABLE_NAME", required = true, schema = @Schema(implementation = String.class, example = "test"))
     })
     @GetMapping(value = "/tableColumns")
     @ResponseStatus(HttpStatus.OK)
     @ApiException(GET_DATASOURCE_TABLE_COLUMNS_ERROR)
-    public Result<Object> getTableColumns(@RequestParam("datasourceId") Integer datasourceId,
-                                          @RequestParam("tableName") String tableName,
-                                          @RequestParam(value = "database") String database) {
-        List<ParamsOptions> options = dataSourceService.getTableColumns(datasourceId, database, tableName);
+    public Result<Object> getTableColumns(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+                                          @RequestParam("datasourceId") Integer datasourceId,
+                                          @RequestParam("database") String database,
+                                          @RequestParam("tableName") String tableName) {
+        List<ParamsOptions> options = dataSourceService.getTableColumns(loginUser, datasourceId, database, tableName);
         return Result.success(options);
     }
 
+    /**
+     * Retrieves the list of databases available in a specific data source.
+     *
+     * @param loginUser the current logged-in user (injected from session)
+     * @param datasourceId the unique identifier of the data source
+     * @return a list of database names/options accessible to the user
+     */
     @Operation(summary = "databases", description = "GET_DATASOURCE_DATABASE_NOTES")
     @Parameters({
             @Parameter(name = "datasourceId", description = "DATA_SOURCE_ID", required = true, schema = @Schema(implementation = int.class, example = "1"))
     })
     @GetMapping(value = "/databases")
     @ResponseStatus(HttpStatus.OK)
     @ApiException(GET_DATASOURCE_DATABASES_ERROR)
-    public Result<Object> getDatabases(@RequestParam("datasourceId") Integer datasourceId) {
-        List<ParamsOptions> options = dataSourceService.getDatabases(datasourceId);
+    public Result<Object> getDatabases(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+                                       @RequestParam("datasourceId") Integer datasourceId) {
+        List<ParamsOptions> options = dataSourceService.getDatabases(loginUser, datasourceId);
         return Result.success(options);
     }
 }