From b57ee226d4614805bacbaf5c483b7bf0c59b1259 Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Mon, 4 Mar 2024 14:24:48 +0100 Subject: [PATCH] embed data plane selector --- gradle/libs.versions.toml | 1 - .../eclipse/edc/samples/common/PrerequisitesCommon.java | 4 +--- .../edc/samples/transfer/Transfer02consumerPullTest.java | 7 +++---- .../streaming-01-runtime/build.gradle.kts | 1 - .../streaming-02-runtime/build.gradle.kts | 1 - .../streaming-03-runtime/build.gradle.kts | 1 - .../transfer-00-prerequisites/connector/build.gradle.kts | 1 - .../consumer-with-listener/build.gradle.kts | 1 - .../transfer-file-cloud/build.gradle.kts | 1 - 9 files changed, 4 insertions(+), 14 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 795330ff..cc4f75d1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -37,7 +37,6 @@ edc-data-plane-core = { module = "org.eclipse.edc:data-plane-core", version.ref edc-data-plane-http = { module = "org.eclipse.edc:data-plane-http", version.ref = "edc" } edc-data-plane-kafka = { module = "org.eclipse.edc:data-plane-kafka", version.ref = "edc" } edc-data-plane-selector-api = { module = "org.eclipse.edc:data-plane-selector-api", version.ref = "edc" } -edc-data-plane-selector-client = { module = "org.eclipse.edc:data-plane-selector-client", version.ref = "edc" } edc-data-plane-selector-core = { module = "org.eclipse.edc:data-plane-selector-core", version.ref = "edc" } edc-data-plane-spi = { module = "org.eclipse.edc:data-plane-spi", version.ref = "edc" } edc-data-plane-util = { module = "org.eclipse.edc:data-plane-util", version.ref = "edc" } diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/common/PrerequisitesCommon.java b/system-tests/src/test/java/org/eclipse/edc/samples/common/PrerequisitesCommon.java index a799da83..e365b91f 100644 --- a/system-tests/src/test/java/org/eclipse/edc/samples/common/PrerequisitesCommon.java +++ b/system-tests/src/test/java/org/eclipse/edc/samples/common/PrerequisitesCommon.java @@ -45,8 +45,6 @@ public class PrerequisitesCommon { private static final String PROVIDER_VAULT_PROPERTIES_FILE_PATH = "transfer/transfer-00-prerequisites/resources/configuration/provider-vault.properties"; private static final String CONSUMER_VAULT_PROPERTIES_FILE_PATH = "transfer/transfer-00-prerequisites/resources/configuration/consumer-vault.properties"; private static final String REGISTER_DATA_PLANE_PROVIDER_JSON = "transfer/transfer-00-prerequisites/resources/dataplane/register-data-plane-provider.json"; - private static final String REGISTER_DATA_PLANE_CONSUMER_JSON = "transfer/transfer-00-prerequisites/resources/dataplane/register-data-plane-consumer.json"; - private static final String V2_DATAPLANES_PATH = "/v2/dataplanes"; public static EdcRuntimeExtension getProvider() { return getConnector(CONNECTOR_MODULE_PATH, PROVIDER, PROVIDER_VAULT_PROPERTIES_FILE_PATH, PROVIDER_CONFIG_PROPERTIES_FILE_PATH); @@ -95,7 +93,7 @@ private static void registerDataPlane(String host, String payloadPath) { .contentType(ContentType.JSON) .body(requestBody) .when() - .post(host + V2_DATAPLANES_PATH) + .post(host + "/v2/dataplanes") .then() .log() .ifError() diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer02consumerPullTest.java b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer02consumerPullTest.java index 49523807..8d7210f1 100644 --- a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer02consumerPullTest.java +++ b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer02consumerPullTest.java @@ -73,12 +73,10 @@ void runSampleSteps() { var transferProcessId = startTransfer(requestBody, contractAgreementId); checkTransferStatus(transferProcessId, TransferProcessStates.STARTED); var authCode = LOG_CONSUMER.getJsonValue(AUTH_CODE_KEY); - checkData(authCode); - } - private static void checkData(String authCode) { var result = given() - .headers(API_KEY_HEADER_KEY, API_KEY_HEADER_VALUE, AUTHORIZATION, authCode) + .header(API_KEY_HEADER_KEY, API_KEY_HEADER_VALUE) + .header(AUTHORIZATION, authCode) .when() .get(CONSUMER_PUBLIC_URL) .then() @@ -92,4 +90,5 @@ private static void checkData(String authCode) { assertThat(result).isEqualTo("Leanne Graham"); } + } diff --git a/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/build.gradle.kts b/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/build.gradle.kts index 4679f6c3..a3ddd8b5 100644 --- a/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/build.gradle.kts +++ b/transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/build.gradle.kts @@ -30,7 +30,6 @@ dependencies { implementation(libs.edc.management.api) implementation(libs.edc.dsp) implementation(libs.edc.data.plane.selector.api) - implementation(libs.edc.data.plane.selector.client) implementation(libs.edc.transfer.data.plane) implementation(libs.edc.data.plane.spi) implementation(libs.edc.data.plane.core) diff --git a/transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/build.gradle.kts b/transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/build.gradle.kts index 745aa1ae..e8721d84 100644 --- a/transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/build.gradle.kts +++ b/transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/build.gradle.kts @@ -30,7 +30,6 @@ dependencies { implementation(libs.edc.management.api) implementation(libs.edc.dsp) implementation(libs.edc.data.plane.selector.api) - implementation(libs.edc.data.plane.selector.client) implementation(libs.edc.transfer.data.plane) implementation(libs.edc.data.plane.spi) implementation(libs.edc.data.plane.core) diff --git a/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/build.gradle.kts b/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/build.gradle.kts index bb7726d1..8b6a0914 100644 --- a/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/build.gradle.kts +++ b/transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/build.gradle.kts @@ -28,7 +28,6 @@ dependencies { implementation(libs.edc.management.api) implementation(libs.edc.dsp) implementation(libs.edc.data.plane.selector.api) - implementation(libs.edc.data.plane.selector.client) implementation(libs.edc.transfer.data.plane) implementation(libs.edc.transfer.pull.http.dynamic.receiver) implementation(libs.edc.data.plane.spi) diff --git a/transfer/transfer-00-prerequisites/connector/build.gradle.kts b/transfer/transfer-00-prerequisites/connector/build.gradle.kts index f0481b11..3ce117a2 100644 --- a/transfer/transfer-00-prerequisites/connector/build.gradle.kts +++ b/transfer/transfer-00-prerequisites/connector/build.gradle.kts @@ -32,7 +32,6 @@ dependencies { implementation(libs.edc.data.plane.selector.api) implementation(libs.edc.data.plane.selector.core) - implementation(libs.edc.data.plane.selector.client) implementation(libs.edc.data.plane.control.api) implementation(libs.edc.data.plane.public.api) diff --git a/transfer/transfer-04-event-consumer/consumer-with-listener/build.gradle.kts b/transfer/transfer-04-event-consumer/consumer-with-listener/build.gradle.kts index 4073c549..aa0ce23f 100644 --- a/transfer/transfer-04-event-consumer/consumer-with-listener/build.gradle.kts +++ b/transfer/transfer-04-event-consumer/consumer-with-listener/build.gradle.kts @@ -33,7 +33,6 @@ dependencies { implementation(libs.edc.data.plane.selector.api) implementation(libs.edc.data.plane.selector.core) - implementation(libs.edc.data.plane.selector.client) implementation(libs.edc.data.plane.control.api) implementation(libs.edc.data.plane.public.api) diff --git a/transfer/transfer-05-file-transfer-cloud/transfer-file-cloud/build.gradle.kts b/transfer/transfer-05-file-transfer-cloud/transfer-file-cloud/build.gradle.kts index 0f870bcc..62f19844 100644 --- a/transfer/transfer-05-file-transfer-cloud/transfer-file-cloud/build.gradle.kts +++ b/transfer/transfer-05-file-transfer-cloud/transfer-file-cloud/build.gradle.kts @@ -23,7 +23,6 @@ dependencies { implementation(libs.edc.data.plane.azure.storage) implementation(libs.edc.data.plane.aws.s3) implementation(libs.edc.data.plane.client) - implementation(libs.edc.data.plane.selector.client) implementation(libs.edc.data.plane.selector.core) implementation(libs.edc.transfer.data.plane)