Merge branch 'dev' into Fix-17817-2

Author: SbloodyS

.github/workflows/api-test.yml

@@ -119,6 +119,8 @@ jobs:
             class: org.apache.dolphinscheduler.api.test.cases.GrpcTaskAPITest
           - name: OidcLoginAPITest
             class: org.apache.dolphinscheduler.api.test.cases.OidcLoginAPITest
+          - name: DependentTaskAPITest
+            class: org.apache.dolphinscheduler.api.test.cases.tasks.DependentTaskAPITest
     env:
       RECORDING_PATH: /tmp/recording-${{ matrix.case.name }}
     steps:
@@ -138,7 +140,7 @@ jobs:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-api-test
           restore-keys: ${{ runner.os }}-maven-
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         name: Download Docker Images
         with:
           name: standalone-image-api-test

.github/workflows/backend.yml

@@ -121,7 +121,7 @@ jobs:
           submodules: true
       - name: Collect Workflow Metrics
         uses: ./.github/actions/actions-workflow-metrics
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         name: Download Binary Package
         with:
           # Only run cluster test on jdk8
@@ -151,7 +151,7 @@ jobs:
       - name: Collect Workflow Metrics
         uses: ./.github/actions/actions-workflow-metrics
       - name: Download Binary Package
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: binary-package-8
           path: ds_schema_check_test/dev

.github/workflows/codeql.yaml

@@ -38,12 +38,12 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v6
       with:
         submodules: true
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v4
       with:
         languages: java
         queries: +security-and-quality
@@ -55,4 +55,4 @@ jobs:
           -Prelease
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v4

.github/workflows/docs.yml

@@ -42,7 +42,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: Set up Python 3.9
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v6
         with:
           python-version: 3.9
       - name: Run Dev Relative Reference

.github/workflows/frontend.yml

@@ -68,7 +68,7 @@ jobs:
         name: Sanity Check
         uses: ./.github/actions/sanity-check
       - name: Set up Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v6
         with:
           node-version: 16
       - name: Code Format Check

dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/cases/tasks/DependentTaskAPITest.java

@@ -48,11 +48,18 @@ public HttpResponse createWorkflowDefinition(User loginUser,
                                                  long projectCode,
                                                  File file,
                                                  String workflowDefinitionName) {
+        String fileContent = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
+        return createWorkflowDefinition(loginUser, projectCode, fileContent, workflowDefinitionName);
+    }
+
+    public HttpResponse createWorkflowDefinition(User loginUser,
+                                                 long projectCode,
+                                                 String jsonContent,
+                                                 String workflowDefinitionName) {
         Map<String, Object> params = new HashMap<>();
         params.put("loginUser", loginUser);
 
-        String fileContent = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
-        Map<String, Object> fileContentMap = JSONUtils.parseObject(fileContent, new TypeReference<>() {
+        Map<String, Object> fileContentMap = JSONUtils.parseObject(jsonContent, new TypeReference<>() {
         });
         if (fileContentMap == null) {
             throw new RuntimeException("file content parse error");

dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/pages/workflow/WorkflowDefinitionPage.java

@@ -0,0 +1,64 @@
+{
+  "taskDefinitionJson": [
+    {
+      "code": 264597693773601,
+      "delayTime": "0",
+      "description": "",
+      "environmentCode": -1,
+      "failRetryInterval": "1",
+      "failRetryTimes": "0",
+      "flag": "YES",
+      "name": "dependent_failed_test",
+      "taskParams": {
+        "localParams": [],
+        "resourceList": [],
+        "dependence": {
+          "relation": "AND",
+          "dependTaskList": [
+            {
+              "relation": "AND",
+              "dependItemList": [
+                {
+                  "projectCode": ${projectCode},
+                  "definitionCode": 999999999999,
+                  "depTaskCode": 0,
+                  "cycle": "day",
+                  "dateValue": "today",
+                  "dependentType": "DEPENDENT_ON_WORKFLOW"
+                }
+              ]
+            }
+          ],
+          "checkInterval": 10,
+          "failurePolicy": "DEPENDENT_FAILURE_FAILURE",
+          "failureWaitingTime": 1
+        }
+      },
+      "taskPriority": "MEDIUM",
+      "taskType": "DEPENDENT",
+      "timeout": 0,
+      "timeoutFlag": "CLOSE",
+      "timeoutNotifyStrategy": "",
+      "workerGroup": "default",
+      "cpuQuota": -1,
+      "memoryMax": -1,
+      "taskExecuteType": "BATCH"
+    }
+  ],
+  "taskRelationJson": [
+    {
+      "name": "",
+      "preTaskCode": 0,
+      "preTaskVersion": 0,
+      "postTaskCode": 264597693773601,
+      "postTaskVersion": 0,
+      "conditionType": "NONE",
+      "conditionParams": {}
+    }
+  ],
+  "name": "dependentFailedWorkflow",
+  "executionType": "PARALLEL",
+  "description": "",
+  "globalParams": [],
+  "timeout": 0
+}

dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/resources/workflow-json/task-dependent/dependentFailedWorkflow.json

@@ -0,0 +1,64 @@
+{
+  "taskDefinitionJson": [
+    {
+      "code": 264597693773600,
+      "delayTime": "0",
+      "description": "",
+      "environmentCode": -1,
+      "failRetryInterval": "1",
+      "failRetryTimes": "0",
+      "flag": "YES",
+      "name": "dependent_success_test",
+      "taskParams": {
+        "localParams": [],
+        "resourceList": [],
+        "dependence": {
+          "relation": "AND",
+          "dependTaskList": [
+            {
+              "relation": "AND",
+              "dependItemList": [
+                {
+                  "projectCode": ${projectCode},
+                  "definitionCode": ${definitionCode},
+                  "depTaskCode": 0,
+                  "cycle": "day",
+                  "dateValue": "today",
+                  "dependentType": "DEPENDENT_ON_WORKFLOW"
+                }
+              ]
+            }
+          ],
+          "checkInterval": 10,
+          "failurePolicy": "DEPENDENT_FAILURE_FAILURE",
+          "failureWaitingTime": 1
+        }
+      },
+      "taskPriority": "MEDIUM",
+      "taskType": "DEPENDENT",
+      "timeout": 0,
+      "timeoutFlag": "CLOSE",
+      "timeoutNotifyStrategy": "",
+      "workerGroup": "default",
+      "cpuQuota": -1,
+      "memoryMax": -1,
+      "taskExecuteType": "BATCH"
+    }
+  ],
+  "taskRelationJson": [
+    {
+      "name": "",
+      "preTaskCode": 0,
+      "preTaskVersion": 0,
+      "postTaskCode": 264597693773600,
+      "postTaskVersion": 0,
+      "conditionType": "NONE",
+      "conditionParams": {}
+    }
+  ],
+  "name": "dependentSuccessWorkflow",
+  "executionType": "PARALLEL",
+  "description": "",
+  "globalParams": [],
+  "timeout": 0
+}