Skip to content

Commit d660469

Browse files
committed
try to also fix parquet s3 tests
1 parent a097d8f commit d660469

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed

parquet/configs/users.d/users.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@
8888
<!-- Allow access management -->
8989
<access_management>1</access_management>
9090

91+
<!-- Allow access to named collections -->
92+
<named_collection_control>1</named_collection_control>
93+
<show_named_collections>1</show_named_collections>
94+
<show_named_collections_secrets>1</show_named_collections_secrets>
95+
9196
<!-- Example of row level security policy. -->
9297
<!-- <databases>
9398
<test>

parquet/configs/users.d/users_disabled_caching.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,11 @@
8787
<!-- Allow access management -->
8888
<access_management>1</access_management>
8989

90+
<!-- Allow access to named collections -->
91+
<named_collection_control>1</named_collection_control>
92+
<show_named_collections>1</show_named_collections>
93+
<show_named_collections_secrets>1</show_named_collections_secrets>
94+
9095
<!-- Example of row level security policy. -->
9196
<!-- <databases>
9297
<test>

parquet/tests/s3.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ def insert_into_function(self):
269269

270270
with When("I insert test data into `s3` table function in Parquet format"):
271271
node.query(
272-
f"INSERT INTO FUNCTION s3('{self.context.uri}{file_name}.Parquet', '{self.context.access_key_id}', '{self.context.secret_access_key}', 'Parquet', '{func_def}', '{compression_type.lower()}') VALUES {','.join(total_values)}",
272+
f"INSERT INTO FUNCTION s3(s3_credentials, url='{self.context.uri}{file_name}.Parquet', format='Parquet', structure='{func_def}', compression_method='{compression_type.lower()}') VALUES {','.join(total_values)}",
273273
settings=[("allow_suspicious_low_cardinality_types", 1)],
274274
)
275275

@@ -328,7 +328,7 @@ def select_from_function_manual_cast_types(self):
328328
executor=executor,
329329
)(
330330
sql=f"SELECT {column.name}, toTypeName({column.name}) FROM \
331-
s3('{self.context.uri}{table_name}.Parquet', '{self.context.access_key_id}', '{self.context.secret_access_key}', 'Parquet', '{table_def}')",
331+
s3(s3_credentials, url='{self.context.uri}{table_name}.Parquet', format='Parquet', structure='{table_def}')",
332332
)
333333
join()
334334

@@ -373,7 +373,7 @@ def select_from_function_auto_cast_types(self):
373373
executor=executor,
374374
)(
375375
sql=f"SELECT {column.name}, toTypeName({column.name}) FROM \
376-
s3('{self.context.uri}{table_name}.Parquet', '{self.context.access_key_id}', '{self.context.secret_access_key}', 'Parquet')",
376+
s3(s3_credentials, url='{self.context.uri}{table_name}.Parquet', format='Parquet')",
377377
)
378378
join()
379379

@@ -442,6 +442,13 @@ def outline(self, compression_type):
442442
self.context.compression_type = compression_type
443443
self.context.node = self.context.cluster.node("clickhouse1")
444444

445+
with Given("I add S3 credentials configuration"):
446+
named_s3_credentials(
447+
access_key_id=self.context.access_key_id,
448+
secret_access_key=self.context.secret_access_key,
449+
restart=True,
450+
)
451+
445452
Suite(run=engine)
446453
Suite(run=function)
447454

0 commit comments

Comments
 (0)