fix: postman collection "Management API Tests", data-service usability and compilation of mxd-runtimes

AndrYurk · AndrYurk · commit a946470fe6e6 · 2025-03-06T14:37:13.000+01:00
diff --git a/mxd-runtimes/data-service-api/src/main/java/org/eclipse/tractusx/mxd/dataservice/DataServiceExtension.java b/mxd-runtimes/data-service-api/src/main/java/org/eclipse/tractusx/mxd/dataservice/DataServiceExtension.java
@@ -25,6 +25,7 @@
 import org.eclipse.edc.runtime.metamodel.annotation.Settings;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.types.TypeManager;
 import org.eclipse.edc.web.spi.WebServer;
 import org.eclipse.edc.web.spi.WebService;
 import org.eclipse.edc.web.spi.configuration.PortMapping;
@@ -46,6 +47,8 @@ public class DataServiceExtension implements ServiceExtension {
     private DataServiceApiConfiguration apiConfig;
     @Inject
     private PortMappingRegistry portMappingRegistry;
+    @Inject
+    private TypeManager typeManager;
 
     @Override
     public String name() {
@@ -59,7 +62,7 @@ public void initialize(ServiceExtensionContext context) {
 
         var database = new ConcurrentHashMap<String, DataRecord>();
         populate(database);
-        webService.registerResource(DATA_API_CONTEXT_NAME, new DataServiceApiController(database));
+        webService.registerResource(DATA_API_CONTEXT_NAME, new DataServiceApiController(database, typeManager.getMapper()));
     }
 
     private void populate(Map<String, DataRecord> database) {
diff --git a/mxd-runtimes/data-service-api/src/main/java/org/eclipse/tractusx/mxd/dataservice/api/DataServiceApi.java b/mxd-runtimes/data-service-api/src/main/java/org/eclipse/tractusx/mxd/dataservice/api/DataServiceApi.java
@@ -22,7 +22,6 @@
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.eclipse.edc.spi.query.QuerySpec;
 import org.eclipse.edc.web.spi.ApiErrorDetail;
 import org.eclipse.tractusx.mxd.dataservice.model.DataRecord;
 
@@ -63,7 +62,7 @@ public interface DataServiceApi {
                     @ApiResponse(responseCode = "401", description = "Not authenticated: principal could not be identified",
                             content = @Content(array = @ArraySchema(schema = @Schema(implementation = ApiErrorDetail.class))))
             })
-    void create(DataRecord dataRecord);
+    String create(DataRecord dataRecord);
 
 
     @Operation(description = "Updates an existing DataRecord with new values.",
diff --git a/mxd-runtimes/data-service-api/src/main/java/org/eclipse/tractusx/mxd/dataservice/api/DataServiceApiController.java b/mxd-runtimes/data-service-api/src/main/java/org/eclipse/tractusx/mxd/dataservice/api/DataServiceApiController.java
@@ -14,6 +14,8 @@
 
 package org.eclipse.tractusx.mxd.dataservice.api;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.DELETE;
 import jakarta.ws.rs.GET;
@@ -23,13 +25,13 @@
 import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
-import org.eclipse.edc.web.spi.exception.InvalidRequestException;
+import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.web.spi.exception.ObjectConflictException;
 import org.eclipse.edc.web.spi.exception.ObjectNotFoundException;
 import org.eclipse.tractusx.mxd.dataservice.model.DataRecord;
 
+import java.io.IOException;
 import java.util.Collection;
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 @Consumes(MediaType.APPLICATION_JSON)
@@ -38,9 +40,11 @@
 public class DataServiceApiController implements DataServiceApi {
 
     private final ConcurrentHashMap<String, DataRecord> database;
+    private final ObjectMapper objectMapper;
 
-    public DataServiceApiController(ConcurrentHashMap<String, DataRecord> database) {
+    public DataServiceApiController(ConcurrentHashMap<String, DataRecord> database, ObjectMapper objectMapper) {
         this.database = database;
+        this.objectMapper = objectMapper;
     }
 
     @GET
@@ -61,11 +65,12 @@ public DataRecord findById(@PathParam("id") String id) {
 
     @POST
     @Override
-    public void create(DataRecord dataRecord) {
+    public String create(DataRecord dataRecord) {
         if (database.containsKey(dataRecord.id())) {
             throw new ObjectConflictException("DataRecord with id " + dataRecord.id() + " already exists");
         }
         database.put(dataRecord.id(), dataRecord);
+        return createJsonResponse(dataRecord.id());
     }
 
     @PUT
@@ -86,4 +91,13 @@ public void delete(@PathParam("id") String id) {
         }
         database.remove(id);
     }
+
+    private String createJsonResponse(String id) {
+        JsonNode jsonResponse = objectMapper.createObjectNode().put("id", id);
+        try {
+            return objectMapper.writeValueAsString(jsonResponse);
+        } catch (IOException e) {
+            throw new EdcException(e.getMessage());
+        }
+    }
 }
diff --git a/mxd-runtimes/tx-issuerservice/src/main/java/org/eclipse/edc/issuerservice/demo/attestation/DemoAttestationSourceFactory.java b/mxd-runtimes/tx-issuerservice/src/main/java/org/eclipse/edc/issuerservice/demo/attestation/DemoAttestationSourceFactory.java
@@ -21,7 +21,6 @@
 public class DemoAttestationSourceFactory implements AttestationSourceFactory {
     @Override
     public AttestationSource createSource(AttestationDefinition definition) {
-        var config = definition.configuration();
         return new DemoAttestationSource();
     }
 
diff --git a/mxd/README.md b/mxd/README.md
@@ -73,7 +73,7 @@ this should compile the Java code and build Docker images out of all runtimes. O
 KinD:
 
 ```shell
-kind load docker-image --name mxd data-service-api tx-identityhub tx-identityhub-sts tx-identityhub tx-catalog-server tx-sts
+kind load docker-image --name mxd data-service-api tx-identityhub tx-catalog-server tx-issuerservice
 ```
 
 ### 2.3 Bring up the data space
diff --git a/mxd/data-service-api.tf b/mxd/data-service-api.tf
@@ -124,3 +124,44 @@ resource "kubernetes_service" "data-service-api" {
   }
 }
 
+resource "kubernetes_ingress_v1" "api-ingress" {
+  metadata {
+    name      = "${var.humanReadableName}-ingress"
+    namespace = var.namespace
+    annotations = {
+      "nginx.ingress.kubernetes.io/rewrite-target" = "/$2"
+      "nginx.ingress.kubernetes.io/use-regex"      = "true"
+    }
+  }
+  spec {
+    ingress_class_name = "nginx"
+    rule {
+      host = var.ingress-host
+      http {
+        path {
+          path = "/data-service(/|$)(.*)"
+          backend {
+            service {
+              name = "data-service-api"
+              port {
+                number = 8080
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+variable "ingress-host" {
+  description = "Ingress Host"
+  default     = "localhost"
+}
+
+variable "humanReadableName" {
+  type        = string
+  description = "Human readable name of the data service, NOT the ID!!. Required."
+  default     = "data-service"
+}
+
diff --git a/mxd/postman/management_api_tests.json b/mxd/postman/management_api_tests.json

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`	`public class DemoAttestationSourceFactory implements AttestationSourceFactory {`
`22`	`22`	`@Override`
`23`	`23`	`public AttestationSource createSource(AttestationDefinition definition) {`
`24`		`- var config = definition.configuration();`
`25`	`24`	`return new DemoAttestationSource();`
`26`	`25`	`}`
`27`	`26`