fix S3BucketName validation

Author: giancarloromeo

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/modules/s3.py

@@ -4,6 +4,7 @@
 from aws_library.s3 import S3NotConnectedError, SimcoreS3API
 from fastapi import FastAPI
 from models_library.api_schemas_storage import S3BucketName
+from pydantic import TypeAdapter
 from settings_library.s3 import S3Settings
 from tenacity import (
     AsyncRetrying,
@@ -36,7 +37,9 @@ async def on_startup() -> None:
         ):
             with attempt:
                 connected = await client.http_check_bucket_connected(
-                    bucket=S3BucketName(settings.S3_BUCKET_NAME)
+                    bucket=TypeAdapter(S3BucketName).validate_python(
+                        settings.S3_BUCKET_NAME
+                    )
                 )
                 if not connected:
                     raise S3NotConnectedError  # pragma: no cover

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/resource_tracker_service_runs.py

@@ -18,7 +18,7 @@
 from models_library.rest_ordering import OrderBy
 from models_library.users import UserID
 from models_library.wallets import WalletID
-from pydantic import AnyUrl, PositiveInt
+from pydantic import AnyUrl, PositiveInt, TypeAdapter
 from servicelib.rabbitmq.rpc_interfaces.resource_usage_tracker.errors import (
     CustomResourceUsageTrackerError,
 )
@@ -158,7 +158,7 @@ async def export_service_runs(
     started_until = filters.started_at.until if filters else None
 
     # Create S3 key name
-    s3_bucket_name = S3BucketName(bucket_name)
+    s3_bucket_name = TypeAdapter(S3BucketName).validate_python(bucket_name)
     # NOTE: su stands for "service usage"
     file_name = f"su_{shortuuid.uuid()}.csv"
     s3_object_key = f"resource-usage-tracker-service-runs/{datetime.now(tz=timezone.utc).date()}/{file_name}"

services/storage/src/simcore_service_storage/handlers_health.py

@@ -11,6 +11,7 @@
 from models_library.api_schemas_storage import HealthCheck, S3BucketName
 from models_library.app_diagnostics import AppStatusCheck
 from models_library.utils.json_serialization import json_dumps
+from pydantic import TypeAdapter
 from servicelib.rest_constants import RESPONSE_MODEL_POLICY
 
 from ._meta import API_VERSION, API_VTAG, PROJECT_NAME, VERSION
@@ -53,7 +54,9 @@ async def get_status(request: web.Request) -> web.Response:
             s3_state = (
                 "connected"
                 if await get_s3_client(request.app).bucket_exists(
-                    bucket=S3BucketName(app_settings.STORAGE_S3.S3_BUCKET_NAME)
+                    bucket=TypeAdapter(S3BucketName).validate_python(
+                        app_settings.STORAGE_S3.S3_BUCKET_NAME
+                    )
                 )
                 else "no access to S3 bucket"
             )

services/storage/tests/unit/test_dsm_soft_links.py

@@ -13,7 +13,7 @@
 from models_library.projects_nodes_io import SimcoreS3FileID
 from models_library.users import UserID
 from models_library.utils.fastapi_encoders import jsonable_encoder
-from pydantic import ByteSize
+from pydantic import ByteSize, TypeAdapter
 from simcore_postgres_database.storage_models import file_meta_data
 from simcore_service_storage.models import FileMetaData, FileMetaDataAtDB
 from simcore_service_storage.simcore_s3_dsm import SimcoreS3DataManager
@@ -34,7 +34,7 @@ async def output_file(
     file = FileMetaData.from_simcore_node(
         user_id=user_id,
         file_id=SimcoreS3FileID(f"{project_id}/{node_id}/filename.txt"),
-        bucket=S3BucketName("master-simcore"),
+        bucket=TypeAdapter(S3BucketName).validate_python("master-simcore"),
         location_id=SimcoreS3DataManager.get_location_id(),
         location_name=SimcoreS3DataManager.get_location_name(),
         sha256_checksum=faker.sha256(),

services/storage/tests/unit/test_models.py

@@ -4,7 +4,7 @@
 from models_library.api_schemas_storage import S3BucketName
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID, SimcoreS3FileID, StorageFileID
-from pydantic import ValidationError, parse_obj_as
+from pydantic import TypeAdapter, ValidationError
 from simcore_service_storage.models import FileMetaData
 from simcore_service_storage.simcore_s3_dsm import SimcoreS3DataManager
 
@@ -15,7 +15,7 @@
 )
 def test_file_id_raises_error(file_id: str):
     with pytest.raises(ValidationError):
-        parse_obj_as(StorageFileID, file_id)
+        TypeAdapter(StorageFileID).validate_python(file_id)
 
 
 @pytest.mark.parametrize(
@@ -38,17 +38,17 @@ def test_file_id_raises_error(file_id: str):
     ],
 )
 def test_file_id(file_id: str):
-    parsed_file_id = parse_obj_as(StorageFileID, file_id)
+    parsed_file_id = TypeAdapter(StorageFileID).validate_python(file_id)
     assert parsed_file_id
     assert parsed_file_id == file_id
 
 
 def test_fmd_build():
-    file_id = parse_obj_as(SimcoreS3FileID, f"api/{uuid.uuid4()}/xx.dat")
+    file_id = TypeAdapter(SimcoreS3FileID).validate_python(f"api/{uuid.uuid4()}/xx.dat")
     fmd = FileMetaData.from_simcore_node(
         user_id=12,
         file_id=file_id,
-        bucket=S3BucketName("test-bucket"),
+        bucket=TypeAdapter(S3BucketName).validate_python("test-bucket"),
         location_id=SimcoreS3DataManager.get_location_id(),
         location_name=SimcoreS3DataManager.get_location_name(),
         sha256_checksum=None,
@@ -64,11 +64,13 @@ def test_fmd_build():
     assert fmd.location_id == SimcoreS3DataManager.get_location_id()
     assert fmd.bucket_name == "test-bucket"
 
-    file_id = parse_obj_as(SimcoreS3FileID, f"{uuid.uuid4()}/{uuid.uuid4()}/xx.dat")
+    file_id = TypeAdapter(SimcoreS3FileID).validate_python(
+        f"{uuid.uuid4()}/{uuid.uuid4()}/xx.dat"
+    )
     fmd = FileMetaData.from_simcore_node(
         user_id=12,
         file_id=file_id,
-        bucket=S3BucketName("test-bucket"),
+        bucket=TypeAdapter(S3BucketName).validate_python("test-bucket"),
         location_id=SimcoreS3DataManager.get_location_id(),
         location_name=SimcoreS3DataManager.get_location_name(),
         sha256_checksum=None,

services/storage/tests/unit/test_utils.py

@@ -16,7 +16,7 @@
 from faker import Faker
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID, SimcoreS3FileID
-from pydantic import ByteSize, HttpUrl, parse_obj_as
+from pydantic import ByteSize, HttpUrl, TypeAdapter, parse_obj_as
 from simcore_service_storage.constants import S3_UNDEFINED_OR_EXTERNAL_MULTIPART_ID
 from simcore_service_storage.models import ETag, FileMetaData, S3BucketName, UploadID
 from simcore_service_storage.simcore_s3_dsm import SimcoreS3DataManager
@@ -79,7 +79,7 @@ def test_file_entry_valid(
     fmd = FileMetaData.from_simcore_node(
         user_id=faker.pyint(min_value=1),
         file_id=file_id,
-        bucket=S3BucketName("pytest-bucket"),
+        bucket=TypeAdapter(S3BucketName).validate_python("pytest-bucket"),
         location_id=SimcoreS3DataManager.get_location_id(),
         location_name=SimcoreS3DataManager.get_location_name(),
         sha256_checksum=None,