Skip to content

Commit 122dfc8

Browse files
authored
Merge pull request ClickHouse#79941 from hanfei1991/hanfei/hide-secret-datalake-catalog
hide credentails for datalake catalog
2 parents 85a0661 + 25e5be8 commit 122dfc8

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

src/Parsers/FunctionSecretArgumentsFinder.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,10 @@ class FunctionSecretArgumentsFinder
628628
/// S3('url', 'access_key_id', 'secret_access_key')
629629
findS3DatabaseSecretArguments();
630630
}
631+
else if (engine_name == "DataLakeCatalog")
632+
{
633+
findDataLakeCatalogSecretArguments();
634+
}
631635
}
632636

633637
void findMySQLDatabaseSecretArguments()
@@ -658,6 +662,14 @@ class FunctionSecretArgumentsFinder
658662
}
659663
}
660664

665+
void findDataLakeCatalogSecretArguments()
666+
{
667+
/// datalake catalog should support different storage types,
668+
/// we need a function to check if the url is S3 or Azure.
669+
/// right now we assume it's a S3 url
670+
findS3DatabaseSecretArguments();
671+
}
672+
661673
void findBackupNameSecretArguments()
662674
{
663675
const String & engine_name = function->name();

tests/integration/test_database_iceberg/test.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ def create_clickhouse_iceberg_database(
138138
SETTINGS {",".join((k+"="+repr(v) for k, v in settings.items()))}
139139
"""
140140
)
141+
show_result = node.query(f"SHOW DATABASE {name}")
142+
assert minio_secret_key not in show_result
143+
assert "HIDDEN" in show_result
141144

142145

143146
def print_objects():

0 commit comments

Comments
 (0)