This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 1ee2cc0051c branch-3.1: [chore](sensitive) Hide accessor and secret
key for create/alter storage vault #57528 (#59244)
1ee2cc0051c is described below
commit 1ee2cc0051cc18529cdcbc2e9f7f49a647bd99cc
Author: Yixuan Wang <[email protected]>
AuthorDate: Thu Dec 25 11:19:52 2025 +0800
branch-3.1: [chore](sensitive) Hide accessor and secret key for
create/alter storage vault #57528 (#59244)
picked from #57528
---
.../apache/doris/datasource/property/storage/AzureProperties.java | 1 +
.../apache/doris/datasource/property/storage/COSProperties.java | 3 ++-
.../apache/doris/datasource/property/storage/GCSProperties.java | 1 +
.../apache/doris/datasource/property/storage/MinioProperties.java | 3 ++-
.../apache/doris/datasource/property/storage/OBSProperties.java | 2 +-
.../apache/doris/datasource/property/storage/OSSProperties.java | 7 +++----
.../apache/doris/datasource/property/storage/S3Properties.java | 2 +-
.../test/java/org/apache/doris/nereids/parser/EncryptSQLTest.java | 8 ++++----
8 files changed, 15 insertions(+), 12 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/AzureProperties.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/AzureProperties.java
index 83ee7b932b7..c98fe4a4fb4 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/AzureProperties.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/AzureProperties.java
@@ -69,6 +69,7 @@ public class AzureProperties extends StorageProperties {
@Getter
@ConnectorProperty(names = {"azure.account_name", "azure.access_key",
"s3.access_key",
"AWS_ACCESS_KEY", "ACCESS_KEY", "access_key"},
+ sensitive = true,
description = "The access key of S3.")
protected String accountName = "";
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/COSProperties.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/COSProperties.java
index 8f1d4b88f3a..2d1fdf303ec 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/COSProperties.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/COSProperties.java
@@ -51,8 +51,9 @@ public class COSProperties extends
AbstractS3CompatibleProperties {
protected String region = "";
@Getter
- @ConnectorProperty(names = {"cos.access_key", "s3.access_key",
"AWS_ACCESS_KEY", "access_key", "ACCESS_KEY"},
+ @ConnectorProperty(names = { "cos.access_key", "s3.access_key",
"AWS_ACCESS_KEY", "access_key", "ACCESS_KEY" },
required = false,
+ sensitive = true,
description = "The access key of COS.")
protected String accessKey = "";
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/GCSProperties.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/GCSProperties.java
index 20de10f97cd..c8c878b4ce4 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/GCSProperties.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/GCSProperties.java
@@ -77,6 +77,7 @@ public class GCSProperties extends
AbstractS3CompatibleProperties {
@Getter
@ConnectorProperty(names = {"gs.access_key", "s3.access_key",
"AWS_ACCESS_KEY", "access_key", "ACCESS_KEY"},
required = false,
+ sensitive = true,
description = "The access key of GCS.")
protected String accessKey = "";
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/MinioProperties.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/MinioProperties.java
index 34450383d83..8ba48588f73 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/MinioProperties.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/MinioProperties.java
@@ -39,8 +39,9 @@ public class MinioProperties extends
AbstractS3CompatibleProperties {
protected String region = "us-east-1";
@Getter
- @ConnectorProperty(names = {"minio.access_key", "AWS_ACCESS_KEY",
"ACCESS_KEY", "access_key", "s3.access_key"},
+ @ConnectorProperty(names = { "minio.access_key", "AWS_ACCESS_KEY",
"ACCESS_KEY", "access_key", "s3.access_key" },
required = false,
+ sensitive = true,
description = "The access key of Minio.")
protected String accessKey = "";
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/OBSProperties.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/OBSProperties.java
index 92abf2997b4..2c36fbaf6bc 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/OBSProperties.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/OBSProperties.java
@@ -45,7 +45,7 @@ public class OBSProperties extends
AbstractS3CompatibleProperties {
@Getter
@ConnectorProperty(names = {"obs.access_key", "s3.access_key",
"AWS_ACCESS_KEY", "access_key", "ACCESS_KEY"},
- required = false,
+ required = false, sensitive = true,
description = "The access key of OBS.")
protected String accessKey = "";
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/OSSProperties.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/OSSProperties.java
index bb938bdf31d..31c74dec0db 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/OSSProperties.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/OSSProperties.java
@@ -48,10 +48,9 @@ public class OSSProperties extends
AbstractS3CompatibleProperties {
protected String endpoint = "";
@Getter
- @ConnectorProperty(names = {"oss.access_key", "s3.access_key",
"AWS_ACCESS_KEY", "access_key", "ACCESS_KEY",
- "dlf.access_key", "dlf.catalog.accessKeyId", "fs.oss.accessKeyId"},
- required = false,
- description = "The access key of OSS.")
+ @ConnectorProperty(names = { "oss.access_key", "s3.access_key",
"AWS_ACCESS_KEY", "access_key", "ACCESS_KEY",
+ "dlf.access_key", "dlf.catalog.accessKeyId",
+ "fs.oss.accessKeyId" }, required = false, sensitive = true,
description = "The access key of OSS.")
protected String accessKey = "";
@Getter
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 f5840845233..86fdde03487 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
@@ -88,7 +88,7 @@ public class S3Properties extends
AbstractS3CompatibleProperties {
@ConnectorProperty(names = {"s3.access_key", "AWS_ACCESS_KEY",
"access_key", "ACCESS_KEY", "glue.access_key",
"aws.glue.access-key",
"client.credentials-provider.glue.access_key", "iceberg.rest.access-key-id",
"s3.access-key-id"},
- required = false,
+ required = false, sensitive = true,
description = "The access key of S3. Optional for anonymous access
to public datasets.")
protected String accessKey = "";
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/parser/EncryptSQLTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/parser/EncryptSQLTest.java
index 3bcc2bfa6fd..12dcec8f836 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/nereids/parser/EncryptSQLTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/parser/EncryptSQLTest.java
@@ -62,7 +62,7 @@ public class EncryptSQLTest extends ParserTestBase {
+ " \"s3.endpoint\" = \"abc\","
+ " \"s3.region\" = \"ap-beijing\","
+ " \"s3.secret_key\" = \"*XXX\","
- + " \"s3.access_key\" = \"abc\""
+ + " \"s3.access_key\" = \"*XXX\""
+ ")";
parseAndCheck(sql, res);
@@ -83,7 +83,7 @@ public class EncryptSQLTest extends ParserTestBase {
+ " \"s3.endpoint\" = \"abc\","
+ " \"s3.region\" = \"ap-beijing\","
+ " \"s3.secret_key\" = \"*XXX\","
- + " \"s3.access_key\" = \"abc\""
+ + " \"s3.access_key\" = \"*XXX\""
+ ")";
parseAndCheck(sql, res);
@@ -196,7 +196,7 @@ public class EncryptSQLTest extends ParserTestBase {
+ " \"provider\" = \"OSS\","
+ " \"s3.endpoint\" = \"oss-cn-hangzhou.aliyuncs.com\","
+ " \"s3.region\" = \"oss-cn-hangzhou\","
- + " \"s3.access_key\" = \"abc\","
+ + " \"s3.access_key\" = \"*XXX\","
+ " \"s3.secret_key\" = \"*XXX\","
+ " \"column_separator\" = \",\","
+ " \"csv_schema\" = \"user_id:int;name:string;age:int\""
@@ -221,7 +221,7 @@ public class EncryptSQLTest extends ParserTestBase {
+ " \"provider\" = \"OSS\","
+ " \"s3.endpoint\" = \"oss-cn-hangzhou.aliyuncs.com\","
+ " \"s3.region\" = \"oss-cn-hangzhou\","
- + " \"s3.access_key\" = \"abc\","
+ + " \"s3.access_key\" = \"*XXX\","
+ " \"s3.secret_key\" = \"*XXX\","
+ " \"column_separator\" = \",\","
+ " \"csv_schema\" = \"user_id:int;name:string;age:int\""
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
