change to force-virtual-addressing

Author: fcfangcc

pyiceberg/io/__init__.py

@@ -62,7 +62,6 @@
 S3_PROXY_URI = "s3.proxy-uri"
 S3_CONNECT_TIMEOUT = "s3.connect-timeout"
 S3_REQUEST_TIMEOUT = "s3.request-timeout"
-S3_ADDRESSING_STYLE = "s3.addressing-style"
 S3_SIGNER = "s3.signer"
 S3_SIGNER_URI = "s3.signer.uri"
 S3_SIGNER_ENDPOINT = "s3.signer.endpoint"

pyiceberg/io/fsspec.py

@@ -67,10 +67,10 @@
     HF_ENDPOINT,
     HF_TOKEN,
     S3_ACCESS_KEY_ID,
-    S3_ADDRESSING_STYLE,
     S3_ANONYMOUS,
     S3_CONNECT_TIMEOUT,
     S3_ENDPOINT,
+    S3_FORCE_VIRTUAL_ADDRESSING,
     S3_PROXY_URI,
     S3_REGION,
     S3_REQUEST_TIMEOUT,
@@ -169,8 +169,8 @@ def _s3(properties: Properties) -> AbstractFileSystem:
     if request_timeout := properties.get(S3_REQUEST_TIMEOUT):
         config_kwargs["read_timeout"] = float(request_timeout)
 
-    if addressing_style := properties.get(S3_ADDRESSING_STYLE):
-        config_kwargs["s3"] = {"addressing_style": addressing_style}
+    if _force_virtual_addressing := properties.get(S3_FORCE_VIRTUAL_ADDRESSING):
+        config_kwargs["s3"] = {"addressing_style": "virtual"}
 
     if s3_anonymous := properties.get(S3_ANONYMOUS):
         anon = strtobool(s3_anonymous)

tests/io/test_fsspec.py

@@ -306,9 +306,9 @@ def test_fsspec_s3_session_properties() -> None:
         )
 
 
-def test_fsspec_s3_session_properties_with_addressing_style() -> None:
+def test_fsspec_s3_session_properties_force_virtual_addressing() -> None:
     session_properties: Properties = {
-        "s3.addressing-style": "virtual",
+        "s3.force-virtual-addressing": True,
         "s3.endpoint": "http://localhost:9000",
         "s3.access-key-id": "admin",
         "s3.secret-access-key": "password",