Merge branch 'dev' into Improvement-17942

Author: SbloodyS

README.md

@@ -9,17 +9,17 @@
 ## About
 
 Apache DolphinScheduler is a modern data orchestration platform that empowers agile, low-code development of high-performance workflows.
-It is dedicated to handling complex task dependencies in data pipelines, and provides a wide range of built-in job types ** out of the box**
+It is dedicated to handling complex task dependencies in data pipelines and provides a wide range of built-in job types **out of the box**.
 
 Key features for DolphinScheduler are as follows:
 
-- Easy to deploy, provides four deployment modes including Standalone, Cluster, Docker and Kubernetes.
+- Easy to deploy, providing four deployment modes including Standalone, Cluster, Docker, and Kubernetes.
 - Easy to use, workflows can be created and managed via Web UI, [Python SDK](https://dolphinscheduler.apache.org/python/main/index.html) or Open API
-- Highly reliable and high availability, with a decentralized, multi-master and multi-worker architecture and native supports for horizontal scaling.
+- Highly reliable and high availability, with a decentralized, multi-master and multi-worker architecture and native support for horizontal scaling.
 - High performance, its performance is several times faster than other orchestration platforms, and it is capable of handling tens of millions of tasks per day
-- Cloud Native, DolphinScheduler supports orchestrating workflows cross multiple clouds and data centers, and allows custom task types
+- Cloud Native, DolphinScheduler supports orchestrating workflows across multiple clouds and data centers, and allows custom task types
 - Workflow Versioning, provides version control for both workflows and individual workflow instances, including tasks.
-- Flexible state control of workflows and tasks, supports pause/stop/recover them in any time
+- Flexible state control of workflows and tasks, supports pausing, stopping, and recovering them at any time.
 - Multi-tenancy support
 - Additional features, backfill support(Web UI native), permission control including project and data source etc.
 
@@ -47,7 +47,7 @@ Key features for DolphinScheduler are as follows:
 * **Data source:** Supports multiple external data sources, provides unified data access capabilities for MySQL, PostgreSQL, Hive, Trino, etc.
 ![data-source](images/data-source.png)
 
-* **Monitor:** View the status of the master, worker and database in real time, including server resource usage and load, do quick health check without logging in to the server.
+* **Monitor:** View the status of the master, worker and database in real time, including server resource usage and load, do a quick health check without logging in to the server.
 ![monitor](images/monitor.png)
 
 ## Suggestions & Bug Reports
@@ -57,7 +57,7 @@ Follow [this guide](https://github.com/apache/dolphinscheduler/issues/new/choose
 ## Contributing
 
 The community welcomes contributions from everyone. Please refer to this page to find out more details: [How to contribute](docs/docs/en/contribute/join/contribute.md).
-Check out good first issue in [here](https://github.com/apache/dolphinscheduler/contribute) if you are new to DolphinScheduler.
+Check out good first issues [here](https://github.com/apache/dolphinscheduler/contribute) if you are new to DolphinScheduler.
 
 ## Community
 

README_zh_CN.md

@@ -1,7 +1,7 @@
-# Apache Dolphinscheduler
+# Apache DolphinScheduler
 
 [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
-[![codecov](https://codecov.io/gh/apache/dolphinscheduler/branch/dev/graph/badge.svg)]()
+[![codecov](https://codecov.io/gh/apache/dolphinscheduler/branch/dev/graph/badge.svg)](https://codecov.io/gh/apache/dolphinscheduler)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=apache-dolphinscheduler&metric=alert_status)](https://sonarcloud.io/dashboard?id=apache-dolphinscheduler)
 [![Twitter Follow](https://img.shields.io/twitter/follow/dolphinschedule.svg?style=social&label=Follow)](https://twitter.com/dolphinschedule) <!-- markdown-link-check-disable-line -->
 [![EN doc](https://img.shields.io/badge/document-English-blue.svg)](README.md)
@@ -12,8 +12,8 @@
 
 DolphinScheduler 的主要特性如下：
 
-- 易于部署，提供四种部署方式，包括Standalone、Cluster、Docker和Kubernetes
-- 易于使用，可以通过四种方式创建和管理工作流，包括Web UI、[Python SDK](https://dolphinscheduler.apache.org/python/main/index.html)和Open API
+- 易于部署，提供四种部署方式，包括 Standalone、Cluster、Docker 和 Kubernetes
+- 易于使用，可以通过多种方式创建和管理工作流，包括 Web UI、[Python SDK](https://dolphinscheduler.apache.org/python/main/index.html) 和 Open API
 - 高可靠高可用，多主多从的去中心化架构，原生支持横向扩展
 - 高性能，性能比其他编排平台快N倍，每天可支持千万级任务
 - Cloud Native，DolphinScheduler支持编排多云/数据中心工作流，支持自定义任务类型
@@ -57,7 +57,7 @@ DolphinScheduler 的主要特性如下：
 
 ## 社区
 
-欢迎通过以方式加入社区：
+欢迎通过以下方式加入社区：
 
 - 讨论和提问请通过 [GitHub Issues](https://github.com/apache/dolphinscheduler/issues)
 - 关注 [DolphinScheduler Twitter](https://twitter.com/dolphinschedule) 来获取最新消息 <!-- markdown-link-check-disable-line -->

docs/docs/en/guide/project/workflow-definition.md

@@ -188,6 +188,3 @@ Description of workflow operating parameters:
 - View the Schedule Timing：After the scheduled time goes online, you can check the current timing situation through the "Timing" button<img src="../../../../img/timing.png" width="35"/>. But it cannot be modified, as shown in the below figure.
   ![workflow-time04](../../../../img/new_ui/dev/project/workflow-time04.png)
 
-## Import Workflow
-
-Click `Project Management -> Workflow -> Workflow Definition` to enter the workflow definition page, click the `Import Workflow` button to import the local workflow file, the workflow definition list displays the imported workflow and the status is offline.

docs/docs/en/guide/upgrade/incompatible.md

@@ -40,3 +40,7 @@ This document records the incompatible updates between each version. You need to
 * Refactor the task plugins which use ShellCommandExecutor ([#17790])(https://github.com/apache/dolphinscheduler/pull/17790)
 * Remove the `Pytorch` from the `Task Plugin` ([#17808])(https://github.com/apache/dolphinscheduler/pull/17808), if you are still using this task type, please delete the data with `task_type = 'PYTORCH'` in `t_ds_task_definition` and `t_ds_task_definition_log` before upgrading.
 
+## 3.4.1
+
+* Remove import and export of workflow definition. ([#17940])(https://github.com/apache/dolphinscheduler/issues/17940)
+

docs/docs/zh/guide/project/workflow-definition.md

@@ -170,6 +170,3 @@
 - 查看定时：定时上线后可以通过"定时"按钮<img src="../../../../img/timing.png" width="35"/>，查看当前定时情况。但是不可修改，如图所示。
   ![workflow-time04](../../../../img/new_ui/dev/project/workflow-time04.png)
 
-## 导入工作流
-
-点击项目管理->工作流->工作流定义，进入工作流定义页面，点击"导入工作流"按钮，导入本地工作流文件，工作流定义列表显示导入的工作流，状态为下线。

docs/docs/zh/guide/upgrade/incompatible.md

@@ -44,3 +44,7 @@
 * 重构使用 ShellCommandExecutor 的任务插件 ([#17790])(https://github.com/apache/dolphinscheduler/pull/17790)
 * 从 `任务插件` 中移除 `Pytorch` 类型 ([#17808])(https://github.com/apache/dolphinscheduler/pull/17808)，如果您仍在使用该任务类型，请在升级前删除 `t_ds_task_definition` 和 `t_ds_task_definition_log` 中 `task_type = 'PYTORCH'` 的数据。
 
+## 3.4.1
+
+* 移除导入导出工作流([#17940])(https://github.com/apache/dolphinscheduler/issues/17940)
+

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

@@ -31,9 +31,6 @@
 import org.apache.dolphinscheduler.common.enums.WarningType;
 import org.apache.dolphinscheduler.dao.entity.User;
 
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.util.EntityUtils;
-
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -75,6 +72,8 @@ public class ExecutorAPITest {
 
     private static List<Integer> workflowInstanceIds;
 
+    private static String workflowDefinitionName = "test" + System.currentTimeMillis();
+
     @BeforeAll
     public static void setup() {
         LoginPage loginPage = new LoginPage();
@@ -109,10 +108,9 @@ public void testStartWorkflowInstance() {
             // upload test workflow definition json
             ClassLoader classLoader = getClass().getClassLoader();
             File file = new File(classLoader.getResource("workflow-json/test.json").getFile());
-            CloseableHttpResponse importWorkflowDefinitionResponse = workflowDefinitionPage
-                    .importWorkflowDefinition(loginUser, projectCode, file);
-            String data = EntityUtils.toString(importWorkflowDefinitionResponse.getEntity());
-            Assertions.assertTrue(data.contains("\"success\":true"));
+            HttpResponse createWorkflowDefinitionResponse = workflowDefinitionPage
+                    .createWorkflowDefinition(loginUser, projectCode, file, workflowDefinitionName);
+            Assertions.assertTrue(createWorkflowDefinitionResponse.getBody().getSuccess());
 
             // get workflow definition code
             HttpResponse queryAllWorkflowDefinitionByProjectCodeResponse =

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

@@ -67,6 +67,8 @@ public class SchedulerAPITest {
 
     private static int scheduleId;
 
+    private static String workflowDefinitionName = "test" + System.currentTimeMillis();
+
     @BeforeAll
     public static void setup() {
         LoginPage loginPage = new LoginPage();
@@ -98,7 +100,7 @@ public void testCreateSchedule() {
                 .getBody().getData()).get(0)).get("code");
         ClassLoader classLoader = getClass().getClassLoader();
         File file = new File(classLoader.getResource("workflow-json/test.json").getFile());
-        workflowDefinitionPage.importWorkflowDefinition(loginUser, projectCode, file);
+        workflowDefinitionPage.createWorkflowDefinition(loginUser, projectCode, file, workflowDefinitionName);
         HttpResponse queryAllWorkflowDefinitionByProjectCodeResponse =
                 workflowDefinitionPage.queryAllWorkflowDefinitionByProjectCode(loginUser, projectCode);
         Assertions.assertTrue(queryAllWorkflowDefinitionByProjectCodeResponse.getBody().getSuccess());

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

@@ -28,9 +28,6 @@
 import org.apache.dolphinscheduler.common.enums.UserType;
 import org.apache.dolphinscheduler.dao.entity.User;
 
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.util.EntityUtils;
-
 import java.io.File;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -65,7 +62,9 @@ public class WorkflowDefinitionAPITest {
 
     private static long workflowDefinitionCode;
 
-    private static String workflowDefinitionName;
+    private static String projectName = "project-test" + System.currentTimeMillis();
+
+    private static String workflowDefinitionName = "test" + System.currentTimeMillis();
 
     @BeforeAll
     public static void setup() {
@@ -87,20 +86,20 @@ public static void cleanup() {
 
     @Test
     @Order(1)
-    public void testImportWorkflowDefinition() {
+    public void testCreateWorkflowDefinition() {
         try {
-            HttpResponse createProjectResponse = projectPage.createProject(loginUser, "project-test");
+            projectPage.createProject(loginUser, projectName);
             HttpResponse queryAllProjectListResponse = projectPage.queryAllProjectList(loginUser);
             Assertions.assertTrue(queryAllProjectListResponse.getBody().getSuccess());
 
             projectCode = (long) ((LinkedHashMap<String, Object>) ((List<LinkedHashMap>) queryAllProjectListResponse
                     .getBody().getData()).get(0)).get("code");
             ClassLoader classLoader = getClass().getClassLoader();
             File file = new File(classLoader.getResource("workflow-json/test.json").getFile());
-            CloseableHttpResponse importWorkflowDefinitionResponse = workflowDefinitionPage
-                    .importWorkflowDefinition(loginUser, projectCode, file);
-            String data = EntityUtils.toString(importWorkflowDefinitionResponse.getEntity());
-            Assertions.assertTrue(data.contains("\"success\":true"));
+            HttpResponse createWorkflowDefinitionResponse = workflowDefinitionPage
+                    .createWorkflowDefinition(loginUser, projectCode, file, workflowDefinitionName);
+            Boolean successFlag = createWorkflowDefinitionResponse.getBody().getSuccess();
+            Assertions.assertTrue(successFlag);
         } catch (Exception e) {
             log.error("failed", e);
             Assertions.fail();
@@ -141,7 +140,7 @@ public void testGetWorkflowListByProjectCode() {
         Assertions.assertTrue(getWorkflowListByProjectCodeResponse.getBody().getSuccess());
         Assertions
                 .assertTrue(
-                        getWorkflowListByProjectCodeResponse.getBody().getData().toString().contains("test_import"));
+                        getWorkflowListByProjectCodeResponse.getBody().getData().toString().contains("test"));
     }
 
     @Test
@@ -151,7 +150,7 @@ public void testQueryWorkflowDefinitionByName() {
                 workflowDefinitionPage.queryWorkflowDefinitionByName(loginUser, projectCode, workflowDefinitionName);
         Assertions.assertTrue(queryWorkflowDefinitionByNameResponse.getBody().getSuccess());
         Assertions.assertTrue(
-                queryWorkflowDefinitionByNameResponse.getBody().getData().toString().contains("hello world"));
+                queryWorkflowDefinitionByNameResponse.getBody().getData().toString().contains(workflowDefinitionName));
     }
 
     @Test

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

@@ -35,9 +35,6 @@
 import org.apache.dolphinscheduler.common.enums.WarningType;
 import org.apache.dolphinscheduler.dao.entity.User;
 
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.util.EntityUtils;
-
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -83,6 +80,10 @@ public class WorkflowInstanceAPITest {
 
     private static int workflowInstanceId;
 
+    private static String projectName = "project-test" + System.currentTimeMillis();
+
+    private static String workflowDefinitionName = "test" + System.currentTimeMillis();
+
     @BeforeAll
     public static void setup() {
         LoginPage loginPage = new LoginPage();
@@ -109,7 +110,7 @@ public static void cleanup() {
     public void testQueryWorkflowInstancesByWorkflowInstanceId() {
         try {
             // create test project
-            HttpResponse createProjectResponse = projectPage.createProject(loginUser, "project-test");
+            HttpResponse createProjectResponse = projectPage.createProject(loginUser, projectName);
             HttpResponse queryAllProjectListResponse = projectPage.queryAllProjectList(loginUser);
             assertTrue(queryAllProjectListResponse.getBody().getSuccess());
             projectCode = (long) ((LinkedHashMap<String, Object>) ((List<LinkedHashMap>) queryAllProjectListResponse
@@ -118,10 +119,9 @@ public void testQueryWorkflowInstancesByWorkflowInstanceId() {
             // upload test workflow definition json
             ClassLoader classLoader = getClass().getClassLoader();
             File file = new File(classLoader.getResource("workflow-json/test.json").getFile());
-            CloseableHttpResponse importWorkflowDefinitionResponse = workflowDefinitionPage
-                    .importWorkflowDefinition(loginUser, projectCode, file);
-            String data = EntityUtils.toString(importWorkflowDefinitionResponse.getEntity());
-            assertTrue(data.contains("\"success\":true"));
+            HttpResponse createWorkflowDefinitionResponse = workflowDefinitionPage
+                    .createWorkflowDefinition(loginUser, projectCode, file, workflowDefinitionName);
+            assertTrue(createWorkflowDefinitionResponse.getBody().getSuccess());
 
             // get workflow definition code
             HttpResponse queryAllWorkflowDefinitionByProjectCodeResponse =
@@ -176,7 +176,7 @@ public void testQueryWorkflowInstanceList() {
         HttpResponse queryWorkflowInstanceListResponse =
                 workflowInstancePage.queryWorkflowInstanceList(loginUser, projectCode, 1, 10);
         assertTrue(queryWorkflowInstanceListResponse.getBody().getSuccess());
-        assertTrue(queryWorkflowInstanceListResponse.getBody().getData().toString().contains("test_import"));
+        assertTrue(queryWorkflowInstanceListResponse.getBody().getData().toString().contains(workflowDefinitionName));
     }
 
     @Test
@@ -185,7 +185,8 @@ public void testQueryTaskListByWorkflowInstanceId() {
         HttpResponse queryTaskListByWorkflowInstanceIdResponse =
                 workflowInstancePage.queryTaskListByWorkflowInstanceId(loginUser, projectCode, workflowInstanceId);
         assertTrue(queryTaskListByWorkflowInstanceIdResponse.getBody().getSuccess());
-        assertTrue(queryTaskListByWorkflowInstanceIdResponse.getBody().getData().toString().contains("test_import"));
+        assertTrue(queryTaskListByWorkflowInstanceIdResponse.getBody().getData().toString()
+                .contains(workflowDefinitionName));
     }
 
     @Test
@@ -194,7 +195,7 @@ public void testQueryWorkflowInstanceById() {
         HttpResponse queryWorkflowInstanceByIdResponse =
                 workflowInstancePage.queryWorkflowInstanceById(loginUser, projectCode, workflowInstanceId);
         assertTrue(queryWorkflowInstanceByIdResponse.getBody().getSuccess());
-        assertTrue(queryWorkflowInstanceByIdResponse.getBody().getData().toString().contains("test_import"));
+        assertTrue(queryWorkflowInstanceByIdResponse.getBody().getData().toString().contains(workflowDefinitionName));
     }
 
     @Test
@@ -208,7 +209,8 @@ public void testDeleteWorkflowInstanceById() {
                 workflowInstancePage.queryWorkflowInstanceList(loginUser, projectCode, 1, 10);
         assertTrue(queryWorkflowInstanceListResponse.getBody().getSuccess());
         Assertions
-                .assertFalse(queryWorkflowInstanceListResponse.getBody().getData().toString().contains("test_import"));
+                .assertFalse(queryWorkflowInstanceListResponse.getBody().getData().toString()
+                        .contains(workflowDefinitionName));
     }
 
 }