This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 68e6523ad59 branch-4.0: [fix](iceberg) Support client.region and
iceberg.rest.* properties invended credentials #57521 (#57540)
68e6523ad59 is described below
commit 68e6523ad595c143f3dd81bc1636277c74a32a70
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Nov 10 15:21:07 2025 +0800
branch-4.0: [fix](iceberg) Support client.region and iceberg.rest.*
properties invended credentials #57521 (#57540)
Cherry-picked from #57521
Co-authored-by: zy-kkk <[email protected]>
---
.../doris/datasource/credentials/CredentialUtils.java | 16 +++++++++-------
.../doris/datasource/property/storage/S3Properties.java | 4 ++--
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/credentials/CredentialUtils.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/credentials/CredentialUtils.java
index 21d2ee8612e..6eec8e2ee9e 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/credentials/CredentialUtils.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/credentials/CredentialUtils.java
@@ -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)
));
/**
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/S3Properties.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/S3Properties.java
index 6dde222036d..f3e87e1438c 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/S3Properties.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/S3Properties.java
@@ -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
@@ -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 = "";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
