change to get_minio_client in validation tasks

Author: douglowe

app/tasks/validation_tasks.py

@@ -17,7 +17,7 @@
     fetch_ro_crate_from_minio,
     update_validation_status_in_minio,
     get_validation_status_from_minio,
-    get_minio_client_and_bucket,
+    get_minio_client,
     find_rocrate_object_on_minio,
     find_validation_object_on_minio
 )
@@ -201,7 +201,7 @@ def check_ro_crate_exists(
 
     logging.info(f"Checking for existence of RO-Crate {crate_id}")
 
-    minio_client, _ = get_minio_client_and_bucket()
+    minio_client = get_minio_client()
     if find_rocrate_object_on_minio(crate_id, minio_client, bucket_name, storage_path=root_path):
         return True
     else:
@@ -224,7 +224,7 @@ def check_validation_exists(
 
     logging.info(f"Checking for existence of RO-Crate {crate_id}")
 
-    minio_client, _ = get_minio_client_and_bucket()
+    minio_client = get_minio_client()
     if find_validation_object_on_minio(crate_id, minio_client, bucket_name, storage_path=root_path):
         return True
     else:

tests/test_validation_tasks.py

@@ -365,7 +365,7 @@ def test_return_validation_raises_error(mock_get_status):
 
 # Test function: check_ro_crate_exists
 
-@mock.patch("app.tasks.validation_tasks.get_minio_client_and_bucket", return_value=("mock_client", "mock_bucket"))
+@mock.patch("app.tasks.validation_tasks.get_minio_client", return_value="mock_client")
 @mock.patch("app.tasks.validation_tasks.find_rocrate_object_on_minio", return_value="crate123")
 def test_ro_crate_exists(
     mock_find_rocrate,
@@ -378,7 +378,7 @@ def test_ro_crate_exists(
     assert result is True
 
 
-@mock.patch("app.tasks.validation_tasks.get_minio_client_and_bucket", return_value=("mock_client", "mock_bucket"))
+@mock.patch("app.tasks.validation_tasks.get_minio_client", return_value="mock_client")
 @mock.patch("app.tasks.validation_tasks.find_rocrate_object_on_minio", return_value=False)
 def test_ro_crate_does_not_exist(
     mock_find_rocrate,
@@ -393,7 +393,7 @@ def test_ro_crate_does_not_exist(
 
 # Test function: check_validation_exists
 
-@mock.patch("app.tasks.validation_tasks.get_minio_client_and_bucket", return_value=("mock_client", "mock_bucket"))
+@mock.patch("app.tasks.validation_tasks.get_minio_client", return_value="mock_client")
 @mock.patch("app.tasks.validation_tasks.find_validation_object_on_minio", return_value="crate123")
 def test_validation_exists(
     mock_find_validation,
@@ -406,7 +406,7 @@ def test_validation_exists(
     assert result is True
 
 
-@mock.patch("app.tasks.validation_tasks.get_minio_client_and_bucket", return_value=("mock_client", "mock_bucket"))
+@mock.patch("app.tasks.validation_tasks.get_minio_client", return_value="mock_client")
 @mock.patch("app.tasks.validation_tasks.find_validation_object_on_minio", return_value=False)
 def test_validation_does_not_exist(
     mock_find_validation,