add minio config to api get route

Author: douglowe

app/ro_crates/routes/get_routes.py

@@ -5,16 +5,25 @@
 # Copyright (c) 2025 eScience Lab, The University of Manchester
 
 from apiflask import APIBlueprint, Schema
-from apiflask.fields import String
+from apiflask.fields import String, Boolean
+from marshmallow.fields import Nested
 from flask import Response
 
 from app.services.validation_service import get_ro_crate_validation_task
 
 get_routes_bp = APIBlueprint("get_routes", __name__)
 
 
+class MinioConfig(Schema):
+    endpoint = String(required=True)
+    accesskey = String(required=True)
+    secret = String(required=True)
+    ssl = Boolean(required=True)
+    bucket = String(required=True)
+
+
 class ValidateResult(Schema):
-    minio_bucket = String(required=True)
+    minio_config = Nested(MinioConfig, required=True)
     root_path = String(required=False)
 
 
@@ -28,7 +37,12 @@ def get_ro_crate_validation_by_id(json_data, crate_id) -> tuple[Response, int]:
     - **crate_id**: The RO-Crate ID. _Required_.
 
     Request Body Parameters:
-    - **minio_bucket**: The MinIO bucket containing the RO-Crate. _Required_
+    - **minio_config**: The MinIO bucket containing the RO-Crate. _Required_
+      - **endpoint**: Endpoint, e.g. 'localhost:9000'
+      - **accesskey**: Access key / username
+      - **secret**: Secret / password
+      - **ssl**: Use SSL encryption? True/False
+      - **bucket**: The MinIO bucket to access 
     - **root_path**: The root path containing the RO-Crate. _Optional_
 
     Returns:
@@ -38,11 +52,11 @@ def get_ro_crate_validation_by_id(json_data, crate_id) -> tuple[Response, int]:
     - KeyError: If required parameters (`crate_id`) are missing.
     """
 
-    minio_bucket = json_data["minio_bucket"]
+    minio_config = json_data["minio_config"]
 
     if "root_path" in json_data:
         root_path = json_data["root_path"]
     else:
         root_path = None
 
-    return get_ro_crate_validation_task(minio_bucket, crate_id, root_path)
+    return get_ro_crate_validation_task(minio_config, crate_id, root_path)

tests/test_api_routes.py

@@ -200,13 +200,25 @@ def test_validate_metadata_failure(client: FlaskClient, payload: dict, status_co
     "crate_id, payload, status_code",
     [
         (
-            "",{
-                "minio_bucket": "test_bucket",
+            "", {
+                "minio_config": {
+                    "endpoint": "localhost:9000",
+                    "accesskey": "admin",
+                    "secret": "password123",
+                    "ssl": False,
+                    "bucket": "test_bucket"
+                },
                 "root_path": "base_path"
             }, 404
         ),
         (
-            "crate-123",{
+            "crate-123", {
+                "minio_config": {
+                    "endpoint": "localhost:9000",
+                    "accesskey": "admin",
+                    "secret": "password123",
+                    "ssl": False,
+                },
                 "root_path": "base_path"
             }, 422
         ),
@@ -221,7 +233,13 @@ def test_get_validation_by_id_failures(client: FlaskClient, crate_id: str, paylo
 def test_get_validation_by_id_success(client):
     crate_id = "crate-123"
     payload = {
-        "minio_bucket": "test_bucket",
+        "minio_config": {
+            "endpoint": "localhost:9000",
+            "accesskey": "admin",
+            "secret": "password123",
+            "ssl": False,
+            "bucket": "test_bucket"
+        },
         "root_path": "base_path"
     }
 
@@ -232,20 +250,26 @@ def test_get_validation_by_id_success(client):
 
         assert response.status_code == 200
         assert response.json == {"status": "valid"}
-        mock_get.assert_called_once_with("test_bucket", "crate-123", "base_path")
+        mock_get.assert_called_once_with(payload["minio_config"], "crate-123", "base_path")
 
 
 def test_get_validation_by_id_missing_root_path(client):
     crate_id = "crate-123"
     payload = {
-        "minio_bucket": "test_bucket",
+        "minio_config": {
+            "endpoint": "localhost:9000",
+            "accesskey": "admin",
+            "secret": "password123",
+            "ssl": False,
+            "bucket": "test_bucket"
+        }
     }
 
     with patch("app.ro_crates.routes.get_routes.get_ro_crate_validation_task") as mock_get:
-        mock_get.return_value = ({"message": "Validation in progress"}, 202)
+        mock_get.return_value = ({"status": "valid"}, 200)
 
         response = client.get(f"/v1/ro_crates/{crate_id}/validation", json=payload)
 
-        assert response.status_code == 202
-        assert response.json == {"message": "Validation in progress"}
-        mock_get.assert_called_once_with("test_bucket", "crate-123", None)
+        assert response.status_code == 200
+        assert response.json == {"status": "valid"}
+        mock_get.assert_called_once_with(payload["minio_config"], "crate-123", None)