fix: update transfer-05-file-transfer-cloud sample (#247)

* update connector configurations and docs * fix README files * cleanup
eclipse-edc · Apr 29, 2024 · 85fc9a4 · 85fc9a4
1 parent 6cd717b
commit 85fc9a4
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 2 deletions.
diff --git a/transfer/transfer-05-file-transfer-cloud/README.md b/transfer/transfer-05-file-transfer-cloud/README.md
@@ -99,11 +99,15 @@ java -Dedc.fs.config=transfer/transfer-05-file-transfer-cloud/cloud-transfer-pro
 To request data offers from the provider, run:
 
 ```bash
-curl -X POST "http://localhost:9192/management/catalog/request" \
+curl -X POST "http://localhost:9192/management/v2/catalog/request" \
 --header 'X-Api-Key: password' \
 --header 'Content-Type: application/json' \
 --data-raw '{
-  "counterPartyAddress": "http://localhost:8282/protocol"
+  "@context": {
+    "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
+  },
+  "counterPartyAddress": "http://localhost:8282/protocol",
+  "protocol": "dataspace-protocol-http"
 }'
 ```
 

diff --git a/transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/build.gradle.kts b/transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/build.gradle.kts
@@ -36,6 +36,18 @@ dependencies {
     implementation(libs.edc.dsp)
 
     implementation(libs.edc.data.plane.selector.core)
+
+    implementation(libs.edc.control.plane.api.client)
+    implementation(libs.edc.control.plane.api)
+    implementation(libs.edc.transfer.data.plane)
+    implementation(libs.edc.transfer.pull.http.receiver)
+
+    implementation(libs.edc.data.plane.selector.api)
+
+    implementation(libs.edc.data.plane.control.api)
+    implementation(libs.edc.data.plane.public.api)
+    implementation(libs.edc.data.plane.core)
+    implementation(libs.edc.data.plane.http)
 }
 
 application {

diff --git a/transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/config.properties b/transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/config.properties
@@ -10,3 +10,16 @@ edc.vault.tenantid=<TENANT_ID>
 edc.vault.certificate=<ABSOLUTE_PATH_OF_PFX_FILE>
 edc.vault.name=<VAULT-NAME>
 edc.dsp.callback.address=http://localhost:9292/protocol
+
+#configuration from earlier examples
+edc.participant.id=consumer
+edc.receiver.http.endpoint=http://localhost:4000/receiver/urn:connector:provider/callback
+edc.public.key.alias=public-key
+edc.transfer.dataplane.token.signer.privatekey.alias=1
+edc.transfer.proxy.token.signer.privatekey.alias=1
+edc.transfer.proxy.token.verifier.publickey.alias=public-key
+web.http.public.port=29291
+web.http.public.path=/public
+web.http.control.port=29192
+web.http.control.path=/control
+edc.dataplane.token.validation.endpoint=http://localhost:29192/control/token
diff --git a/transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/build.gradle.kts b/transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/build.gradle.kts
@@ -36,6 +36,18 @@ dependencies {
     implementation(libs.edc.dsp)
 
     implementation(project(":transfer:transfer-05-file-transfer-cloud:transfer-file-cloud"))
+
+    implementation(libs.edc.control.plane.api.client)
+    implementation(libs.edc.control.plane.api)
+    implementation(libs.edc.transfer.data.plane)
+    implementation(libs.edc.transfer.pull.http.receiver)
+
+    implementation(libs.edc.data.plane.selector.api)
+
+    implementation(libs.edc.data.plane.control.api)
+    implementation(libs.edc.data.plane.public.api)
+    implementation(libs.edc.data.plane.core)
+    implementation(libs.edc.data.plane.http)
 }
 
 application {

diff --git a/transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/config.properties b/transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/config.properties
@@ -2,8 +2,24 @@ web.http.port=8181
 web.http.path=/api
 web.http.management.port=8182
 web.http.management.path=/management
+web.http.protocol.port=8282
+web.http.protocol.path=/protocol
+edc.api.auth.key=password
 edc.vault.clientid=<CLIENT_ID>
 edc.vault.tenantid=<TENANT_ID>
 edc.vault.certificate=<ABSOLUTE_PATH_OF_PFX_FILE>
 edc.vault.name=<VAULT-NAME>
 edc.dsp.callback.address=http://localhost:8282/protocol
+
+#configuration from earlier examples
+edc.participant.id=provider
+edc.receiver.http.endpoint=http://localhost:4000/receiver/urn:connector:provider/callback
+edc.public.key.alias=public-key
+edc.transfer.dataplane.token.signer.privatekey.alias=1
+edc.transfer.proxy.token.signer.privatekey.alias=1
+edc.transfer.proxy.token.verifier.publickey.alias=public-key
+web.http.public.port=19291
+web.http.public.path=/public
+web.http.control.port=19192
+web.http.control.path=/control
+edc.dataplane.token.validation.endpoint=http://localhost:19192/control/token