pass minio client into update validation function

Author: douglowe

app/utils/minio_utils.py

@@ -61,10 +61,11 @@ def fetch_ro_crate_from_minio(minio_client: object, minio_bucket: str, crate_id:
     return local_root_path
 
 
-def update_validation_status_in_minio(minio_bucket: str, crate_id: str, root_path: str, validation_status: str) -> None:
+def update_validation_status_in_minio(minio_client: object, minio_bucket: str, crate_id: str, root_path: str, validation_status: str) -> None:
     """
     Uploads the validation status to the MinIO bucket.
 
+    :param minio_client: The MinIO client
     :param minio_bucket: The MinIO bucket containing the RO-Crate.
     :param crate_id: The ID of the RO-Crate in MinIO
     :param validation_status: The validation result to upload
@@ -83,9 +84,6 @@ def update_validation_status_in_minio(minio_bucket: str, crate_id: str, root_pat
     validation_string = json.dumps(json.loads(validation_status), indent=None).encode("utf-8")
 
     try:
-
-        minio_client = get_minio_client()
-
         minio_client.put_object(
             minio_bucket,
             object_name,

tests/test_minio.py

@@ -337,16 +337,14 @@ def test_get_validation_error_raised(
 
 # Testing function: update_validation_status_in_minio
 
-@mock.patch("app.utils.minio_utils.get_minio_client")
-def test_update_validation_status_success(mock_get_client):
+def test_update_validation_status_success():
     mock_minio_client = mock.Mock()
-    mock_get_client.return_value = mock_minio_client
 
     crate_id = "crate123"
     validation_status = json.dumps({"status": "valid", "errors": []})
 
     from app.utils.minio_utils import update_validation_status_in_minio
-    update_validation_status_in_minio("test_bucket", crate_id, "", validation_status)
+    update_validation_status_in_minio(mock_minio_client, "test_bucket", crate_id, "", validation_status)
 
     expected_object_name = f"{crate_id}_validation/validation_status.txt"
     expected_data = json.dumps(json.loads(validation_status), indent=None).encode("utf-8")
@@ -400,19 +398,16 @@ def test_update_validation_status_success(mock_get_client):
         ],
         ids=["s3error", "value_error", "unexpected_error"]
 )
-@mock.patch("app.utils.minio_utils.get_minio_client")
 def test_update_validation_status_erro(
-        mock_get_client,
         bucket: str, crateid: str, root_path: str, validation_result: dict,
         put_side_effect, error_check: str, status_code: int
 ):
     mock_minio_client = mock.Mock()
-    mock_get_client.return_value = mock_minio_client
     mock_minio_client.put_object.side_effect = put_side_effect
 
     from app.utils.minio_utils import update_validation_status_in_minio, InvalidAPIUsage
     with pytest.raises(InvalidAPIUsage) as exc:
-        update_validation_status_in_minio(bucket, crateid, root_path, json.dumps(validation_result))
+        update_validation_status_in_minio(mock_minio_client, bucket, crateid, root_path, json.dumps(validation_result))
 
     assert exc.value.status_code == status_code
     assert error_check in str(exc.value.message)