Skip to content

Commit 7b1b330

Browse files
committed
[fix](iceberg) Support client.region and iceberg.rest.* properties in vended credentials
1 parent 447d535 commit 7b1b330

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

fe/fe-core/src/main/java/org/apache/doris/datasource/credentials/CredentialUtils.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,15 @@ public class CredentialUtils {
3434
* Supported cloud storage prefixes for filtering vended credentials
3535
*/
3636
private static final Set<String> CLOUD_STORAGE_PREFIXES = new HashSet<>(Arrays.asList(
37-
"fs.", // file system
38-
"s3.", // Amazon S3
39-
"oss.", // Alibaba OSS
40-
"cos.", // Tencent COS
41-
"obs.", // Huawei OBS
42-
"gs.", // Google Cloud Storage
43-
"azure." // Microsoft Azure
37+
"fs.", // file system
38+
"s3.", // Amazon S3
39+
"oss.", // Alibaba OSS
40+
"cos.", // Tencent COS
41+
"obs.", // Huawei OBS
42+
"gs.", // Google Cloud Storage
43+
"azure.", // Microsoft Azure
44+
"client.", // Iceberg client properties (e.g., client.region)
45+
"iceberg.rest." // Iceberg REST catalog properties (e.g., iceberg.rest.access-key-id)
4446
));
4547

4648
/**

fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/S3Properties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public class S3Properties extends AbstractS3CompatibleProperties {
6565
};
6666

6767
private static final String[] REGION_NAMES_FOR_GUESSING = {
68-
"s3.region", "glue.region", "aws.glue.region", "iceberg.rest.signing-region"
68+
"s3.region", "glue.region", "aws.glue.region", "iceberg.rest.signing-region", "client.region"
6969
};
7070

7171
@Setter
@@ -79,7 +79,7 @@ public class S3Properties extends AbstractS3CompatibleProperties {
7979
@Setter
8080
@Getter
8181
@ConnectorProperty(names = {"s3.region", "AWS_REGION", "region", "REGION", "aws.region", "glue.region",
82-
"aws.glue.region", "iceberg.rest.signing-region"},
82+
"aws.glue.region", "iceberg.rest.signing-region", "client.region"},
8383
required = false,
8484
description = "The region of S3.")
8585
protected String region = "";

0 commit comments

Comments
 (0)