get rid of the backend service

Author: ndr-brt

settings.gradle.kts

@@ -267,7 +267,6 @@ include(":spi:policy-monitor:policy-monitor-spi")
 include(":tests:junit-base")
 
 // modules for system tests ------------------------------------------------------------------------
-include(":system-tests:e2e-transfer-test:backend-service")
 include(":system-tests:e2e-transfer-test:control-plane")
 include(":system-tests:e2e-transfer-test:data-plane")
 include(":system-tests:e2e-transfer-test:runner")

system-tests/e2e-transfer-test/README.md

@@ -4,7 +4,6 @@ This tests verifies some complete scenarios of contract negotiation and data tra
 
 ## Modules detail
 
-* [backend-service](./backend-service): it represents an external application that interacts with the EDC.
 * [control-plane](./control-plane): it's responsible for handling the contract negotiation phase using in-memory persistence
 * [data-plane](./data-plane): it handles the data transfer phase acting as a proxy
 * [runner](./runner): it contains the test implementation

system-tests/e2e-transfer-test/backend-service/src/main/java/org/eclipse/edc/test/e2e/BackendServiceTestExtension.java

@@ -43,8 +43,6 @@ public void initialize(ServiceExtensionContext context) {
         var exposedHttpPort = context.getConfig().getInteger("web.http.port");
         webService.registerResource(new ProviderBackendApiController());
         webService.registerResource(new ConsumerBackendServiceController(context.getMonitor()));
-        webService.registerResource(new BackendServiceHttpProvisionerController(context.getMonitor(), httpClient, typeManager, exposedHttpPort));
-        webService.registerResource(new Oauth2TokenController(context.getMonitor()));
         webService.registerResource(new EdcApiExceptionMapper());
     }
 }

system-tests/e2e-transfer-test/backend-service/src/main/java/org/eclipse/edc/test/e2e/Oauth2TokenController.java

@@ -14,17 +14,13 @@
 
 package org.eclipse.edc.test.e2e;
 
-import com.nimbusds.jwt.SignedJWT;
 import jakarta.ws.rs.DefaultValue;
 import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.QueryParam;
 import jakarta.ws.rs.core.MediaType;
-import org.eclipse.edc.web.spi.exception.NotAuthorizedException;
 
-import java.text.ParseException;
 import java.util.Map;
 
 @Path("/provider")
@@ -37,29 +33,4 @@ public Map<String, String> getData(@DefaultValue("some information") @QueryParam
         return Map.of("message", message);
     }
 
-    @Path("/oauth2data")
-    @GET
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, String> getOauth2Data(@DefaultValue("some information") @QueryParam("message") String message, @HeaderParam("Authorization") String authorization) {
-        if (authorization == null || !isAuthorized(authorization)) {
-            throw new NotAuthorizedException("The authorization token is not valid: " + authorization);
-        } else {
-            return Map.of("message", message);
-        }
-    }
-
-    private boolean isAuthorized(String authorization) {
-        if (!authorization.startsWith("Bearer ")) {
-            return false;
-        }
-
-        var token = authorization.replace("Bearer ", "");
-
-        try {
-            SignedJWT.parse(token);
-            return true;
-        } catch (ParseException e) {
-            return false;
-        }
-    }
 }

system-tests/e2e-transfer-test/backend-service/src/main/java/org/eclipse/edc/test/e2e/ProviderBackendApiController.java

@@ -39,7 +39,6 @@ dependencies {
     implementation(project(":extensions:data-plane-selector:data-plane-selector-control-api"))
 
     implementation(project(":extensions:control-plane:provision:provision-http"))
-    implementation(project(":extensions:control-plane:transfer:transfer-pull-http-receiver"))
     implementation(project(":extensions:control-plane:transfer:transfer-pull-http-dynamic-receiver"))
 
     implementation(project(":core:policy-monitor:policy-monitor-core"))

system-tests/e2e-transfer-test/control-plane/build.gradle.kts

@@ -24,6 +24,7 @@ dependencies {
     testImplementation(project(":spi:common:web-spi"))
     testImplementation(project(":core:common:connector-core"))
     testImplementation(project(":core:common:junit"))
+    testImplementation(testFixtures(project(":core:common:lib:http-lib")))
     testImplementation(testFixtures(project(":extensions:common:sql:sql-core")))
     testImplementation(testFixtures(project(":extensions:control-plane:api:management-api:management-api-test-fixtures")))
     testImplementation(project(":extensions:common:json-ld"))
@@ -39,7 +40,6 @@ dependencies {
     testImplementation(libs.testcontainers.junit)
     testImplementation(libs.testcontainers.kafka)
 
-    testCompileOnly(project(":system-tests:e2e-transfer-test:backend-service"))
     testCompileOnly(project(":system-tests:e2e-transfer-test:control-plane"))
     testCompileOnly(project(":system-tests:e2e-transfer-test:data-plane"))
 }

system-tests/e2e-transfer-test/runner/build.gradle.kts

@@ -27,10 +27,6 @@
  */
 public enum Runtimes {
 
-    BACKEND_SERVICE(
-            ":system-tests:e2e-transfer-test:backend-service"
-    ),
-
     IN_MEMORY_CONTROL_PLANE(
             ":system-tests:e2e-transfer-test:control-plane",
             ":extensions:data-plane:data-plane-signaling:data-plane-signaling-client"

system-tests/e2e-transfer-test/runner/src/test/java/org/eclipse/edc/test/e2e/Runtimes.java

@@ -16,10 +16,9 @@
 
 import io.restassured.common.mapper.TypeRef;
 import jakarta.json.Json;
-import jakarta.json.JsonObject;
+import org.assertj.core.api.ThrowingConsumer;
 import org.eclipse.edc.connector.controlplane.test.system.utils.Participant;
 import org.eclipse.edc.spi.types.domain.DataAddress;
-import org.hamcrest.Matcher;
 import org.jetbrains.annotations.NotNull;
 
 import java.net.URI;
@@ -33,6 +32,7 @@
 import static jakarta.json.Json.createArrayBuilder;
 import static jakarta.json.Json.createObjectBuilder;
 import static java.io.File.separator;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.edc.boot.BootServicesExtension.PARTICIPANT_ID;
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.CONTEXT;
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID;
@@ -48,25 +48,14 @@ public class TransferEndToEndParticipant extends Participant {
     private final URI dataPlaneDefault = URI.create("http://localhost:" + getFreePort());
     private final URI dataPlaneControl = URI.create("http://localhost:" + getFreePort() + "/control");
     private final URI dataPlanePublic = URI.create("http://localhost:" + getFreePort() + "/public");
-    private final URI backendService = URI.create("http://localhost:" + getFreePort());
+    private final int httpProvisionerPort = getFreePort();
 
     protected TransferEndToEndParticipant() {
         super();
     }
 
-    /**
-     * Get private properties to configure a dynamic http receiver for EDR.
-     *
-     * @return the receiver properties.
-     */
-    public JsonObject dynamicReceiverPrivateProperties() {
-        return Json.createObjectBuilder()
-                .add("receiverHttpEndpoint", backendService + "/api/consumer/dataReference")
-                .build();
-    }
-
-    public URI backendService() {
-        return backendService;
+    public int getHttpProvisionerPort() {
+        return httpProvisionerPort;
     }
 
     /**
@@ -125,7 +114,6 @@ public Map<String, String> controlPlaneConfiguration() {
                 put("edc.vault", resourceAbsolutePath(getName() + "-vault.properties"));
                 put("edc.keystore", resourceAbsolutePath("certs/cert.pfx"));
                 put("edc.keystore.password", "123456");
-                put("edc.receiver.http.endpoint", backendService + "/api/consumer/dataReference");
                 put("edc.transfer.proxy.endpoint", dataPlanePublic.toString());
                 put("edc.transfer.send.retry.limit", "1");
                 put("edc.transfer.send.retry.base-delay.ms", "100");
@@ -135,7 +123,7 @@ public Map<String, String> controlPlaneConfiguration() {
                 put("edc.negotiation.provider.send.retry.base-delay.ms", "100");
 
                 put("provisioner.http.entries.default.provisioner.type", "provider");
-                put("provisioner.http.entries.default.endpoint", backendService + "/api/provision");
+                put("provisioner.http.entries.default.endpoint", "http://localhost:%d/provision".formatted(httpProvisionerPort));
                 put("provisioner.http.entries.default.data.address.type", "HttpProvision");
             }
         };
@@ -181,14 +169,6 @@ public Map<String, String> dataPlanePostgresConfiguration() {
         return baseConfiguration;
     }
 
-    public Map<String, String> backendServiceConfiguration() {
-        return new HashMap<>() {
-            {
-                put("web.http.port", String.valueOf(backendService.getPort()));
-            }
-        };
-    }
-
     /**
      * Get the EDR from the EDR cache by transfer process id.
      *
@@ -219,10 +199,10 @@ public DataAddress getEdr(String transferProcessId) {
      *
      * @param edr         endpoint data reference
      * @param queryParams query parameters
-     * @param bodyMatcher matcher for response body
+     * @param bodyAssertion assertion to be verified on the body
      */
-    public void pullData(DataAddress edr, Map<String, String> queryParams, Matcher<String> bodyMatcher) {
-        given()
+    public void pullData(DataAddress edr, Map<String, String> queryParams, ThrowingConsumer<String> bodyAssertion) {
+        var data = given()
                 .baseUri(edr.getStringProperty("endpoint"))
                 .header("Authorization", edr.getStringProperty("authorization"))
                 .queryParams(queryParams)
@@ -231,7 +211,9 @@ public void pullData(DataAddress edr, Map<String, String> queryParams, Matcher<S
                 .then()
                 .log().ifError()
                 .statusCode(200)
-                .body("message", bodyMatcher);
+                .extract().body().asString();
+
+        assertThat(data).satisfies(bodyAssertion);
     }
 
     @NotNull