Skip to content

refactor: migrate to DSP 2025-1 #517

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

Closed
mokhairymahmoud wants to merge 1 commit into from
Closed

refactor: migrate to DSP 2025-1 #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions advanced/advanced-01-open-telemetry/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ The output will be something like:
"@id": "cb701b36-48ee-4132-8436-dba7b83c606c",
"@type": "dcat:DataService",
"dcat:endpointDescription": "dspace:connector",
"dcat:endpointUrl": "http://provider:19194/protocol",
"dcat:endpointUrl": "http://provider:19194/protocol/2025-1",
"dct:terms": "dspace:connector",
"dct:endpointUrl": "http://provider:19194/protocol"
"dct:endpointUrl": "http://provider:19194/protocol/2025-1"
}
},
{
Expand All @@ -113,9 +113,9 @@ The output will be something like:
"@id": "cb701b36-48ee-4132-8436-dba7b83c606c",
"@type": "dcat:DataService",
"dcat:endpointDescription": "dspace:connector",
"dcat:endpointUrl": "http://provider:19194/protocol",
"dcat:endpointUrl": "http://provider:19194/protocol/2025-1",
"dct:terms": "dspace:connector",
"dct:endpointUrl": "http://provider:19194/protocol"
"dct:endpointUrl": "http://provider:19194/protocol/2025-1"
}
}
],
Expand All @@ -128,7 +128,7 @@ The output will be something like:
"dcat": "http://www.w3.org/ns/dcat#",
"dct": "http://purl.org/dc/terms/",
"odrl": "http://www.w3.org/ns/odrl/2/",
"dspace": "https://w3id.org/dspace/v0.8/"
"dspace": "https://w3id.org/dspace/2025/1/"
}
}

Expand Down Expand Up @@ -217,7 +217,7 @@ which has to be stored in the root folder of this sample as well. The only addit
WEB_HTTP_MANAGEMENT_AUTH_KEY: password
WEB_HTTP_PROTOCOL_PORT: 9292
WEB_HTTP_PROTOCOL_PATH: /protocol
EDC_DSP_CALLBACK_ADDRESS: http://consumer:9292/protocol
EDC_DSP_CALLBACK_ADDRESS: http://consumer:9292/protocol/2025-1
EDC_PARTICIPANT_ID: consumer
entrypoint: java
-javaagent:/resources/opentelemetry-javaagent.jar
Expand Down
4 changes: 2 additions & 2 deletions advanced/advanced-01-open-telemetry/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ services:
WEB_HTTP_VERSION_PORT: 29195
WEB_HTTP_VERSION_PATH: /version
EDC_CONTROL_ENDPOINT: http://consumer:29192/control
EDC_DSP_CALLBACK_ADDRESS: http://consumer:29194/protocol
EDC_DSP_CALLBACK_ADDRESS: http://consumer:29194/protocol/2025-1
EDC_PARTICIPANT_ID: consumer
EDC_KEYSTORE: /prerequisites/resources/certs/cert.pfx
EDC_KEYSTORE_PASSWORD: 123456
Expand Down Expand Up @@ -72,7 +72,7 @@ services:
WEB_HTTP_VERSION_PORT: 19195
WEB_HTTP_VERSION_PATH: /version
EDC_CONTROL_ENDPOINT: http://provider:19192/control
EDC_DSP_CALLBACK_ADDRESS: http://provider:19194/protocol
EDC_DSP_CALLBACK_ADDRESS: http://provider:19194/protocol/2025-1
EDC_PARTICIPANT_ID: provider
EDC_KEYSTORE: /prerequisites/resources/certs/cert.pfx
EDC_KEYSTORE_PASSWORD: 123456
Expand Down
6 changes: 3 additions & 3 deletions advanced/advanced-01-open-telemetry/resources/get-dataset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" },
"@type": "DatasetRequest",
"@id": "assetId",
"counterPartyAddress": "http://provider:19194/protocol",
"protocol": "dataspace-protocol-http"
}
"counterPartyAddress": "http://provider:19194/protocol/2025-1",
"protocol": "dataspace-protocol-http:2025-1"
}
4 changes: 2 additions & 2 deletions advanced/advanced-01-open-telemetry/resources/negotiate-contract.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"@vocab": "https://w3id.org/edc/v0.0.1/ns/"
},
"@type": "ContractRequest",
"counterPartyAddress": "http://provider:19194/protocol",
"protocol": "dataspace-protocol-http",
"counterPartyAddress": "http://provider:19194/protocol/2025-1",
"protocol": "dataspace-protocol-http:2025-1",
"policy": {
"@context": "http://www.w3.org/ns/odrl.jsonld",
"@id": "{{contract-offer-id}}",
Expand Down
4 changes: 2 additions & 2 deletions advanced/advanced-01-open-telemetry/resources/start-transfer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
},
"@type": "TransferRequestDto",
"connectorId": "provider",
"counterPartyAddress": "http://provider:19194/protocol",
"counterPartyAddress": "http://provider:19194/protocol/2025-1",
"contractId": "{{contract-agreement-id}}",
"protocol": "dataspace-protocol-http",
"protocol": "dataspace-protocol-http:2025-1",
"transferType": "HttpData-PULL"
}
2 changes: 1 addition & 1 deletion federated-catalog/fc-01-embedded/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Sample output:

},
"dspace:participantId": "provider",
"originator": "http://localhost:19194/protocol",
"originator": "http://localhost:19194/protocol/2025-1",
"@context": {
}
}
Expand Down
2 changes: 1 addition & 1 deletion federated-catalog/fc-01-embedded/fc-connector/config.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
edc.participant.id=fc-connector
edc.dsp.callback.address=http://localhost:19194/protocol
edc.dsp.callback.address=http://localhost:19194/protocol/2025-1
web.http.port=29191
web.http.path=/api
web.http.management.port=29193
Expand Down
2 changes: 1 addition & 1 deletion federated-catalog/fc-02-standalone/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Sample output:

},
"dspace:participantId": "provider",
"originator": "http://localhost:19194/protocol",
"originator": "http://localhost:19194/protocol/2025-1",
"@context": {

}
Expand Down
4 changes: 2 additions & 2 deletions federated-catalog/fc-03-static-node-directory/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ In this case, the file contains the properties of the `participant-connector` fr
{
"name": "https://w3id.org/edc/v0.0.1/ns/",
"id": "provider",
"url": "http://localhost:19194/protocol",
"supportedProtocols": ["dataspace-protocol-http"]
"url": "http://localhost:19194/protocol/2025-1",
"supportedProtocols": ["dataspace-protocol-http:2025-1"]
}
```
However, this solution is intended for use only within the sample scope; in production, it must be managed in different way.
Expand Down
4 changes: 2 additions & 2 deletions policy/policy-01-policy-enforcement/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ We'll receive the following catalog in the response, where we can see the offer
"@id": "fe9581ee-b4ec-473c-b0b7-96f30d957e87",
"@type": "dcat:DataService",
"dct:terms": "connector",
"dct:endpointUrl": "http://localhost:8282/protocol"
"dct:endpointUrl": "http://localhost:8282/protocol/2025-1"
},
"participantId": "provider",
"@context": {
Expand All @@ -281,7 +281,7 @@ We'll receive the following catalog in the response, where we can see the offer
"dcat": "https://www.w3.org/ns/dcat/",
"dct": "https://purl.org/dc/terms/",
"odrl": "http://www.w3.org/ns/odrl/2/",
"dspace": "https://w3id.org/dspace/v0.8/"
"dspace": "https://w3id.org/dspace/2025/1/"
}
}

Expand Down
2 changes: 1 addition & 1 deletion policy/policy-01-policy-enforcement/policy-enforcement-consumer/config.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ web.http.version.port=29195
web.http.version.path=/version

web.http.management.auth.key=password
edc.dsp.callback.address=http://localhost:29194/protocol
edc.dsp.callback.address=http://localhost:29194/protocol/2025-1
edc.participant.id=consumer
edc.ids.id=urn:connector:consumer
edc.mock.region=us
2 changes: 1 addition & 1 deletion policy/policy-01-policy-enforcement/policy-enforcement-provider/config.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ web.http.version.port=19195
web.http.version.path=/version

web.http.management.auth.key=password
edc.dsp.callback.address=http://localhost:19194/protocol
edc.dsp.callback.address=http://localhost:19194/protocol/2025-1
edc.participant.id=provider
edc.ids.id=urn:connector:provider
4 changes: 2 additions & 2 deletions policy/policy-01-policy-enforcement/resources/catalog-request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"@context": {
"@vocab": "https://w3id.org/edc/v0.0.1/ns/"
},
"counterPartyAddress": "http://localhost:19194/protocol",
"protocol": "dataspace-protocol-http"
"counterPartyAddress": "http://localhost:19194/protocol/2025-1",
"protocol": "dataspace-protocol-http:2025-1"
}
4 changes: 2 additions & 2 deletions policy/policy-01-policy-enforcement/resources/contract-request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"@vocab": "https://w3id.org/edc/v0.0.1/ns/"
},
"@type": "ContractRequest",
"counterPartyAddress": "http://localhost:19194/protocol",
"protocol": "dataspace-protocol-http",
"counterPartyAddress": "http://localhost:19194/protocol/2025-1",
"protocol": "dataspace-protocol-http:2025-1",
"policy": {
"@context": "http://www.w3.org/ns/odrl.jsonld",
"@id": "1:test-document:13dce0f1-52ed-4554-a194-e83e92733ee5",
Expand Down
2 changes: 1 addition & 1 deletion ...tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer05fileTransferCloudTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public class Transfer05fileTransferCloudTest {
new EmbeddedRuntime(PROVIDER, PROVIDER_MODULE_PATH)
.configurationProvider(() -> ConfigFactory.fromMap(Map.ofEntries(
entry("edc.participant.id", "provider"),
entry("edc.dsp.callback.address", "http://localhost:19194/protocol"),
entry("edc.dsp.callback.address", "http://localhost:19194/protocol/2025-1"),
entry("web.http.port", "19191"),
entry("web.http.path", "/api"),
entry("web.http.management.port", "19193"),
Expand Down
4 changes: 2 additions & 2 deletions system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer06KafkaBrokerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ public class Transfer06KafkaBrokerTest {
.name("provider")
.id("provider")
.controlPlaneManagement(new LazySupplier<>(() -> URI.create("http://localhost:18181/management")))
.controlPlaneProtocol(new LazySupplier<>(() -> URI.create("http://localhost:18182/protocol")))
.controlPlaneProtocol(new LazySupplier<>(() -> URI.create("http://localhost:18182/protocol/2025-1")))
.build();
private static final StreamingParticipant CONSUMER = StreamingParticipant.Builder.newStreamingInstance()
.name("consumer")
.id("consumer")
.controlPlaneManagement(new LazySupplier<>(() -> URI.create("http://localhost:28181/management")))
.controlPlaneProtocol(new LazySupplier<>(() -> URI.create("http://localhost:28182/protocol")))
.controlPlaneProtocol(new LazySupplier<>(() -> URI.create("http://localhost:28182/protocol/2025-1")))
.build();
private static final String GROUP_ID = "group_id";

Expand Down
2 changes: 1 addition & 1 deletion system-tests/src/test/resources/policy/config-eu.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ web.http.protocol.port=29194
web.http.protocol.path=/protocol

web.http.management.auth.key=password
edc.dsp.callback.address=http://localhost:29194/protocol
edc.dsp.callback.address=http://localhost:29194/protocol/2025-1
edc.participant.id=consumer
edc.ids.id=urn:connector:consumer
edc.mock.region=eu
2 changes: 1 addition & 1 deletion system-tests/src/test/resources/policy/config-us.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ web.http.protocol.port=29194
web.http.protocol.path=/protocol

web.http.management.auth.key=password
edc.dsp.callback.address=http://localhost:29194/protocol
edc.dsp.callback.address=http://localhost:29194/protocol/2025-1
edc.participant.id=consumer
edc.ids.id=urn:connector:consumer
edc.mock.region=us
2 changes: 1 addition & 1 deletion transfer/transfer-00-prerequisites/resources/configuration/consumer-configuration.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
edc.participant.id=consumer
edc.dsp.callback.address=http://localhost:29194/protocol
edc.dsp.callback.address=http://localhost:29194/protocol/2025-1
web.http.port=29191
web.http.path=/api
web.http.management.port=29193
Expand Down
2 changes: 1 addition & 1 deletion transfer/transfer-00-prerequisites/resources/configuration/provider-configuration.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
edc.participant.id=provider
edc.dsp.callback.address=http://localhost:19194/protocol
edc.dsp.callback.address=http://localhost:19194/protocol/2025-1
web.http.port=19191
web.http.path=/api
web.http.management.port=19193
Expand Down
10 changes: 5 additions & 5 deletions transfer/transfer-01-negotiation/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,15 @@ Sample output:
"@id": "2a5178c3-c937-4ac2-85be-c46dbc6c5642",
"@type": "dcat:DataService",
"dct:terms": "connector",
"dct:endpointUrl": "http://localhost:19194/protocol"
"dct:endpointUrl": "http://localhost:19194/protocol/2025-1"
},
"participantId": "anonymous",
"@context": {
"@vocab": "https://w3id.org/edc/v0.0.1/ns/",
"dct": "https://purl.org/dc/terms/",
"dcat": "https://www.w3.org/ns/dcat/",
"odrl": "http://www.w3.org/ns/odrl/2/",
"dspace": "https://w3id.org/dspace/v0.8/"
"dspace": "https://w3id.org/dspace/2025/1/"
}
}
```
Expand Down Expand Up @@ -216,17 +216,17 @@ Sample output:
"@type": "ContractNegotiation",
"@id": "5ca21b82-075b-4682-add8-c26c9a2ced67",
"type": "CONSUMER",
"protocol": "dataspace-protocol-http",
"protocol": "dataspace-protocol-http:2025-1",
"state": "FINALIZED",
"counterPartyAddress": "http://localhost:19194/protocol",
"counterPartyAddress": "http://localhost:19194/protocol/2025-1",
"callbackAddresses": [],
"contractAgreementId": "0b3150be-feaf-43bc-91e1-90f050de28bd", <---------
"@context": {
"@vocab": "https://w3id.org/edc/v0.0.1/ns/",
"dct": "https://purl.org/dc/terms/",
"dcat": "https://www.w3.org/ns/dcat/",
"odrl": "http://www.w3.org/ns/odrl/2/",
"dspace": "https://w3id.org/dspace/v0.8/"
"dspace": "https://w3id.org/dspace/2025/1/"
}
}
```
Expand Down
4 changes: 2 additions & 2 deletions transfer/transfer-01-negotiation/resources/fetch-catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"@context": {
"@vocab": "https://w3id.org/edc/v0.0.1/ns/"
},
"counterPartyAddress": "http://localhost:19194/protocol",
"protocol": "dataspace-protocol-http"
"counterPartyAddress": "http://localhost:19194/protocol/2025-1",
"protocol": "dataspace-protocol-http:2025-1"
}
4 changes: 2 additions & 2 deletions transfer/transfer-01-negotiation/resources/get-dataset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" },
"@type": "DatasetRequest",
"@id": "assetId",
"counterPartyAddress": "http://localhost:19194/protocol",
"protocol": "dataspace-protocol-http"
"counterPartyAddress": "http://localhost:19194/protocol/2025-1",
"protocol": "dataspace-protocol-http:2025-1"
}
4 changes: 2 additions & 2 deletions transfer/transfer-01-negotiation/resources/negotiate-contract.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"@vocab": "https://w3id.org/edc/v0.0.1/ns/"
},
"@type": "ContractRequest",
"counterPartyAddress": "http://localhost:19194/protocol",
"protocol": "dataspace-protocol-http",
"counterPartyAddress": "http://localhost:19194/protocol/2025-1",
"protocol": "dataspace-protocol-http:2025-1",
"policy": {
"@context": "http://www.w3.org/ns/odrl.jsonld",
"@id": "{{contract-offer-id}}",
Expand Down
4 changes: 2 additions & 2 deletions transfer/transfer-02-provider-push/resources/start-transfer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
},
"@type": "TransferRequestDto",
"connectorId": "provider",
"counterPartyAddress": "http://localhost:19194/protocol",
"counterPartyAddress": "http://localhost:19194/protocol/2025-1",
"contractId": "{{contract-agreement-id}}",
"protocol": "dataspace-protocol-http",
"protocol": "dataspace-protocol-http:2025-1",
"transferType": "HttpData-PUSH",
"dataDestination": {
"type": "HttpData",
Expand Down
2 changes: 1 addition & 1 deletion transfer/transfer-03-consumer-pull/resources/configuration/provider.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
edc.participant.id=provider
edc.dsp.callback.address=http://localhost:19194/protocol
edc.dsp.callback.address=http://localhost:19194/protocol/2025-1
web.http.port=19191
web.http.path=/api
web.http.management.port=19193
Expand Down
4 changes: 2 additions & 2 deletions transfer/transfer-03-consumer-pull/resources/start-transfer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
},
"@type": "TransferRequestDto",
"connectorId": "provider",
"counterPartyAddress": "http://localhost:19194/protocol",
"counterPartyAddress": "http://localhost:19194/protocol/2025-1",
"contractId": "{{contract-agreement-id}}",
"protocol": "dataspace-protocol-http",
"protocol": "dataspace-protocol-http:2025-1",
"transferType": "HttpData-PULL"
}
2 changes: 1 addition & 1 deletion transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/config.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
edc.participant.id=consumer
edc.dsp.callback.address=http://localhost:29194/protocol
edc.dsp.callback.address=http://localhost:29194/protocol/2025-1
web.http.port=29191
web.http.path=/api
web.http.management.port=29193
Expand Down
2 changes: 1 addition & 1 deletion transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/config.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
edc.participant.id=provider
edc.dsp.callback.address=http://localhost:19194/protocol
edc.dsp.callback.address=http://localhost:19194/protocol/2025-1
web.http.port=19191
web.http.path=/api
web.http.management.port=19193
Expand Down
4 changes: 2 additions & 2 deletions transfer/transfer-05-file-transfer-cloud/resources/fetch-catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"@context": {
"@vocab": "https://w3id.org/edc/v0.0.1/ns/"
},
"counterPartyAddress": "http://localhost:19194/protocol",
"protocol": "dataspace-protocol-http"
"counterPartyAddress": "http://localhost:19194/protocol/2025-1",
"protocol": "dataspace-protocol-http:2025-1"
}
4 changes: 2 additions & 2 deletions transfer/transfer-05-file-transfer-cloud/resources/get-dataset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/"},
"@type": "DatasetRequest",
"@id": "1",
"counterPartyAddress": "http://localhost:19194/protocol",
"protocol": "dataspace-protocol-http"
"counterPartyAddress": "http://localhost:19194/protocol/2025-1",
"protocol": "dataspace-protocol-http:2025-1"
}
4 changes: 2 additions & 2 deletions transfer/transfer-05-file-transfer-cloud/resources/negotiate-contract.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"@vocab": "https://w3id.org/edc/v0.0.1/ns/"
},
"@type": "ContractRequest",
"counterPartyAddress": "http://localhost:19194/protocol",
"protocol": "dataspace-protocol-http",
"counterPartyAddress": "http://localhost:19194/protocol/2025-1",
"protocol": "dataspace-protocol-http:2025-1",
"policy": {
"@context": "http://www.w3.org/ns/odrl.jsonld",
"@id": "{{contract-offer-id}}",
Expand Down
4 changes: 2 additions & 2 deletions transfer/transfer-05-file-transfer-cloud/resources/start-transfer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
},
"@type": "TransferRequestDto",
"connectorId": "provider",
"counterPartyAddress": "http://localhost:19194/protocol",
"counterPartyAddress": "http://localhost:19194/protocol/2025-1",
"contractId": "{{contract-agreement-id}}",
"protocol": "dataspace-protocol-http",
"protocol": "dataspace-protocol-http:2025-1",
"transferType": "AmazonS3-PUSH",
"dataDestination": {
"type": "AmazonS3",
Expand Down
Loading
Loading