fixup! move checks to config validator

rohmu/object_storage/azure.py

@@ -136,9 +136,6 @@ def conn_string(
 
             conn.append(f"EndpointSuffix={endpoint_suffix}")
         else:
-            if not host or not port:
-                raise InvalidConfigurationError("Custom host and port must be specified together")
-
             conn.append(f"BlobEndpoint={protocol}://{host}:{port}/{account_name}")
         return ";".join(conn)
 

rohmu/object_storage/config.py

@@ -90,6 +90,14 @@ class AzureObjectStorageConfig(StorageModel):
     proxy_info: Optional[ProxyInfo] = None
     storage_type: Literal[StorageDriver.azure] = StorageDriver.azure
 
+    @root_validator
+    @classmethod
+    def host_and_port_must_be_set_together(cls, values: Dict[str, Any]) -> Dict[str, Any]:
+        if "host" in values and "port" in values:
+            if not values["host"] or not values["port"]:
+                raise ValueError("host and port must be set together")
+        return values
+
 
 class GoogleObjectStorageConfig(StorageModel):
     project_id: str

test/object_storage/test_azure.py

@@ -2,6 +2,7 @@
 from datetime import datetime
 from io import BytesIO
 from rohmu.errors import InvalidByteRangeError
+from rohmu.object_storage.config import AzureObjectStorageConfig
 from tempfile import NamedTemporaryFile
 from types import ModuleType
 from typing import Any, Optional, Tuple
@@ -105,6 +106,13 @@ def test_get_contents_to_fileobj_raises_error_on_invalid_byte_range(azure_module
         )
 
 
+def test_azure_config_host_port_set_together() -> None:
+    with pytest.raises(ValueError):
+        AzureObjectStorageConfig(account_name="test", host="localhost")
+    with pytest.raises(ValueError):
+        AzureObjectStorageConfig(account_name="test", port=10000)
+
+
 @pytest.mark.parametrize(
     "host,port,is_secured,expected",
     [