Skip to content

[fix](iceberg) Support client.region and iceberg.rest.* properties invended credentials #57521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zy-kkk merged 1 commit into from
Oct 31, 2025
+11 −9
Merged

[fix](iceberg) Support client.region and iceberg.rest.* properties invended credentials #57521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/credentials/CredentialUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,15 @@ public class CredentialUtils {
* Supported cloud storage prefixes for filtering vended credentials
*/
private static final Set<String> CLOUD_STORAGE_PREFIXES = new HashSet<>(Arrays.asList(
"fs.", // file system
"s3.", // Amazon S3
"oss.", // Alibaba OSS
"cos.", // Tencent COS
"obs.", // Huawei OBS
"gs.", // Google Cloud Storage
"azure." // Microsoft Azure
"fs.", // file system
"s3.", // Amazon S3
"oss.", // Alibaba OSS
"cos.", // Tencent COS
"obs.", // Huawei OBS
"gs.", // Google Cloud Storage
"azure.", // Microsoft Azure
"client.", // Iceberg client properties (e.g., client.region)
"iceberg.rest." // Iceberg REST catalog properties (e.g., iceberg.rest.access-key-id)
));

/**
Expand Down
4 changes: 2 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/S3Properties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public class S3Properties extends AbstractS3CompatibleProperties {
};

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

@Setter
Expand All @@ -79,7 +79,7 @@ public class S3Properties extends AbstractS3CompatibleProperties {
@Setter
@Getter
@ConnectorProperty(names = {"s3.region", "AWS_REGION", "region", "REGION", "aws.region", "glue.region",
"aws.glue.region", "iceberg.rest.signing-region"},
"aws.glue.region", "iceberg.rest.signing-region", "client.region"},
required = false,
description = "The region of S3.")
protected String region = "";
Expand Down
Loading