This is an automated email from the ASF dual-hosted git repository.
SbloodyS pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 8cd7aec07c [Improvement-18267][Remote Logging] Allow custom S3 region
with endpoint (#18268)
8cd7aec07c is described below
commit 8cd7aec07cc63657866c3e6929be237b56eb9937
Author: Molin Wang <[email protected]>
AuthorDate: Tue May 26 11:30:42 2026 +0800
[Improvement-18267][Remote Logging] Allow custom S3 region with endpoint
(#18268)
Co-authored-by: xiangzihao <[email protected]>
---
.../authentication/aws/AmazonS3ClientFactory.java | 10 +++-
.../aws/AmazonS3ClientFactoryTest.java | 70 ++++++++++++++++++++++
2 files changed, 78 insertions(+), 2 deletions(-)
diff --git
a/dolphinscheduler-authentication/dolphinscheduler-aws-authentication/src/main/java/org/apache/dolphinscheduler/authentication/aws/AmazonS3ClientFactory.java
b/dolphinscheduler-authentication/dolphinscheduler-aws-authentication/src/main/java/org/apache/dolphinscheduler/authentication/aws/AmazonS3ClientFactory.java
index c45e4de9ea..338eb515e4 100644
---
a/dolphinscheduler-authentication/dolphinscheduler-aws-authentication/src/main/java/org/apache/dolphinscheduler/authentication/aws/AmazonS3ClientFactory.java
+++
b/dolphinscheduler-authentication/dolphinscheduler-aws-authentication/src/main/java/org/apache/dolphinscheduler/authentication/aws/AmazonS3ClientFactory.java
@@ -17,6 +17,8 @@
package org.apache.dolphinscheduler.authentication.aws;
+import software.amazon.awssdk.utils.StringUtils;
+
import java.util.Map;
import lombok.experimental.UtilityClass;
@@ -32,17 +34,21 @@ public class AmazonS3ClientFactory {
public AmazonS3 createAmazonS3Client(Map<String, String> awsProperties) {
AWSCredentialsProvider awsCredentialsProvider =
AWSCredentialsProviderFactor.credentialsProvider(awsProperties);
- Regions regions =
Regions.fromName(awsProperties.get(AwsConfigurationKeys.AWS_REGION));
+ String region = awsProperties.get(AwsConfigurationKeys.AWS_REGION);
String endpoint = awsProperties.get(AwsConfigurationKeys.AWS_ENDPOINT);
if (endpoint != null && !endpoint.isEmpty()) {
+ if (StringUtils.isEmpty(region)) {
+ throw new IllegalArgumentException("The aws.s3.region cannot
be empty");
+ }
return AmazonS3ClientBuilder
.standard()
.withPathStyleAccessEnabled(true)
- .withEndpointConfiguration(new
AwsClientBuilder.EndpointConfiguration(endpoint, regions.getName()))
+ .withEndpointConfiguration(new
AwsClientBuilder.EndpointConfiguration(endpoint, region))
.withCredentials(awsCredentialsProvider)
.build();
} else {
+ Regions regions = Regions.fromName(region);
return AmazonS3ClientBuilder
.standard()
.withCredentials(awsCredentialsProvider)
diff --git
a/dolphinscheduler-authentication/dolphinscheduler-aws-authentication/src/test/java/org/apache/dolphinscheduler/authentication/aws/AmazonS3ClientFactoryTest.java
b/dolphinscheduler-authentication/dolphinscheduler-aws-authentication/src/test/java/org/apache/dolphinscheduler/authentication/aws/AmazonS3ClientFactoryTest.java
new file mode 100644
index 0000000000..58f6ec4c0c
--- /dev/null
+++
b/dolphinscheduler-authentication/dolphinscheduler-aws-authentication/src/test/java/org/apache/dolphinscheduler/authentication/aws/AmazonS3ClientFactoryTest.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.authentication.aws;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+
+import com.amazonaws.services.s3.AmazonS3;
+
+class AmazonS3ClientFactoryTest {
+
+ @Test
+ void createAmazonS3ClientShouldAllowCustomRegionWhenEndpointConfigured() {
+ Map<String, String> awsProperties =
createAwsProperties("internal-region", "http://127.0.0.1:9000";);
+
+ AmazonS3 amazonS3 = assertDoesNotThrow(() ->
AmazonS3ClientFactory.createAmazonS3Client(awsProperties));
+
+ amazonS3.shutdown();
+ }
+
+ @Test
+ void createAmazonS3ClientShouldValidateRegionWhenEndpointNotConfigured() {
+ Map<String, String> awsProperties =
createAwsProperties("internal-region", "");
+
+ assertThrows(IllegalArgumentException.class, () ->
AmazonS3ClientFactory.createAmazonS3Client(awsProperties));
+ }
+
+ @Test
+ void createAmazonS3ClientShouldRejectEmptyRegionWhenEndpointConfigured() {
+ assertInvalidRegionWithEndpoint(null);
+ assertInvalidRegionWithEndpoint("");
+ }
+
+ private void assertInvalidRegionWithEndpoint(String region) {
+ Map<String, String> awsProperties = createAwsProperties(region,
"http://127.0.0.1:9000";);
+
+ assertThrows(IllegalArgumentException.class, () ->
AmazonS3ClientFactory.createAmazonS3Client(awsProperties));
+ }
+
+ private Map<String, String> createAwsProperties(String region, String
endpoint) {
+ Map<String, String> awsProperties = new HashMap<>();
+ awsProperties.put(AwsConfigurationKeys.AWS_AUTHENTICATION_TYPE,
+
AWSCredentialsProviderType.STATIC_CREDENTIALS_PROVIDER.getName());
+ awsProperties.put(AwsConfigurationKeys.AWS_ACCESS_KEY_ID,
"access-key");
+ awsProperties.put(AwsConfigurationKeys.AWS_SECRET, "secret-key");
+ awsProperties.put(AwsConfigurationKeys.AWS_REGION, region);
+ awsProperties.put(AwsConfigurationKeys.AWS_ENDPOINT, endpoint);
+ return awsProperties;
+ }
+}
