Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ edc.dataplane.api.public.baseurl=http://localhost:29291/public


web.http.management.auth.key=password
edc.ids.id=urn:connector:provider
edc.mock.region=us


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ edc.participant.id=consumer

web.http.port=39191
web.http.path=/api
web.http.version.port=49191
web.http.version.path=/version

web.http.catalog.path=/api/catalog
web.http.catalog.port=39195
Expand Down
5 changes: 1 addition & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ format.version = "1.1"

[versions]
awaitility = "4.2.2"
edc = "0.15.1"
edc = "0.16.0"
okhttp-mockwebserver = "5.3.2"
restAssured = "6.0.0"
rsApi = "4.0.0"
Expand All @@ -16,9 +16,7 @@ edc-bom-controlplane-base = { module = "org.eclipse.edc:controlplane-base-bom",
edc-bom-dataplane-base = { module = "org.eclipse.edc:dataplane-base-bom", version.ref = "edc" }
edc-configuration-filesystem = { module = "org.eclipse.edc:configuration-filesystem", version.ref = "edc" }
edc-connector-core = { module = "org.eclipse.edc:connector-core", version.ref = "edc" }
edc-control-api-configuration = { module = "org.eclipse.edc:control-api-configuration", version.ref = "edc" }
edc-control-plane-api-client = { module = "org.eclipse.edc:control-plane-api-client", version.ref = "edc" }
edc-control-plane-api = { module = "org.eclipse.edc:control-plane-api", version.ref = "edc" }
edc-control-plane-core = { module = "org.eclipse.edc:control-plane-core", version.ref = "edc" }
edc-control-plane-spi = { module = "org.eclipse.edc:control-plane-spi", version.ref = "edc" }
edc-data-plane-signaling-api = { module = "org.eclipse.edc:data-plane-signaling-api", version.ref = "edc" }
Expand All @@ -29,7 +27,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-iam = { module = "org.eclipse.edc:data-plane-iam", 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-core = { module = "org.eclipse.edc:data-plane-selector-core", version.ref = "edc" }
edc-data-plane-self-registration = { module = "org.eclipse.edc:data-plane-self-registration", version.ref = "edc" }
edc-data-plane-spi = { module = "org.eclipse.edc:data-plane-spi", version.ref = "edc" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,8 @@ plugins {
}

dependencies {
implementation(libs.edc.runtime.core)
implementation(libs.edc.connector.core)
implementation(libs.edc.control.plane.core)
implementation(libs.edc.edr.store.core)
implementation(libs.edc.configuration.filesystem)
implementation(libs.edc.management.api)
implementation(libs.edc.dsp)
implementation(libs.edc.participant.context.single.core)
implementation(libs.edc.iam.mock)
implementation(libs.edc.http)
runtimeOnly(libs.edc.bom.controlplane.base)
runtimeOnly(libs.edc.iam.mock)
}

application {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ web.http.management.port=29193
web.http.management.path=/management
web.http.protocol.port=29194
web.http.protocol.path=/protocol
web.http.version.port=29195
web.http.version.path=/version
web.http.config.port=29195
web.http.config.path=/config

web.http.management.auth.key=password
edc.dsp.callback.address=http://localhost:29194/protocol
edc.participant.id=consumer
edc.ids.id=urn:connector:consumer
edc.mock.region=us
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,8 @@ plugins {


dependencies {
implementation(libs.edc.runtime.core)
implementation(libs.edc.connector.core)
implementation(libs.edc.control.plane.core)
implementation(libs.edc.edr.store.core)
implementation(libs.edc.configuration.filesystem)
implementation(libs.edc.management.api)
implementation(libs.edc.dsp)
implementation(libs.edc.participant.context.single.core)
implementation(libs.edc.iam.mock)
implementation(libs.edc.http)
runtimeOnly(libs.edc.bom.controlplane.base)
runtimeOnly(libs.edc.iam.mock)

implementation(project(":policy:policy-01-policy-enforcement:policy-functions"))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ web.http.management.port=19193
web.http.management.path=/management
web.http.protocol.port=19194
web.http.protocol.path=/protocol
web.http.version.port=19195
web.http.version.path=/version
web.http.control.port=19195
web.http.control.path=/control

web.http.management.auth.key=password
edc.dsp.callback.address=http://localhost:19194/protocol
edc.participant.id=provider
edc.ids.id=urn:connector:provider
9 changes: 2 additions & 7 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,11 @@ include(":basic:basic-02-health-endpoint")
include(":basic:basic-03-configuration")

include(":transfer:transfer-00-prerequisites:connector")

include(":transfer:transfer-04-event-consumer:consumer-with-listener")
include(":transfer:transfer-04-event-consumer:listener")

include(":transfer:transfer-03-consumer-pull:provider-proxy-data-plane")
include(":transfer:transfer-04-event-consumer:consumer-with-subscriber")
include(":transfer:transfer-05-file-transfer-cloud:cloud-transfer-consumer")
include(":transfer:transfer-05-file-transfer-cloud:cloud-transfer-provider")
include(":transfer:transfer-05-file-transfer-cloud:transfer-file-cloud")

include(":transfer:transfer-03-consumer-pull:provider-proxy-data-plane")

include(":transfer:transfer-06-kafka-broker:kafka-runtime")

include(":advanced:advanced-01-open-telemetry:open-telemetry-runtime")
Expand Down
3 changes: 1 addition & 2 deletions system-tests/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ dependencies {

testCompileOnly(project(":transfer:transfer-00-prerequisites:connector"))
testCompileOnly(project(":transfer:transfer-03-consumer-pull:provider-proxy-data-plane"))
testCompileOnly(project(":transfer:transfer-04-event-consumer:consumer-with-listener"))
testCompileOnly(project(":transfer:transfer-04-event-consumer:listener"))
testCompileOnly(project(":transfer:transfer-04-event-consumer:consumer-with-subscriber"))
testCompileOnly(project(":transfer:transfer-05-file-transfer-cloud:cloud-transfer-consumer"))
testCompileOnly(project(":transfer:transfer-05-file-transfer-cloud:cloud-transfer-provider"))
testCompileOnly(project(":transfer:transfer-05-file-transfer-cloud:transfer-file-cloud"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public String createAsset(String requestBody) {
.body(requestBody)
.when()
.header("x-api-key", "bau")
.post("/v3/assets")
.post("/assets")
.then()
.log().ifValidationFails()
.statusCode(200)
Expand All @@ -52,7 +52,7 @@ public String createPolicyDefinition(String requestBody) {
.contentType(JSON)
.body(requestBody)
.when()
.post("/v3/policydefinitions")
.post("/policydefinitions")
.then()
.statusCode(200)
.contentType(JSON)
Expand All @@ -64,7 +64,7 @@ public String createContractDefinition(String requestBody) {
.contentType(JSON)
.body(requestBody)
.when()
.post("/v3/contractdefinitions")
.post("/contractdefinitions")
.then()
.statusCode(200)
.extract().jsonPath().getString(ID);
Expand All @@ -75,7 +75,7 @@ public String fetchDatasetFromCatalog(String requestBody) {
.contentType(JSON)
.body(requestBody)
.when()
.post("/v3/catalog/dataset/request")
.post("/catalog/dataset/request")
.then()
.statusCode(200)
.contentType(JSON)
Expand All @@ -87,7 +87,7 @@ public String negotiateContract(String requestBody) {
.contentType(JSON)
.body(requestBody)
.when()
.post("/v3/contractnegotiations/")
.post("/contractnegotiations/")
.then()
.statusCode(200)
.contentType(JSON)
Expand All @@ -98,7 +98,7 @@ public String getContractAgreementId(String contractNegotiationId) {
return baseManagementRequest()
.contentType(JSON)
.when()
.get("/v3/contractnegotiations/" + contractNegotiationId)
.get("/contractnegotiations/" + contractNegotiationId)
.then()
.statusCode(200)
.contentType(JSON)
Expand All @@ -110,7 +110,7 @@ public String startTransfer(String requestBody) {
.contentType(JSON)
.body(requestBody)
.when()
.post("/v3/transferprocesses")
.post("/transferprocesses")
.then()
.statusCode(200)
.contentType(JSON)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

@EndToEndTest
public class Transfer04eventConsumerTest {
private static final String CONSUMER_WITH_LISTENER_MODULE_PATH = ":transfer:transfer-04-event-consumer:consumer-with-listener";
private static final String CONSUMER_WITH_LISTENER_MODULE_PATH = ":transfer:transfer-04-event-consumer:consumer-with-subscriber";
private static final String START_TRANSFER_FILE_PATH = "transfer/transfer-02-provider-push/resources/start-transfer.json";

@RegisterExtension
Expand All @@ -63,6 +63,6 @@ void runSampleSteps() {
var transferProcessId = startTransfer(requestBody, contractAgreementId);
checkTransferStatus(transferProcessId, TransferProcessStates.STARTED);
var standardOutput = standardOutputStream.toString();
assertThat(standardOutput).contains("TransferProcessStartedListener received STARTED event");
assertThat(standardOutput).contains("TransferProcessStarted event has been emitted.");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public class Transfer05fileTransferCloudTest {
private static final String MINIO_BUCKET_NAME = "src-bucket";
private static final int MINIO_PORT = 9000;

private static final String VAULT_IMAGE_NAME = "hashicorp/vault:latest";
private static final String VAULT_IMAGE_NAME = "hashicorp/vault:1.21";
private static final String VAULT_TOKEN = "<root-token>";
private static final int VAULT_PORT = 8200;

Expand All @@ -90,7 +90,7 @@ public class Transfer05fileTransferCloudTest {
"kv put secret/secretAccessKey content=" + MINIO_ACCOUNT_KEY,
"kv put secret/provider-key content=" + AZURITE_ACCOUNT_KEY
)
.withLogConsumer((OutputFrame outputFrame) -> System.out.print(outputFrame.getUtf8String()));
.withLogConsumer((OutputFrame frame) -> System.out.print(frame.getUtf8String()));

@Container
protected static MinIOContainer minioContainer = new MinIOContainer(DockerImageName.parse(MINIO_IMAGE_NAME))
Expand Down Expand Up @@ -123,8 +123,6 @@ public class Transfer05fileTransferCloudTest {
entry("web.http.management.path", "/management"),
entry("web.http.protocol.port", "19194"),
entry("web.http.protocol.path", "/protocol"),
entry("web.http.version.port", "19195"),
entry("web.http.version.path", "/version"),
entry("web.http.management.auth.key", "password"),
entry("edc.transfer.proxy.token.signer.privatekey.alias", "private-key"),
entry("edc.transfer.proxy.token.verifier.publickey.alias", "public-key"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ web.http.protocol.path=/protocol
web.http.management.auth.key=password
edc.dsp.callback.address=http://localhost:29194/protocol
edc.participant.id=consumer
edc.ids.id=urn:connector:consumer
edc.mock.region=eu
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ web.http.protocol.path=/protocol
web.http.management.auth.key=password
edc.dsp.callback.address=http://localhost:29194/protocol
edc.participant.id=consumer
edc.ids.id=urn:connector:consumer
edc.mock.region=us
16 changes: 2 additions & 14 deletions transfer/transfer-00-prerequisites/connector/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,31 +19,19 @@ plugins {
}

dependencies {
implementation(libs.edc.runtime.core)
implementation(libs.edc.connector.core)
implementation(libs.edc.control.api.configuration)
runtimeOnly(libs.edc.bom.controlplane.base)
implementation(libs.edc.control.plane.api.client)
implementation(libs.edc.control.plane.api)
implementation(libs.edc.control.plane.core)
implementation(libs.edc.token.core)
implementation(libs.edc.dsp)
implementation(libs.edc.participant.context.single.core)
implementation(libs.edc.http)
implementation(libs.edc.configuration.filesystem)
implementation(libs.edc.iam.mock)
implementation(libs.edc.management.api)
implementation(libs.edc.transfer.data.plane.signaling)
implementation(libs.edc.validator.data.address.http.data)

implementation(libs.edc.edr.cache.api)
implementation(libs.edc.edr.store.core)
implementation(libs.edc.edr.store.receiver)

implementation(libs.edc.data.plane.selector.api)
implementation(libs.edc.data.plane.selector.core)

implementation(libs.edc.data.plane.self.registration)
implementation(libs.edc.data.plane.signaling.api)
implementation(libs.edc.data.plane.signaling.client)
implementation(libs.edc.data.plane.core)
implementation(libs.edc.data.plane.http)
implementation(libs.edc.data.plane.iam)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,3 @@ web.http.public.port=29291
web.http.public.path=/public
web.http.control.port=29192
web.http.control.path=/control
web.http.version.port=29195
web.http.version.path=/version
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,4 @@ web.http.public.port=19291
web.http.public.path=/public
web.http.control.port=19192
web.http.control.path=/control
web.http.version.port=19195
web.http.version.path=/version
edc.dataplane.api.public.baseurl=http://localhost:19291/public
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,4 @@ web.http.public.port=19291
web.http.public.path=/public
web.http.control.port=19192
web.http.control.path=/control
web.http.version.port=19195
web.http.version.path=/version
edc.dataplane.proxy.public.endpoint=http://localhost:19291/public
Loading
Loading