Fix test S3 config

Author: dolfinus

.env.docker.test

@@ -6,6 +6,7 @@ TEST_S3_PORT_FOR_WORKER=9000
 TEST_S3_ACCESS_KEY=syncmaster
 TEST_S3_SECRET_KEY=123UsedForTestOnly@!
 TEST_S3_BUCKET=syncmaster
+TEST_S3_BUCKET_style=path
 
 TEST_POSTGRES_HOST_FOR_CONFTEST=test-postgres
 TEST_POSTGRES_PORT_FOR_CONFTEST=5432

.env.local.test

@@ -6,6 +6,7 @@ export TEST_S3_PORT_FOR_WORKER=9000
 export TEST_S3_ACCESS_KEY=syncmaster
 export TEST_S3_SECRET_KEY=123UsedForTestOnly@!
 export TEST_S3_BUCKET=syncmaster
+export TEST_S3_BUCKET_style=path
 
 export TEST_POSTGRES_HOST_FOR_CONFTEST=localhost
 export TEST_POSTGRES_PORT_FOR_CONFTEST=5433

syncmaster/dto/connections.py

@@ -79,7 +79,7 @@ class IcebergRESTCatalogS3ConnectionDTO(ConnectionDTO):
     s3_warehouse_path: str
     s3_host: str
     s3_bucket: str
-    s3_bucket_style: str
+    s3_bucket_style: Literal["domain", "path"]
     s3_region: str
     s3_access_key: str
     s3_secret_key: str
@@ -105,7 +105,7 @@ class S3ConnectionDTO(ConnectionDTO):
     access_key: str
     secret_key: str
     bucket: str
-    bucket_style: str
+    bucket_style: Literal["domain", "path"]
     additional_params: dict
     region: str | None = None
     protocol: str = "https"

tests/settings.py

@@ -1,5 +1,7 @@
 # SPDX-FileCopyrightText: 2023-2024 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
+from typing import Literal
+
 from pydantic import model_validator
 from pydantic_settings import BaseSettings
 
@@ -56,7 +58,7 @@ class TestSettings(BaseSettings):
     TEST_ICEBERG_METASTORE_PASSWORD: str
     TEST_ICEBERG_S3_WAREHOUSE_PATH: str
     TEST_ICEBERG_S3_REGION: str
-    TEST_ICEBERG_S3_BUCKET_STYLE: bool = True
+    TEST_ICEBERG_S3_BUCKET_STYLE: Literal["domain", "path"] = "path"
 
     TEST_HDFS_HOST: str
     TEST_HDFS_WEBHDFS_PORT: int
@@ -67,6 +69,7 @@ class TestSettings(BaseSettings):
     TEST_S3_HOST_FOR_WORKER: str
     TEST_S3_PORT_FOR_WORKER: int
     TEST_S3_BUCKET: str
+    TEST_S3_BUCKET_STYLE: Literal["domain", "path"] = "path"
     TEST_S3_ACCESS_KEY: str
     TEST_S3_SECRET_KEY: str
     TEST_S3_PROTOCOL: str = "http"