Skip to content

Commit fbc40f4

Browse files
committed
Make S3 region mandatory
1 parent 780670d commit fbc40f4

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

tests/test_integration/test_run_transfer/connection_fixtures/s3_fixtures.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,15 @@ def s3_for_worker(test_settings: TestSettings) -> S3ConnectionDTO:
5757
def s3_server(s3_for_conftest):
5858
S3Server = namedtuple(
5959
"S3Server",
60-
["host", "port", "bucket", "bucket_style", "access_key", "secret_key", "protocol"],
60+
["host", "port", "bucket", "bucket_style", "region", "access_key", "secret_key", "protocol"],
6161
)
6262

6363
return S3Server(
6464
host=s3_for_conftest.host,
6565
port=s3_for_conftest.port,
6666
bucket=s3_for_conftest.bucket,
6767
bucket_style=s3_for_conftest.bucket_style,
68+
region=s3_for_conftest.region,
6869
access_key=s3_for_conftest.access_key,
6970
secret_key=s3_for_conftest.secret_key,
7071
protocol=s3_for_conftest.protocol,
@@ -79,6 +80,7 @@ def s3_file_connection(s3_server):
7980
host=s3_server.host,
8081
port=s3_server.port,
8182
bucket=s3_server.bucket,
83+
region=s3_server.region,
8284
access_key=s3_server.access_key,
8385
secret_key=s3_server.secret_key,
8486
protocol=s3_server.protocol,
@@ -121,10 +123,11 @@ def s3_file_df_connection(s3_file_connection, spark, s3_server):
121123
host=s3_server.host,
122124
port=s3_server.port,
123125
bucket=s3_server.bucket,
124-
access_key=s3_server.access_key,
125-
secret_key=s3_server.secret_key,
126126
protocol=s3_server.protocol,
127127
path_style_access=s3_server.bucket_style == "path",
128+
region=s3_server.region,
129+
access_key=s3_server.access_key,
130+
secret_key=s3_server.secret_key,
128131
spark=spark,
129132
)
130133

tests/test_unit/test_connections/test_update_connection.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,7 @@ async def test_superuser_cannot_update_connection_auth_data_type_without_secret(
360360
"host": "localhost",
361361
"port": 9000,
362362
"bucket": "new_bucket",
363+
"region": "new_region",
363364
},
364365
"type": "s3",
365366
"auth_data": {"type": "s3", "access_key": "s3_key"},

0 commit comments

Comments
 (0)