[dolphinscheduler] branch 3.0.0-beta-2-prepare updated: [Fix-10305][common] AWS config Constant definitions are repeated (#10311)

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

liudongkai pushed a commit to branch 3.0.0-beta-2-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/3.0.0-beta-2-prepare by this push:
     new 8edaa6a7de [Fix-10305][common] AWS config Constant definitions are repeated (#10311)
8edaa6a7de is described below

commit 8edaa6a7de30389060cb6a66ecfca2bc0f0b9a4c
Author: guodong <gu...@163.com>
AuthorDate: Thu Jun 2 13:56:36 2022 +0800

    [Fix-10305][common] AWS config Constant definitions are repeated (#10311)
    
    (cherry picked from commit 70dbcb21555e6b49fbf64359f77982c47b4f6902)
---
 .../main/java/org/apache/dolphinscheduler/common/Constants.java   | 3 ---
 .../java/org/apache/dolphinscheduler/common/utils/S3Utils.java    | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
index 19fbdb90ca..860e493ee1 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
@@ -51,9 +51,6 @@ public final class Constants {
     public static final String REGISTRY_DOLPHINSCHEDULER_LOCK_FAILOVER_STARTUP_MASTERS = "/lock/failover/startup-masters";
     public static final String FORMAT_SS = "%s%s";
     public static final String FORMAT_S_S = "%s/%s";
-    public static final String AWS_ACCESS_KEY_ID = "aws.access.key.id";
-    public static final String AWS_SECRET_ACCESS_KEY = "aws.secret.access.key";
-    public static final String AWS_REGION = "aws.region";
     public static final String FOLDER_SEPARATOR = "/";
 
     public static final String RESOURCE_TYPE_FILE = "resources";
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/S3Utils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/S3Utils.java
index 13e17c3bba..44cf5bf2d1 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/S3Utils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/S3Utils.java
@@ -33,9 +33,9 @@ import com.amazonaws.services.s3.transfer.MultipleFileDownload;
 import com.amazonaws.services.s3.transfer.TransferManager;
 import com.amazonaws.services.s3.transfer.TransferManagerBuilder;
 import org.apache.commons.lang.StringUtils;
-import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.ResUploadType;
 import org.apache.dolphinscheduler.common.storage.StorageOperate;
+import org.apache.dolphinscheduler.plugin.task.api.TaskConstants;
 import org.apache.dolphinscheduler.spi.enums.ResourceType;
 import org.jets3t.service.ServiceException;
 import org.slf4j.Logger;
@@ -68,11 +68,11 @@ public class S3Utils implements Closeable, StorageOperate {
 
     private static final Logger logger = LoggerFactory.getLogger(S3Utils.class);
 
-    public static final String ACCESS_KEY_ID = PropertyUtils.getString(Constants.AWS_ACCESS_KEY_ID);
+    public static final String ACCESS_KEY_ID = PropertyUtils.getString(TaskConstants.AWS_ACCESS_KEY_ID);
 
-    public static final String SECRET_KEY_ID = PropertyUtils.getString(Constants.AWS_SECRET_ACCESS_KEY);
+    public static final String SECRET_KEY_ID = PropertyUtils.getString(TaskConstants.AWS_SECRET_ACCESS_KEY);
 
-    public static final String REGION = PropertyUtils.getString(Constants.AWS_REGION);
+    public static final String REGION = PropertyUtils.getString(TaskConstants.AWS_REGION);
 
 
     private AmazonS3 s3Client = null;