From 56accb07cb42e0cb3f83d24bbfc41b5d7ca3992f Mon Sep 17 00:00:00 2001 From: EricGao888 Date: Wed, 29 May 2024 15:24:44 +0800 Subject: [PATCH] fix bugs --- .../aliyunserverlessspark/AliyunServerlessSparkTask.java | 3 +++ dolphinscheduler-ui/src/locales/en_US/datasource.ts | 6 +++--- dolphinscheduler-ui/src/locales/en_US/project.ts | 6 +++--- dolphinscheduler-ui/src/locales/zh_CN/datasource.ts | 6 ++++-- dolphinscheduler-ui/src/locales/zh_CN/project.ts | 4 ++-- .../src/views/projects/task/components/node/format-data.ts | 1 + 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java index 069511c0d2..09832ad76d 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java @@ -184,6 +184,9 @@ public class AliyunServerlessSparkTask extends AbstractRemoteTask { private Client buildAliyunServerlessSparkClient(String accessKeyId, String accessKeySecret, String regionId) throws Exception { String endpoint = String.format("emr-serverless-spark.%s.aliyuncs.com", regionId); + log.info("[debug111] ak - {}", accessKeyId); + log.info("[debug111] sk - {}", accessKeySecret); + log.info("[debug111] region - {}", regionId); Config config = new Config() .setEndpoint(endpoint) .setAccessKeyId(accessKeyId) diff --git a/dolphinscheduler-ui/src/locales/en_US/datasource.ts b/dolphinscheduler-ui/src/locales/en_US/datasource.ts index 8a877b9864..976793849c 100644 --- a/dolphinscheduler-ui/src/locales/en_US/datasource.ts +++ b/dolphinscheduler-ui/src/locales/en_US/datasource.ts @@ -100,8 +100,8 @@ export default { namespace_tips: 'Please input namespace', access_key_id: 'Access Key Id', access_key_id_tips: 'Please enter access key id', - access_Key_secret: 'Access Key Secret', - access_Key_secret_tips: 'Please enter access key secret', + access_key_secret: 'Access Key Secret', + access_key_secret_tips: 'Please enter access key secret', region_id: 'Region Id', - region_id_tips: 'Please enter region id' + region_id_tips: 'Please enter Region Id' } diff --git a/dolphinscheduler-ui/src/locales/en_US/project.ts b/dolphinscheduler-ui/src/locales/en_US/project.ts index 79f570fcdf..e358b09a64 100644 --- a/dolphinscheduler-ui/src/locales/en_US/project.ts +++ b/dolphinscheduler-ui/src/locales/en_US/project.ts @@ -930,10 +930,10 @@ export default { engine_release_version_tips: "engine release version", entry_point: "entry point", entry_point_tips: "entry point", - entry_point_arguments: "", - entry_point_arguments_tip: "entry point arguments", + entry_point_arguments: "entry point arguments", + entry_point_arguments_tips: "entry point arguments", spark_submit_parameters: "spark submit parameters", - spark_submit_parameters_tip: "spark submit parameters", + spark_submit_parameters_tips: "spark submit parameters", is_production: "is production", is_production_tips: "is production" }, diff --git a/dolphinscheduler-ui/src/locales/zh_CN/datasource.ts b/dolphinscheduler-ui/src/locales/zh_CN/datasource.ts index d79544d174..eef4f6a12c 100644 --- a/dolphinscheduler-ui/src/locales/zh_CN/datasource.ts +++ b/dolphinscheduler-ui/src/locales/zh_CN/datasource.ts @@ -97,6 +97,8 @@ export default { namespace_tips: '请输入namespace', access_key_id: 'Access Key Id', access_key_id_tips: '请输入access key id', - access_Key_secret: 'Access Key Secret', - access_Key_secret_tips: '请输入access key secret' + access_key_secret: 'Access Key Secret', + access_key_secret_tips: '请输入access key secret', + region_id: 'Region Id', + region_id_tips: '请输入Region Id' } diff --git a/dolphinscheduler-ui/src/locales/zh_CN/project.ts b/dolphinscheduler-ui/src/locales/zh_CN/project.ts index 98b6d1a738..1173dd1083 100644 --- a/dolphinscheduler-ui/src/locales/zh_CN/project.ts +++ b/dolphinscheduler-ui/src/locales/zh_CN/project.ts @@ -901,9 +901,9 @@ export default { entry_point: "entry point", entry_point_tips: "entry point", entry_point_arguments: "entry point arguments", - entry_point_arguments_tip: "entry point arguments", + entry_point_arguments_tips: "entry point arguments", spark_submit_parameters: "spark submit parameters", - spark_submit_parameters_tip: "spark submit parameters", + spark_submit_parameters_tips: "spark submit parameters", is_production: "is production", is_production_tips: "is production" }, diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts index e67fa67262..58183db058 100644 --- a/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts +++ b/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts @@ -358,6 +358,7 @@ export function formatParams(data: INodeData): { taskParams.sparkSubmitParameters = data.sparkSubmitParameters taskParams.isProduction = data.isProduction taskParams.type = data.type + taskParams.datasource = data.datasource } if (data.taskType === 'K8S') {