pass minio_client into get validation from minio

Author: douglowe

app/utils/minio_utils.py

@@ -109,11 +109,12 @@ def update_validation_status_in_minio(minio_client: object, minio_bucket: str, c
     )
 
 
-def get_validation_status_from_minio(minio_bucket: str, crate_id: str, root_path: str) -> dict:
+def get_validation_status_from_minio(minio_client: object, minio_bucket: str, crate_id: str, root_path: str) -> dict:
     """
     Checks for the existence of a validation report for the given RO-Crate in the MinIO bucket.
     Returns validation message if it exists, or notification that it is missing if not.
 
+    :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
     :return validation_status: Either the validation status, or note that this does not exist
@@ -129,9 +130,6 @@ def get_validation_status_from_minio(minio_bucket: str, crate_id: str, root_path
     logging.info(f"Getting object {object_name}")
 
     try:
-
-        minio_client = get_minio_client()
-
         response = minio_client.get_object(
             minio_bucket,
             object_name,

tests/test_minio.py

@@ -283,10 +283,9 @@ def test_download_s3error(
 def test_successful_retrieval(mocker, mock_minio_response):
     mock_client = MagicMock()
     mock_client.get_object.return_value = mock_minio_response
-    mocker.patch("app.utils.minio_utils.get_minio_client", return_value=mock_client)
 
     from app.utils.minio_utils import get_validation_status_from_minio
-    result = get_validation_status_from_minio("test_bucket", "crate123", None)
+    result = get_validation_status_from_minio(mock_client, "test_bucket", "crate123", None)
 
     assert result == {"status": "valid"}
     mock_minio_response.close.assert_called_once()
@@ -325,11 +324,10 @@ def test_get_validation_error_raised(
 ):
     mock_client = MagicMock()
     mock_client.get_object.side_effect = get_side_effect
-    mocker.patch("app.utils.minio_utils.get_minio_client", return_value=mock_client)
 
     from app.utils.minio_utils import get_validation_status_from_minio, InvalidAPIUsage
     with pytest.raises(InvalidAPIUsage) as exc:
-        get_validation_status_from_minio(bucket, crateid, root_path)
+        get_validation_status_from_minio(mock_client, bucket, crateid, root_path)
 
     assert exc.value.status_code == status_code
     assert error_check in str(exc.value.message)