Skip to content

Commit 670b96f

Browse files
refactor: update sample DSP requests to 2025-1 (#524)
* Update sample DSP requests to 2025-1 * Simplify haspolicy.id handeling
1 parent 7608187 commit 670b96f

28 files changed

Lines changed: 96 additions & 86 deletions

File tree

advanced/advanced-01-open-telemetry/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ The output will be something like:
9999
"@id": "cb701b36-48ee-4132-8436-dba7b83c606c",
100100
"@type": "dcat:DataService",
101101
"dcat:endpointDescription": "dspace:connector",
102-
"dcat:endpointUrl": "http://provider:19194/protocol",
102+
"dcat:endpointUrl": "http://provider:19194/protocol/2025-1",
103103
"dct:terms": "dspace:connector",
104-
"dct:endpointUrl": "http://provider:19194/protocol"
104+
"dct:endpointUrl": "http://provider:19194/protocol/2025-1"
105105
}
106106
},
107107
{
@@ -113,9 +113,9 @@ The output will be something like:
113113
"@id": "cb701b36-48ee-4132-8436-dba7b83c606c",
114114
"@type": "dcat:DataService",
115115
"dcat:endpointDescription": "dspace:connector",
116-
"dcat:endpointUrl": "http://provider:19194/protocol",
116+
"dcat:endpointUrl": "http://provider:19194/protocol/2025-1",
117117
"dct:terms": "dspace:connector",
118-
"dct:endpointUrl": "http://provider:19194/protocol"
118+
"dct:endpointUrl": "http://provider:19194/protocol/2025-1"
119119
}
120120
}
121121
],
@@ -128,7 +128,7 @@ The output will be something like:
128128
"dcat": "http://www.w3.org/ns/dcat#",
129129
"dct": "http://purl.org/dc/terms/",
130130
"odrl": "http://www.w3.org/ns/odrl/2/",
131-
"dspace": "https://w3id.org/dspace/v0.8/"
131+
"dspace": "https://w3id.org/dspace/2025/1/"
132132
}
133133
}
134134

advanced/advanced-01-open-telemetry/resources/get-dataset.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" },
33
"@type": "DatasetRequest",
44
"@id": "assetId",
5-
"counterPartyAddress": "http://provider:19194/protocol",
6-
"protocol": "dataspace-protocol-http"
7-
}
5+
"counterPartyId": "provider",
6+
"counterPartyAddress": "http://provider:19194/protocol/2025-1",
7+
"protocol": "dataspace-protocol-http:2025-1"
8+
}

advanced/advanced-01-open-telemetry/resources/negotiate-contract.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
"@vocab": "https://w3id.org/edc/v0.0.1/ns/"
44
},
55
"@type": "ContractRequest",
6-
"counterPartyAddress": "http://provider:19194/protocol",
7-
"protocol": "dataspace-protocol-http",
6+
"counterPartyId": "provider",
7+
"counterPartyAddress": "http://provider:19194/protocol/2025-1",
8+
"protocol": "dataspace-protocol-http:2025-1",
89
"policy": {
910
"@context": "http://www.w3.org/ns/odrl.jsonld",
1011
"@id": "{{contract-offer-id}}",

advanced/advanced-01-open-telemetry/resources/start-transfer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
},
55
"@type": "TransferRequestDto",
66
"connectorId": "provider",
7-
"counterPartyAddress": "http://provider:19194/protocol",
7+
"counterPartyAddress": "http://provider:19194/protocol/2025-1",
88
"contractId": "{{contract-agreement-id}}",
9-
"protocol": "dataspace-protocol-http",
9+
"protocol": "dataspace-protocol-http:2025-1",
1010
"transferType": "HttpData-PULL"
1111
}

federated-catalog/fc-01-embedded/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ Sample output:
115115

116116
},
117117
"dspace:participantId": "provider",
118-
"originator": "http://localhost:19194/protocol",
118+
"originator": "http://localhost:19194/protocol/2025-1",
119119
"@context": {
120120
}
121121
}
122122
]
123-
```
123+
```

federated-catalog/fc-02-standalone/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ Sample output:
9898

9999
},
100100
"dspace:participantId": "provider",
101-
"originator": "http://localhost:19194/protocol",
101+
"originator": "http://localhost:19194/protocol/2025-1",
102102
"@context": {
103103

104104
}
105105
}
106106
]
107-
```
107+
```

federated-catalog/fc-03-static-node-directory/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ In this case, the file contains the properties of the `participant-connector` fr
3636
{
3737
"name": "https://w3id.org/edc/v0.0.1/ns/",
3838
"id": "provider",
39-
"url": "http://localhost:19194/protocol",
40-
"supportedProtocols": ["dataspace-protocol-http"]
39+
"url": "http://localhost:19194/protocol/2025-1",
40+
"supportedProtocols": ["dataspace-protocol-http:2025-1"]
4141
}
4242
```
4343
However, this solution is intended for use only within the sample scope; in production, it must be managed in different way.
@@ -136,4 +136,4 @@ To get the combined set of catalogs, use the following request:
136136
curl -d @federated-catalog/fc-01-embedded/resources/empty-query.json \
137137
-H 'content-type: application/json' http://localhost:29195/api/catalog/v1alpha/catalog/query \
138138
-s | jq
139-
```
139+
```

policy/policy-01-policy-enforcement/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ We'll receive the following catalog in the response, where we can see the offer
272272
"@id": "fe9581ee-b4ec-473c-b0b7-96f30d957e87",
273273
"@type": "dcat:DataService",
274274
"dct:terms": "connector",
275-
"dct:endpointUrl": "http://localhost:8282/protocol"
275+
"dct:endpointUrl": "http://localhost:8282/protocol/2025-1"
276276
},
277277
"participantId": "provider",
278278
"@context": {
@@ -281,7 +281,7 @@ We'll receive the following catalog in the response, where we can see the offer
281281
"dcat": "https://www.w3.org/ns/dcat/",
282282
"dct": "https://purl.org/dc/terms/",
283283
"odrl": "http://www.w3.org/ns/odrl/2/",
284-
"dspace": "https://w3id.org/dspace/v0.8/"
284+
"dspace": "https://w3id.org/dspace/2025/1/"
285285
}
286286
}
287287

policy/policy-01-policy-enforcement/resources/catalog-request.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"@context": {
33
"@vocab": "https://w3id.org/edc/v0.0.1/ns/"
44
},
5-
"counterPartyAddress": "http://localhost:19194/protocol",
6-
"protocol": "dataspace-protocol-http"
5+
"counterPartyId": "provider",
6+
"counterPartyAddress": "http://localhost:19194/protocol/2025-1",
7+
"protocol": "dataspace-protocol-http:2025-1"
78
}

policy/policy-01-policy-enforcement/resources/contract-request.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
"@vocab": "https://w3id.org/edc/v0.0.1/ns/"
44
},
55
"@type": "ContractRequest",
6-
"counterPartyAddress": "http://localhost:19194/protocol",
7-
"protocol": "dataspace-protocol-http",
6+
"counterPartyId": "provider",
7+
"counterPartyAddress": "http://localhost:19194/protocol/2025-1",
8+
"protocol": "dataspace-protocol-http:2025-1",
89
"policy": {
910
"@context": "http://www.w3.org/ns/odrl.jsonld",
1011
"@id": "1:test-document:13dce0f1-52ed-4554-a194-e83e92733ee5",

0 commit comments

Comments
 (0)