Skip to content

fix: adapt after upstream edc multi profile changes #105

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

Merged
wolf4ood merged 1 commit into from
May 13, 2026
Merged

fix: adapt after upstream edc multi profile changes #105

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
2 changes: 1 addition & 1 deletion k8s/apps/controlplane-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ data:
edc.iam.dcp.scopes.manufacturer.type: "POLICY"
edc.iam.dcp.scopes.manufacturer.value: "org.eclipse.dspace.dcp.vc.type:ManufacturerCredential:read"
edc.iam.dcp.scopes.manufacturer.prefix-mapping: "ManufacturerCredential"

edc.dsp.profiles.enable.all: "true"
# Trusted Issuers
edc.iam.trusted-issuer.issuer.id: "did:web:issuerservice.edc-v.svc.cluster.local%3A10016:issuer"

Expand Down
2 changes: 1 addition & 1 deletion k8s/apps/edcv-agent-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ data:
identityhub.sts.url: http://identityhub.edc-v.svc.cluster.local:7084/api/sts/token
identityhub.cs.url: http://identityhub.edc-v.svc.cluster.local:7082/api/credentials/v1/participants/%s
controlplane.url: http://controlplane.edc-v.svc.cluster.local:8081/api/mgmt
controlplane.protocol.url: http://controlplane.edc-v.svc.cluster.local:8082/api/dsp/%s/2025-1
controlplane.protocol.url: http://controlplane.edc-v.svc.cluster.local:8082/api/dsp/%s/http-dsp-profile-2025-1
2 changes: 1 addition & 1 deletion k8s/apps/ih-agent-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ data:
keycloak.tokenUrl: http://keycloak.edc-v.svc.cluster.local:8080/realms/edcv/protocol/openid-connect/token
identityhub.url: http://identityhub.edc-v.svc.cluster.local:7081/api/identity
identityhub.cs.url: http://identityhub.edc-v.svc.cluster.local:7082/api/credentials/v1/participants/%s
controlplane.protocol.url: http://controlplane.edc-v.svc.cluster.local:8082/api/dsp/%s/2025-1
controlplane.protocol.url: http://controlplane.edc-v.svc.cluster.local:8082/api/dsp/%s/http-dsp-profile-2025-1
6 changes: 3 additions & 3 deletions requests/EDC-V Onboarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Get Catalog.bru
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ meta {
}

post {
url: {{cpBaseUrl}}/participants/{{consumer_id}}/catalog/request
url: {{cpBaseUrl}}/v5beta/participants/{{consumer_id}}/catalog/request
body: json
auth: inherit
}
Expand All @@ -16,8 +16,8 @@ body:json {
"https://w3id.org/edc/connector/management/v2"
],
"@type": "CatalogRequest",
"protocol": "dataspace-protocol-http:2025-1",
"counterPartyAddress": "http://controlplane.edc-v.svc.cluster.local:8082/api/dsp/{{provider_id}}/2025-1",
"protocol": "http-dsp-profile-2025-1",
"counterPartyAddress": "http://controlplane.edc-v.svc.cluster.local:8082/api/dsp/{{provider_id}}/http-dsp-profile-2025-1",
"counterPartyId": "did:web:identityhub.edc-v.svc.cluster.local%3A7083:provider"
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...boarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Poll Contract Negotiation.bru
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ meta {
}

get {
url: {{cpBaseUrl}}/participants/{{consumer_id}}/contractnegotiations/{{NEGOTIATION_ID}}
url: {{cpBaseUrl}}/v5beta/participants/{{consumer_id}}/contractnegotiations/{{NEGOTIATION_ID}}
body: json
auth: inherit
}
Expand Down
6 changes: 3 additions & 3 deletions ...oarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Setup Contract Negotiation.bru
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ meta {
}

post {
url: {{cpBaseUrl}}/participants/{{consumer_id}}/contractnegotiations
url: {{cpBaseUrl}}/v5beta/participants/{{consumer_id}}/contractnegotiations
body: json
auth: inherit
}
Expand All @@ -16,8 +16,8 @@ body:json {
"https://w3id.org/edc/connector/management/v2"
],
"@type": "ContractRequest",
"protocol": "dataspace-protocol-http:2025-1",
"counterPartyAddress": "http://controlplane.edc-v.svc.cluster.local:8082/api/dsp/{{provider_id}}/2025-1",
"protocol": "http-dsp-profile-2025-1",
"counterPartyAddress": "http://controlplane.edc-v.svc.cluster.local:8082/api/dsp/{{provider_id}}/http-dsp-profile-2025-1",
"policy": {
"@id": "{{POLICY_ID}}",
"@type": "Offer",
Expand Down
6 changes: 3 additions & 3 deletions ...ts/EDC-V Onboarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Setup Transfer.bru
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ meta {
}

post {
url: {{cpBaseUrl}}/participants/{{consumer_id}}/transferprocesses
url: {{cpBaseUrl}}/v5beta/participants/{{consumer_id}}/transferprocesses
body: json
auth: inherit
}
Expand All @@ -16,8 +16,8 @@ body:json {
"https://w3id.org/edc/connector/management/v2"
],
"@type": "TransferRequest",
"protocol": "dataspace-protocol-http:2025-1",
"counterPartyAddress": "http://controlplane.edc-v.svc.cluster.local:8082/api/dsp/{{provider_id}}/2025-1",
"protocol": "http-dsp-profile-2025-1",
"counterPartyAddress": "http://controlplane.edc-v.svc.cluster.local:8082/api/dsp/{{provider_id}}/http-dsp-profile-2025-1",
"contractId": "{{AGREEMENT_ID}}",
"transferType": "HttpData-PULL"
}
Expand Down
2 changes: 1 addition & 1 deletion ...g/EDC-V Management/Prepare Consumer Participant/Create CEL expression (Manufacturing).bru
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ meta {
}

post {
url: {{cpBaseUrl}}/celexpressions
url: {{cpBaseUrl}}/v5beta/celexpressions
body: json
auth: inherit
}
Expand Down
2 changes: 1 addition & 1 deletion ...ests/EDC-V Onboarding/EDC-V Management/Prepare Consumer Participant/Prepare Dataplane.bru
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ meta {
}

put {
url: {{cpBaseUrl}}/participants/{{consumer_id}}/dataplanes
url: {{cpBaseUrl}}/v5beta/participants/{{consumer_id}}/dataplanes
body: json
auth: inherit
}
Expand Down
2 changes: 1 addition & 1 deletion ...ests/EDC-V Onboarding/EDC-V Management/Prepare Provider Participant/Create Cert Asset.bru
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ meta {
}

post {
url: {{cpBaseUrl}}/participants/{{provider_id}}/assets
url: {{cpBaseUrl}}/v5beta/participants/{{provider_id}}/assets
body: json
auth: inherit
}
Expand Down
2 changes: 1 addition & 1 deletion ...V Onboarding/EDC-V Management/Prepare Provider Participant/Create Contract Definition.bru
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ meta {
}

post {
url: {{cpBaseUrl}}/participants/{{provider_id}}/contractdefinitions
url: {{cpBaseUrl}}/v5beta/participants/{{provider_id}}/contractdefinitions
body: json
auth: inherit
}
Expand Down
2 changes: 1 addition & 1 deletion requests/EDC-V Onboarding/EDC-V Management/Prepare Provider Participant/Create Policy.bru
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ meta {
}

post {
url: {{cpBaseUrl}}/participants/{{provider_id}}/policydefinitions
url: {{cpBaseUrl}}/v5beta/participants/{{provider_id}}/policydefinitions
body: json
auth: inherit
}
Expand Down
2 changes: 1 addition & 1 deletion ...ests/EDC-V Onboarding/EDC-V Management/Prepare Provider Participant/Prepare Dataplane.bru
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ meta {
}

put {
url: {{cpBaseUrl}}/participants/{{provider_id}}/dataplanes
url: {{cpBaseUrl}}/v5beta/participants/{{provider_id}}/dataplanes
body: json
auth: inherit
}
Expand Down
2 changes: 1 addition & 1 deletion tests/end2end/src/test/java/org/eclipse/edc/jad/tests/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ public interface Constants {
String DATAPLANE_BASE_URL = "http://jad.localhost:8080/";
String IDENTITYHUB_BASE_URL = "http://jad.localhost:8080/api/identity";
String KEYCLOAK_URL = "http://jad.localhost:8080/auth";
String CONTROLPLANE_PROTOCOL_URL = "http://controlplane.edc-v.svc.cluster.local:8082/api/dsp/%s/2025-1";
String CONTROLPLANE_PROTOCOL_URL = "http://controlplane.edc-v.svc.cluster.local:8082/api/dsp/%s/http-dsp-profile-2025-1";
}
6 changes: 3 additions & 3 deletions tests/end2end/src/test/java/org/eclipse/edc/jad/tests/DataTransferEndToEndTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ void testCertDataTransfer() {

MONITOR.info("starting data transfer");

var transferId = MANAGEMENT_API_CLIENT.startTransfer(consumerCredentials.clientId(),
var transferId = MANAGEMENT_API_CLIENT.startTransfer(consumerCredentials.clientId(), "http-dsp-profile-2025-1",
providerCredentials.clientId(), CONTROLPLANE_PROTOCOL_URL.formatted(providerCredentials.clientId()), providerContextId, assetId, "HttpData-PULL");


Expand Down Expand Up @@ -214,15 +214,15 @@ void testTransferLimitedAccess() {
registerDataPlane(consumerCredentials.clientId());
registerDataPlane(manufacturerCredentials.clientId());

var negotiationId = MANAGEMENT_API_CLIENT.initContractNegotiation(consumerCredentials.clientId(),
var negotiationId = MANAGEMENT_API_CLIENT.initContractNegotiation(consumerCredentials.clientId(), "http-dsp-profile-2025-1",
assetId, CONTROLPLANE_PROTOCOL_URL.formatted(providerCredentials.clientId()), providerContextId);


MANAGEMENT_API_CLIENT.waitForContractNegotiationState(consumerCredentials.clientId(), negotiationId, "TERMINATED");

MONITOR.info("starting data transfer");

var transferId = MANAGEMENT_API_CLIENT.startTransfer(manufacturerCredentials.clientId(),
var transferId = MANAGEMENT_API_CLIENT.startTransfer(manufacturerCredentials.clientId(), "http-dsp-profile-2025-1",
providerCredentials.clientId(), CONTROLPLANE_PROTOCOL_URL.formatted(providerCredentials.clientId()), providerContextId, assetId, "HttpData-PULL");


Expand Down
2 changes: 1 addition & 1 deletion tests/end2end/src/test/resources/contract-request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"@type": "ContractRequest",
"counterPartyAddress": "{{PROVIDER_DSP_URL}}/api/dsp",
"counterPartyId": "{{PROVIDER_ID}}",
"protocol": "dataspace-protocol-http",
"protocol": "http-dsp-profile-2025-1",
"policy": {
"@type": "Offer",
"@id": "{{POLICY_ID_ASSET_1}}",
Expand Down
Loading