Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: working sample 04 #92

Closed
wants to merge 6 commits into from
Closed

fix: working sample 04 #92

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c5cb496
fix: working sample 04
matthiasdg Jul 25, 2023
720ebcb
test: added test for docker compose sample
matthiasdg Aug 2, 2023
7d1d818
style: cosmetic changes
matthiasdg Aug 2, 2023
f893ec4
test: temporarily disable progress checking of transfer
matthiasdg Aug 2, 2023
3dad475
Merge branch 'feature/docker_test' into bugfix/#86_sample_04_terminat…
matthiasdg Aug 2, 2023
d5f4f68
docs: added explanation for commented line
matthiasdg Aug 2, 2023
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
49 changes: 14 additions & 35 deletions transfer/transfer-04-open-telemetry/contractoffer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,24 @@
{
"@context": {
"edc": "https://w3id.org/edc/v0.0.1/ns/",
"odrl": "http://www.w3.org/ns/odrl/2/"
},
"@type": "NegotiationInitiateRequestDto",
"connectorId": "provider",
"consumerId": "consumer",
"providerId": "provider",
"connectorAddress": "http://provider:8282/protocol",
"protocol": "dataspace-protocol-http",
"offer": {
"offerId": "1:3a75736e-001d-4364-8bd4-9888490edb58",
"offerId": "1:test-document:3a75736e-001d-4364-8bd4-9888490edb58",
"assetId": "test-document",
"policy": {
"uid": "956e172f-2de1-4501-8881-057a57fd0e69",
"permissions": [
{
"edctype": "dataspaceconnector:permission",
"uid": null,
"target": "test-document",
"action": {
"type": "USE",
"includedIn": null,
"constraint": null
},
"assignee": null,
"assigner": null,
"constraints": [],
"duties": []
}
],
"prohibitions": [],
"obligations": [],
"extensibleProperties": {},
"inheritsFrom": null,
"assigner": null,
"assignee": null,
"target": null,
"@type": {
"@policytype": "set"
}
},
"asset": {
"properties": {
"ids:byteSize": null,
"asset:prop:id": "test-document",
"ids:fileName": null
}
"@id": "1:test-document:13dce0f1-52ed-4554-a194-e83e92733ee5",
"@type": "set",
"odrl:permission": [],
"odrl:prohibition": [],
"odrl:obligation": [],
"odrl:target": "test-document"
}
}
}
12 changes: 8 additions & 4 deletions transfer/transfer-04-open-telemetry/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ services:
WEB_HTTP_PATH: /api
WEB_HTTP_MANAGEMENT_PORT: 9192
WEB_HTTP_MANAGEMENT_PATH: /management
WEB_HTTP_IDS_PORT: 9292
WEB_HTTP_IDS_PATH: /protocol
IDS_WEBHOOK_ADDRESS: http://consumer:9292
WEB_HTTP_PROTOCOL_PORT: 9292
WEB_HTTP_PROTOCOL_PATH: /protocol
EDC_DSP_CALLBACK_ADDRESS: http://consumer:9292/protocol
EDC_PARTICIPANT_ID: consumer
EDC_API_AUTH_KEY: password
volumes:
- ../:/samples
Expand All @@ -37,7 +38,10 @@ services:
WEB_HTTP_PATH: /api
WEB_HTTP_MANAGEMENT_PORT: 8182
WEB_HTTP_MANAGEMENT_PATH: /management
IDS_WEBHOOK_ADDRESS: http://provider:8282
WEB_HTTP_PROTOCOL_PORT: 8282
WEB_HTTP_PROTOCOL_PATH: /protocol
EDC_DSP_CALLBACK_ADDRESS: http://provider:8282/protocol
EDC_PARTICIPANT_ID: provider
EDC_SAMPLES_TRANSFER_01_ASSET_PATH: /samples/transfer-04-open-telemetry/input-file.txt
volumes:
- ../:/samples
Expand Down
23 changes: 12 additions & 11 deletions transfer/transfer-04-open-telemetry/filetransfer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
{
"protocol": "dataspace-protocol-http",
"assetId": "test-document",
"contractId": "{agreement ID}",
"@context": {
"edc": "https://w3id.org/edc/v0.0.1/ns/"
},
"@type": "TransferRequestDto",
"dataDestination": {
"type": "File",
"path": "/samples/output-file.txt",
"keyName": "keyName",
"type": "File"
"keyName": "keyName"
},
"transferType": {
"contentType": "application/octet-stream",
"isFinite": true
},
"managedResources": false,
"protocol": "dataspace-protocol-http",
"assetId": "test-document",
"contractId": "{agreement ID}",
"connectorId": "provider",
"connectorAddress": "http://provider:8282/protocol",
"connectorId": "consumer"
"privateProperties": {},
"managedResources": false
}
1 change: 1 addition & 0 deletions transfer/transfer-04-open-telemetry/open-telemetry-consumer/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ plugins {

dependencies {
implementation(libs.edc.control.plane.core)
implementation(libs.edc.data.plane.selector.core)
implementation(libs.edc.micrometer.core)

implementation(libs.edc.configuration.filesystem)
Expand Down
1 change: 1 addition & 0 deletions transfer/transfer-04-open-telemetry/open-telemetry-provider/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ plugins {

dependencies {
implementation(libs.edc.control.plane.core)
implementation(libs.edc.data.plane.selector.core)

implementation(libs.edc.api.observability)

Expand Down