diff --git a/docs/docs/en/guide/task/seatunnel.md b/docs/docs/en/guide/task/seatunnel.md new file mode 100644 index 0000000000..e748360665 --- /dev/null +++ b/docs/docs/en/guide/task/seatunnel.md @@ -0,0 +1,82 @@ +# Apache SeaTunnel + +## Overview + +`SeaTunnel` task type for creating and executing `SeaTunnel` tasks. When the worker executes this task, it will parse the config file through the `start-seatunnel-spark.sh` or `start-seatunnel-flink.sh` command. +Click [here](https://seatunnel.apache.org/) for more information about `Apache SeaTunnel`. + +## Create Task + +- Click Project Management -> Project Name -> Workflow Definition, and click the "Create Workflow" button to enter the DAG editing page. +- Drag the from the toolbar to the drawing board. + +## Task Parameter + +- Node name: The node name in a workflow definition is unique. +- Run flag: Identifies whether this node can be scheduled normally, if it does not need to be executed, you can turn on the prohibition switch. +- Descriptive information: describe the function of the node. +- Task priority: When the number of worker threads is insufficient, they are executed in order from high to low, and when the priority is the same, they are executed according to the first-in first-out principle. +- Worker grouping: Tasks are assigned to the machines of the worker group to execute. If Default is selected, a worker machine will be randomly selected for execution. +- Environment Name: Configure the environment name in which to run the script. +- Number of failed retry attempts: The number of times the task failed to be resubmitted. +- Failed retry interval: The time, in cents, interval for resubmitting the task after a failed task. +- Cpu quota: Assign the specified CPU time quota to the task executed. Takes a percentage value. Default -1 means unlimited. For example, the full CPU load of one core is 100%,and that of 16 cores is 1600%. This function is controlled by [task.resource.limit.state](../../architecture/configuration.md) +- Max memory：Assign the specified max memory to the task executed. Exceeding this limit will trigger oom to be killed and will not automatically retry. Takes an MB value. Default -1 means unlimited. This function is controlled by [task.resource.limit.state](../../architecture/configuration.md) +- Delayed execution time: The time, in cents, that a task is delayed in execution. +- Timeout alarm: Check the timeout alarm and timeout failure. When the task exceeds the "timeout period", an alarm email will be sent and the task execution will fail. +- Engine: Supports FLINK and SPARK + - FLINK + - Run model: supports `run` and `run-application` modes + - Option parameters: used to add the parameters of the Flink engine, such as `-m yarn-cluster -ynm seatunnel` + - SPARK + - Deployment mode: specify the deployment mode, `cluster` `client` `local` + - Master: Specify the `Master` model, `yarn` `local` `spark` `mesos`, where `spark` and `mesos` need to specify the `Master` service address, for example: 127.0.0.1:7077 + > Click [here](https://seatunnel.apache.org/docs/2.1.2/command/usage) for more information on the usage of `Apache SeaTunnel command` +- Custom Configuration: Supports custom configuration or select configuration file from Resource Center + > Click [here](https://seatunnel.apache.org/docs/2.1.2/concept/config) for more information about `Apache SeaTunnel config` file +- Script: Customize configuration information on the task node, including four parts: `env` `source` `transform` `sink` +- Resource file: The configuration file of the resource center can be referenced in the task node, and only one configuration file can be referenced. +- Predecessor task: Selecting a predecessor task for the current task will set the selected predecessor task as upstream of the current task. + +## Task Example + +This sample demonstrates using the Flink engine to read data from a Fake source and print to the console. + +### Configuring the SeaTunnel environment in DolphinScheduler + +If you want to use the SeaTunnel task type in the production environment, you need to configure the required environment first. The configuration file is as follows: `/dolphinscheduler/conf/env/dolphinscheduler_env.sh`. + +![seatunnel_task01](../../../../img/tasks/demo/seatunnel_task01.png) + +### Configuring SeaTunnel Task Node + +According to the above parameter description, configure the required content. + +![seatunnel_task02](../../../../img/tasks/demo/seatunnel_task02.png) + +### Config example + +```Config + +env { + execution.parallelism = 1 +} + +source { + FakeSource { + result_table_name = "fake" + field_name = "name,age" + } +} + +transform { + sql { + sql = "select name,age from fake" + } +} + +sink { + ConsoleSink {} +} + +``` diff --git a/docs/docs/en/guide/task/stored-procedure.md b/docs/docs/en/guide/task/stored-procedure.md index 5f307878df..5aff75207c 100644 --- a/docs/docs/en/guide/task/stored-procedure.md +++ b/docs/docs/en/guide/task/stored-procedure.md @@ -5,7 +5,7 @@ > Drag from the toolbar ![PNG](https://analysys.github.io/easyscheduler_docs_cn/images/toolbar_PROCEDURE.png) task node into the canvas, as shown in the figure below:

- +

## Task Parameters diff --git a/docs/docs/en/guide/task/zeppelin.md b/docs/docs/en/guide/task/zeppelin.md new file mode 100644 index 0000000000..8c8de9dae6 --- /dev/null +++ b/docs/docs/en/guide/task/zeppelin.md @@ -0,0 +1,53 @@ +# Apache Zeppelin + +## Overview + +Use `Zeppelin Task` to create a zeppelin-type task and execute zeppelin notebook paragraphs. When the worker executes `Zeppelin Task`, +it will call `Zeppelin Client API` to trigger zeppelin notebook paragraph. Click [here](https://zeppelin.apache.org/) for details about `Apache Zeppelin Notebook`. + +## Create Task + +- Click `Project Management -> Project Name -> Workflow Definition`, and click the `Create Workflow` button to enter the DAG editing page. +- Drag from the toolbar to the canvas. + +## Task Parameters + +| **Parameter** | **Description** | +| ------- | ---------- | +| Node Name | Set the name of the task. Node names within a workflow definition are unique. | +| Run flag | Indicates whether the node can be scheduled normally. If it is not necessary to execute, you can turn on the prohibiting execution switch. | +| Description | Describes the function of this node. | +| Task priority | When the number of worker threads is insufficient, they are executed in order from high to low according to the priority, and they are executed according to the first-in, first-out principle when the priority is the same. | +| Worker group | The task is assigned to the machines in the worker group for execution. If Default is selected, a worker machine will be randomly selected for execution. | +| Task group name | The group in Resources, if not configured, it will not be used. | +| Environment Name | Configure the environment in which to run the script. | +| Number of failed retries | The number of times the task is resubmitted after failure. It supports drop-down and manual filling. | +| Failure Retry Interval | The time interval for resubmitting the task if the task fails. It supports drop-down and manual filling. | +| Timeout alarm | Check Timeout Alarm and Timeout Failure. When the task exceeds the "timeout duration", an alarm email will be sent and the task execution will fail. | +| Zeppelin Note ID | The unique note id for a zeppelin notebook note. | +| Zeppelin Paragraph ID | The unique paragraph id for a zeppelin notebook paragraph. If you want to schedule a whole note at a time, leave this field blank. | +| Zeppelin Production Note Directory | The directory for cloned note in production mode. | +| Zeppelin Rest Endpoint | The REST endpoint of your zeppelin server | +| Zeppelin Parameters | Parameters in json format used for zeppelin dynamic form. | + +## Production (Clone) Mode + +- Fill in the optional `Zeppelin Production Note Directory` parameter to enable `Production Mode`. +- In `Production Mode`, the target note gets copied to the `Zeppelin Production Note Directory` you choose. +`Zeppelin Task Plugin` will execute the cloned note instead of the original one. Once execution done, +`Zeppelin Task Plugin` will delete the cloned note automatically. +Therefore, it increases the stability as the modification to a running note triggered by `Dolphin Scheduler` +will not affect the production task. +- If you leave the `Zeppelin Production Note Directory` empty, `Zeppelin Task Plugin` will execute the original note. +- 'Zeppelin Production Note Directory' should both start and end with a `slash`. e.g. `/production_note_directory/` + +## Task Example + +### Zeppelin Paragraph Task Example + +This example illustrates how to create a zeppelin paragraph task node. + +![demo-zeppelin-paragraph](../../../../img/tasks/demo/zeppelin.png) + +![demo-get-zeppelin-id](../../../../img/tasks/demo/zeppelin_id.png) + diff --git a/docs/docs/zh/guide/task/seatunnel.md b/docs/docs/zh/guide/task/seatunnel.md new file mode 100644 index 0000000000..c15844559a --- /dev/null +++ b/docs/docs/zh/guide/task/seatunnel.md @@ -0,0 +1,82 @@ +# Apache SeaTunnel + +## 综述 + +`SeaTunnel` 任务类型，用于创建并执行 `SeaTunnel` 类型任务。worker 执行该任务的时候，会通过 `start-seatunnel-spark.sh` 或 `start-seatunnel-flink.sh` 命令解析 config 文件。 +点击 [这里](https://seatunnel.apache.org/) 获取更多关于 `Apache SeaTunnel` 的信息。 + +## 创建任务 + +- 点击项目管理 -> 项目名称 -> 工作流定义，点击“创建工作流”按钮，进入 DAG 编辑页面； +- 拖动工具栏的 任务节点到画板中。 + +## 任务参数 + +- 节点名称：设置任务节点的名称。一个工作流定义中的节点名称是唯一的。 +- 运行标志：标识这个结点是否能正常调度，如果不需要执行，可以打开禁止执行开关。 +- 描述：描述该节点的功能。 +- 任务优先级：worker 线程数不足时，根据优先级从高到低依次执行，优先级一样时根据先进先出原则执行。 +- Worker 分组：任务分配给 worker 组的机器执行，选择 Default ，会随机选择一台 worker 机执行。 +- 环境名称：配置运行脚本的环境。 +- 失败重试次数：任务失败重新提交的次数。 +- 失败重试间隔：任务失败重新提交任务的时间间隔，以分为单位。 +- Cpu 配额: 为执行的任务分配指定的CPU时间配额，单位百分比，默认-1代表不限制，例如1个核心的CPU满载是100%，16个核心的是1600%。这个功能由 [task.resource.limit.state](../../architecture/configuration.md) 控制 +- 最大内存：为执行的任务分配指定的内存大小，超过会触发OOM被Kill同时不会进行自动重试，单位MB，默认-1代表不限制。这个功能由 [task.resource.limit.state](../../architecture/configuration.md) 控制 +- 延时执行时间：任务延迟执行的时间，以分为单位。 +- 超时警告：勾选超时警告、超时失败，当任务超过“超时时长”后，会发送告警邮件并且任务执行失败。 +- 引擎：支持 FLINK 和 SPARK + - FLINK + - 运行模型：支持 `run` 和 `run-application` 两种模式 + - 选项参数：用于添加 Flink 引擎本身参数，例如 `-m yarn-cluster -ynm seatunnel` + - SPARK + - 部署方式：指定部署模式，`cluster` `client` `local` + - Master：指定 `Master` 模型，`yarn` `local` `spark` `mesos`，其中 `spark` 和 `mesos` 需要指定 `Master` 服务地址，例如：127.0.0.1:7077 + > 点击 [这里](https://seatunnel.apache.org/docs/2.1.2/command/usage) 获取更多关于`Apache SeaTunnel command` 使用的信息 +- 自定义配置：支持自定义配置或从资源中心选择配置文件 + > 点击 [这里](https://seatunnel.apache.org/docs/2.1.2/concept/config) 获取更多关于`Apache SeaTunnel config` 文件介绍 +- 脚本：在任务节点那自定义配置信息，包括四部分：`env` `source` `transform` `sink` +- 资源文件：在任务节点引用资源中心的配置文件，只可以引用一个配置文件。 +- 前置任务：选择当前任务的前置任务，会将被选择的前置任务设置为当前任务的上游。 + +## 任务样例 + +该样例演示为使用 Flink 引擎从 Fake 源读取数据打印到控制台。 + +### 在 DolphinScheduler 中配置 SeaTunnel 环境 + +若生产环境中要是使用到 SeaTunnel 任务类型，则需要先配置好所需的环境，配置文件如下：`/dolphinscheduler/conf/env/dolphinscheduler_env.sh`。 + +![seatunnel_task01](../../../../img/tasks/demo/seatunnel_task01.png) + +### 配置 SeaTunnel 任务节点 + +根据上述参数说明，配置所需的内容即可。 + +![seatunnel_task02](../../../../img/tasks/demo/seatunnel_task02.png) + +### Config 样例 + +```Config + +env { + execution.parallelism = 1 +} + +source { + FakeSource { + result_table_name = "fake" + field_name = "name,age" + } +} + +transform { + sql { + sql = "select name,age from fake" + } +} + +sink { + ConsoleSink {} +} + +``` diff --git a/docs/img/new_ui/dev/project/workflow_date_manual.png b/docs/img/new_ui/dev/project/workflow_date_manual.png new file mode 100644 index 0000000000..70d03372f9 Binary files /dev/null and b/docs/img/new_ui/dev/project/workflow_date_manual.png differ diff --git a/docs/img/new_ui/dev/security/create-cluster.png b/docs/img/new_ui/dev/security/create-cluster.png new file mode 100644 index 0000000000..539c0ba25d Binary files /dev/null and b/docs/img/new_ui/dev/security/create-cluster.png differ diff --git a/docs/img/new_ui/dev/security/create-namespace.png b/docs/img/new_ui/dev/security/create-namespace.png new file mode 100644 index 0000000000..c7a7632629 Binary files /dev/null and b/docs/img/new_ui/dev/security/create-namespace.png differ diff --git a/docs/img/tasks/demo/seatunnel_task01.png b/docs/img/tasks/demo/seatunnel_task01.png new file mode 100644 index 0000000000..d802b95159 Binary files /dev/null and b/docs/img/tasks/demo/seatunnel_task01.png differ diff --git a/docs/img/tasks/demo/seatunnel_task02.png b/docs/img/tasks/demo/seatunnel_task02.png new file mode 100644 index 0000000000..0607b06318 Binary files /dev/null and b/docs/img/tasks/demo/seatunnel_task02.png differ diff --git a/docs/img/tasks/icons/seatunnel.png b/docs/img/tasks/icons/seatunnel.png new file mode 100644 index 0000000000..4b11920c5f Binary files /dev/null and b/docs/img/tasks/icons/seatunnel.png differ diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/QueueServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/QueueServiceTest.java index cd8cdacce2..fa7c7ea69b 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/QueueServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/QueueServiceTest.java @@ -17,12 +17,8 @@ package org.apache.dolphinscheduler.api.service; -import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.YARN_QUEUE_CREATE; -import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.YARN_QUEUE_UPDATE; - import org.apache.dolphinscheduler.api.enums.Status; import org.apache.dolphinscheduler.api.exceptions.ServiceException; -import org.apache.dolphinscheduler.api.permission.ResourcePermissionCheckService; import org.apache.dolphinscheduler.api.service.impl.BaseServiceImpl; import org.apache.dolphinscheduler.api.service.impl.QueueServiceImpl; import org.apache.dolphinscheduler.api.utils.PageInfo; @@ -75,9 +71,6 @@ public class QueueServiceTest { @Mock private UserMapper userMapper; - @Mock - private ResourcePermissionCheckService resourcePermissionCheckService; - private static final String QUEUE = "queue"; private static final String QUEUE_NAME = "queueName"; private static final String EXISTS = "exists"; @@ -94,10 +87,7 @@ public class QueueServiceTest { @Test public void testQueryList() { - Set ids = new HashSet<>(); - ids.add(1); - Mockito.when(resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.QUEUE, getLoginUser().getId(), queueServiceImplLogger)).thenReturn(ids); - Mockito.when(queueMapper.selectBatchIds(Mockito.anySet())).thenReturn(getQueueList()); + Mockito.when(queueMapper.selectList(null)).thenReturn(getQueueList()); Map result = queueService.queryList(getLoginUser()); List queueList = (List) result.get(Constants.DATA_LIST); Assert.assertTrue(CollectionUtils.isNotEmpty(queueList)); @@ -110,10 +100,7 @@ public class QueueServiceTest { IPage page = new Page<>(1, 10); page.setTotal(1L); page.setRecords(getQueueList()); - Set ids = new HashSet<>(); - ids.add(1); - Mockito.when(resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.QUEUE, getLoginUser().getId(), queueServiceImplLogger)).thenReturn(ids); - Mockito.when(queueMapper.queryQueuePaging(Mockito.any(Page.class), Mockito.anyList(), Mockito.eq(QUEUE_NAME))).thenReturn(page); + Mockito.when(queueMapper.queryQueuePaging(Mockito.any(Page.class), Mockito.eq(QUEUE_NAME))).thenReturn(page); Result result = queueService.queryList(getLoginUser(), QUEUE_NAME, 1, 10); PageInfo pageInfo = (PageInfo) result.getData(); Assert.assertTrue(CollectionUtils.isNotEmpty(pageInfo.getTotalList())); @@ -121,8 +108,6 @@ public class QueueServiceTest { @Test public void testCreateQueue() { - Mockito.when(resourcePermissionCheckService.operationPermissionCheck(AuthorizationType.QUEUE, getLoginUser().getId(), YARN_QUEUE_CREATE, baseServiceLogger)).thenReturn(true); - Mockito.when(resourcePermissionCheckService.resourcePermissionCheck(AuthorizationType.QUEUE, null, 0, baseServiceLogger)).thenReturn(true); // queue is null Throwable exception = Assertions.assertThrows(ServiceException.class, () -> queueService.createQueue(getLoginUser(), null, QUEUE_NAME)); @@ -144,8 +129,6 @@ public class QueueServiceTest { Mockito.when(queueMapper.selectById(1)).thenReturn(getQUEUE()); Mockito.when(queueMapper.existQueue(EXISTS, null)).thenReturn(true); Mockito.when(queueMapper.existQueue(null, EXISTS)).thenReturn(true); - Mockito.when(resourcePermissionCheckService.operationPermissionCheck(AuthorizationType.QUEUE, getLoginUser().getId(), YARN_QUEUE_UPDATE, baseServiceLogger)).thenReturn(true); - Mockito.when(resourcePermissionCheckService.resourcePermissionCheck(AuthorizationType.QUEUE, new Object[]{0}, 0, baseServiceLogger)).thenReturn(true); // not exist Throwable exception = Assertions.assertThrows(ServiceException.class, () -> queueService.updateQueue(getLoginUser(), 0, QUEUE, QUEUE_NAME)); @@ -153,7 +136,6 @@ public class QueueServiceTest { Assertions.assertEquals(formatter, exception.getMessage()); //no need update - Mockito.when(resourcePermissionCheckService.resourcePermissionCheck(AuthorizationType.QUEUE, new Object[]{1}, 0, baseServiceLogger)).thenReturn(true); exception = Assertions.assertThrows(ServiceException.class, () -> queueService.updateQueue(getLoginUser(), 1, QUEUE_NAME, QUEUE_NAME)); Assertions.assertEquals(Status.NEED_NOT_UPDATE_QUEUE.getMsg(), exception.getMessage()); diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java index a9642dbfdf..cd13444d1f 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java @@ -127,13 +127,29 @@ public class ResourcesServiceTest { PowerMockito.when(PropertyUtils.getResUploadStartupState()).thenReturn(false); User user = new User(); + user.setId(1); + user.setUserType(UserType.GENERAL_USER); + + //CURRENT_LOGIN_USER_TENANT_NOT_EXIST + MockMultipartFile mockMultipartFile = new MockMultipartFile("test.pdf", "test.pdf", "pdf", "test".getBytes()); + PowerMockito.when(PropertyUtils.getResUploadStartupState()).thenReturn(true); + Mockito.when(userMapper.selectById(1)).thenReturn(getUser()); + Mockito.when(tenantMapper.queryById(1)).thenReturn(null); + Result result = resourcesService.createResource(user, "ResourcesServiceTest", "ResourcesServiceTest", ResourceType.FILE, mockMultipartFile, -1, "/"); + logger.info(result.toString()); + Assert.assertEquals(Status.CURRENT_LOGIN_USER_TENANT_NOT_EXIST.getMsg(), result.getMsg()); + //set tenant for user + user.setTenantId(1); + Mockito.when(tenantMapper.queryById(1)).thenReturn(getTenant()); + //HDFS_NOT_STARTUP - Result result = resourcesService.createResource(user, "ResourcesServiceTest", "ResourcesServiceTest", ResourceType.FILE, null, -1, "/"); + PowerMockito.when(PropertyUtils.getResUploadStartupState()).thenReturn(false); + result = resourcesService.createResource(user, "ResourcesServiceTest", "ResourcesServiceTest", ResourceType.FILE, null, -1, "/"); logger.info(result.toString()); Assert.assertEquals(Status.STORAGE_NOT_STARTUP.getMsg(), result.getMsg()); //RESOURCE_FILE_IS_EMPTY - MockMultipartFile mockMultipartFile = new MockMultipartFile("test.pdf", "".getBytes()); + mockMultipartFile = new MockMultipartFile("test.pdf", "".getBytes()); PowerMockito.when(PropertyUtils.getResUploadStartupState()).thenReturn(true); result = resourcesService.createResource(user, "ResourcesServiceTest", "ResourcesServiceTest", ResourceType.FILE, mockMultipartFile, -1, "/"); logger.info(result.toString()); @@ -534,35 +550,19 @@ public class ResourcesServiceTest { dir2.setUserId(user.getId()); Mockito.when(resourcesMapper.queryResource(dir1.getFullName(), ResourceType.FILE.ordinal())).thenReturn(Collections.singletonList(dir1)); Mockito.when(resourcesMapper.queryResource(resourceDir, ResourceType.FILE.ordinal())).thenReturn(null); - PowerMockito.when(resourcePermissionCheckService.operationPermissionCheck( - AuthorizationType.RESOURCE_FILE_ID, 1, ApiFuncIdentificationConstant.FILE_VIEW, serviceLogger)).thenReturn(true); - PowerMockito.when(resourcePermissionCheckService.resourcePermissionCheck( - AuthorizationType.RESOURCE_FILE_ID, new Object[]{dir1.getId()}, 1, serviceLogger)).thenReturn(true); Tenant tenant = getTenant(); - PowerMockito.when(resourcePermissionCheckService.operationPermissionCheck( - AuthorizationType.RESOURCE_FILE_ID, 1, ApiFuncIdentificationConstant.FOLDER_ONLINE_CREATE, serviceLogger)).thenReturn(true); - PowerMockito.when(resourcePermissionCheckService.resourcePermissionCheck( - AuthorizationType.RESOURCE_FILE_ID, null, 1, serviceLogger)).thenReturn(true); try { PowerMockito.when(storageOperate.mkdir(tenant.getTenantCode(), null)).thenReturn(true); } catch (IOException e) { logger.error("storage error", e); } - PowerMockito.when(resourcePermissionCheckService.operationPermissionCheck( - AuthorizationType.RESOURCE_FILE_ID, 1, ApiFuncIdentificationConstant.FILE_ONLINE_CREATE, serviceLogger)).thenReturn(true); - PowerMockito.when(resourcePermissionCheckService.resourcePermissionCheck( - AuthorizationType.RESOURCE_FILE_ID, null, 1, serviceLogger)).thenReturn(true); - PowerMockito.when(PropertyUtils.getResUploadStartupState()).thenReturn(true); - PowerMockito.when(resourcePermissionCheckService.operationPermissionCheck( - AuthorizationType.RESOURCE_FILE_ID, 1, ApiFuncIdentificationConstant.FILE_RENAME, serviceLogger)).thenReturn(true); - PowerMockito.when(resourcePermissionCheckService.resourcePermissionCheck( - AuthorizationType.RESOURCE_FILE_ID, null, 1, serviceLogger)).thenReturn(true); Mockito.when(tenantMapper.queryById(1)).thenReturn(getTenant()); Mockito.when(resourcesMapper.selectById(dir1.getId())).thenReturn(dir1); Mockito.when(resourcesMapper.selectById(dir2.getId())).thenReturn(dir2); Mockito.when(FileUtils.getUploadFilename(Mockito.anyString(), Mockito.anyString())).thenReturn("test"); + PowerMockito.when(PropertyUtils.getResUploadStartupState()).thenReturn(true); PowerMockito.when(FileUtils.writeContent2File(Mockito.anyString(), Mockito.anyString())).thenReturn(true); Result result = resourcesService.onlineCreateOrUpdateResourceWithDir(user, fullName, desc, content); diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java index 62fa91d2c5..8376341538 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java @@ -17,19 +17,13 @@ package org.apache.dolphinscheduler.api.service; -import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.TENANT_CREATE; -import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.TENANT_DELETE; -import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.TENANT_UPDATE; - import org.apache.dolphinscheduler.api.enums.Status; import org.apache.dolphinscheduler.api.exceptions.ServiceException; -import org.apache.dolphinscheduler.api.permission.ResourcePermissionCheckService; import org.apache.dolphinscheduler.api.service.impl.BaseServiceImpl; import org.apache.dolphinscheduler.api.service.impl.TenantServiceImpl; import org.apache.dolphinscheduler.api.utils.PageInfo; import org.apache.dolphinscheduler.api.utils.Result; import org.apache.dolphinscheduler.common.Constants; -import org.apache.dolphinscheduler.common.enums.AuthorizationType; import org.apache.dolphinscheduler.common.enums.UserType; import org.apache.dolphinscheduler.common.utils.PropertyUtils; import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; @@ -46,10 +40,8 @@ import org.apache.commons.collections.CollectionUtils; import java.text.MessageFormat; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import org.junit.Assert; import org.junit.Test; @@ -93,9 +85,6 @@ public class TenantServiceTest { @Mock private UserMapper userMapper; - @Mock - private ResourcePermissionCheckService resourcePermissionCheckService; - private static final String tenantCode = "hayden"; private static final String tenantDesc = "This is the tenant desc"; private static final String queue = "queue"; @@ -106,8 +95,6 @@ public class TenantServiceTest { User loginUser = getLoginUser(); Mockito.when(tenantMapper.existTenant(tenantCode)).thenReturn(true); - Mockito.when(resourcePermissionCheckService.operationPermissionCheck(AuthorizationType.TENANT, loginUser.getId(), TENANT_CREATE, baseServiceLogger)).thenReturn(true); - Mockito.when(resourcePermissionCheckService.resourcePermissionCheck(AuthorizationType.TENANT, null, 0, baseServiceLogger)).thenReturn(true); Map result; //check exist @@ -155,10 +142,7 @@ public class TenantServiceTest { IPage page = new Page<>(1, 10); page.setRecords(getList()); page.setTotal(1L); - Set ids = new HashSet<>(); - ids.add(1); - Mockito.when(resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.TENANT, getLoginUser().getId(), tenantServiceImplLogger)).thenReturn(ids); - Mockito.when(tenantMapper.queryTenantPaging(Mockito.any(Page.class), Mockito.anyList(), Mockito.eq(tenantDesc))) + Mockito.when(tenantMapper.queryTenantPaging(Mockito.any(Page.class), Mockito.eq(tenantDesc))) .thenReturn(page); Result result = tenantService.queryTenantList(getLoginUser(), tenantDesc, 1, 10); PageInfo pageInfo = (PageInfo) result.getData(); @@ -169,8 +153,6 @@ public class TenantServiceTest { @Test public void testUpdateTenant() throws Exception { Mockito.when(tenantMapper.queryById(1)).thenReturn(getTenant()); - Mockito.when(resourcePermissionCheckService.operationPermissionCheck(AuthorizationType.TENANT, getLoginUser().getId(), TENANT_UPDATE, baseServiceLogger)).thenReturn(true); - Mockito.when(resourcePermissionCheckService.resourcePermissionCheck(AuthorizationType.TENANT, null, 0, baseServiceLogger)).thenReturn(true); // update not exists tenant Throwable exception = Assertions.assertThrows(ServiceException.class, () -> tenantService.updateTenant(getLoginUser(), 912222, tenantCode, 1, tenantDesc)); @@ -187,8 +169,6 @@ public class TenantServiceTest { @Test public void testDeleteTenantById() throws Exception { - Mockito.when(resourcePermissionCheckService.operationPermissionCheck(AuthorizationType.TENANT, getLoginUser().getId(), TENANT_DELETE, baseServiceLogger)).thenReturn(true); - Mockito.when(resourcePermissionCheckService.resourcePermissionCheck(AuthorizationType.TENANT, null, 0, baseServiceLogger)).thenReturn(true); Mockito.when(tenantMapper.queryById(1)).thenReturn(getTenant()); Mockito.when(processInstanceMapper.queryByTenantIdAndStatus(1, Constants.NOT_TERMINATED_STATES)) .thenReturn(getInstanceList());