Skip to content

Commit 780670d

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

File tree

5 files changed

+6
-0
lines changed

5 files changed

+6
-0
lines changed

.env.docker.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ TEST_S3_ACCESS_KEY=syncmaster
77
TEST_S3_SECRET_KEY=123UsedForTestOnly@!
88
TEST_S3_BUCKET=syncmaster
99
TEST_S3_BUCKET_style=path
10+
TEST_S3_REGION=us-east-1
1011

1112
TEST_POSTGRES_HOST_FOR_CONFTEST=test-postgres
1213
TEST_POSTGRES_PORT_FOR_CONFTEST=5432

.env.local.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export TEST_S3_ACCESS_KEY=syncmaster
77
export TEST_S3_SECRET_KEY=123UsedForTestOnly@!
88
export TEST_S3_BUCKET=syncmaster
99
export TEST_S3_BUCKET_style=path
10+
export TEST_S3_REGION=us-east-1
1011

1112
export TEST_POSTGRES_HOST_FOR_CONFTEST=localhost
1213
export TEST_POSTGRES_PORT_FOR_CONFTEST=5433

tests/settings.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ class TestSettings(BaseSettings):
7474
TEST_S3_PORT_FOR_WORKER: int
7575
TEST_S3_BUCKET: str
7676
TEST_S3_BUCKET_STYLE: Literal["domain", "path"] = "path"
77+
TEST_S3_REGION: str
7778
TEST_S3_ACCESS_KEY: str
7879
TEST_S3_SECRET_KEY: str
7980
TEST_S3_PROTOCOL: str = "http"

tests/test_integration/test_run_transfer/connection_fixtures/s3_fixtures.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ def s3_for_conftest(test_settings: TestSettings) -> S3ConnectionDTO:
2727
port=test_settings.TEST_S3_PORT_FOR_CONFTEST,
2828
bucket=test_settings.TEST_S3_BUCKET,
2929
bucket_style=test_settings.TEST_S3_BUCKET_STYLE,
30+
region=test_settings.TEST_S3_REGION,
3031
access_key=test_settings.TEST_S3_ACCESS_KEY,
3132
secret_key=test_settings.TEST_S3_SECRET_KEY,
3233
protocol=test_settings.TEST_S3_PROTOCOL,
@@ -44,6 +45,7 @@ def s3_for_worker(test_settings: TestSettings) -> S3ConnectionDTO:
4445
port=test_settings.TEST_S3_PORT_FOR_WORKER,
4546
bucket=test_settings.TEST_S3_BUCKET,
4647
bucket_style=test_settings.TEST_S3_BUCKET_STYLE,
48+
region=test_settings.TEST_S3_REGION,
4749
access_key=test_settings.TEST_S3_ACCESS_KEY,
4850
secret_key=test_settings.TEST_S3_SECRET_KEY,
4951
protocol=test_settings.TEST_S3_PROTOCOL,

tests/test_unit/test_connections/connection_fixtures/group_connections_fixture.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ async def group_connections(
4646
new_data.update(
4747
{
4848
"bucket": "bucket",
49+
"region": "us-east-1",
4950
},
5051
)
5152
elif conn_type == ConnectionType.SAMBA:

0 commit comments

Comments
 (0)