From 2084f44565645db87ea16b590d6e9e5c8a14e43f Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Wed, 13 May 2026 12:02:02 +0200 Subject: [PATCH] fix: adapt after upstream edc multi profile changes --- k8s/apps/controlplane-config.yaml | 2 +- k8s/apps/edcv-agent-config.yaml | 2 +- k8s/apps/ih-agent-config.yaml | 2 +- .../Data Transfer/Http Certs/Consumer/Get Catalog.bru | 6 +++--- .../Http Certs/Consumer/Poll Contract Negotiation.bru | 2 +- .../Http Certs/Consumer/Setup Contract Negotiation.bru | 6 +++--- .../Data Transfer/Http Certs/Consumer/Setup Transfer.bru | 6 +++--- .../Create CEL expression (Manufacturing).bru | 2 +- .../Prepare Consumer Participant/Prepare Dataplane.bru | 2 +- .../Prepare Provider Participant/Create Cert Asset.bru | 2 +- .../Create Contract Definition.bru | 2 +- .../Prepare Provider Participant/Create Policy.bru | 2 +- .../Prepare Provider Participant/Prepare Dataplane.bru | 2 +- .../src/test/java/org/eclipse/edc/jad/tests/Constants.java | 2 +- .../org/eclipse/edc/jad/tests/DataTransferEndToEndTest.java | 6 +++--- tests/end2end/src/test/resources/contract-request.json | 2 +- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/k8s/apps/controlplane-config.yaml b/k8s/apps/controlplane-config.yaml index 769c23fb..01dcf700 100644 --- a/k8s/apps/controlplane-config.yaml +++ b/k8s/apps/controlplane-config.yaml @@ -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" diff --git a/k8s/apps/edcv-agent-config.yaml b/k8s/apps/edcv-agent-config.yaml index eeb6938c..7aec59a3 100644 --- a/k8s/apps/edcv-agent-config.yaml +++ b/k8s/apps/edcv-agent-config.yaml @@ -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 \ No newline at end of file + controlplane.protocol.url: http://controlplane.edc-v.svc.cluster.local:8082/api/dsp/%s/http-dsp-profile-2025-1 \ No newline at end of file diff --git a/k8s/apps/ih-agent-config.yaml b/k8s/apps/ih-agent-config.yaml index a430a410..033607d9 100644 --- a/k8s/apps/ih-agent-config.yaml +++ b/k8s/apps/ih-agent-config.yaml @@ -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 \ No newline at end of file + controlplane.protocol.url: http://controlplane.edc-v.svc.cluster.local:8082/api/dsp/%s/http-dsp-profile-2025-1 \ No newline at end of file diff --git a/requests/EDC-V Onboarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Get Catalog.bru b/requests/EDC-V Onboarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Get Catalog.bru index 945f0e14..3cb79939 100644 --- a/requests/EDC-V Onboarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Get Catalog.bru +++ b/requests/EDC-V Onboarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Get Catalog.bru @@ -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 } @@ -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" } } diff --git a/requests/EDC-V Onboarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Poll Contract Negotiation.bru b/requests/EDC-V Onboarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Poll Contract Negotiation.bru index 2a6ef0a6..418fe779 100644 --- a/requests/EDC-V Onboarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Poll Contract Negotiation.bru +++ b/requests/EDC-V Onboarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Poll Contract Negotiation.bru @@ -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 } diff --git a/requests/EDC-V Onboarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Setup Contract Negotiation.bru b/requests/EDC-V Onboarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Setup Contract Negotiation.bru index c6d219c0..3a815ef2 100644 --- a/requests/EDC-V Onboarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Setup Contract Negotiation.bru +++ b/requests/EDC-V Onboarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Setup Contract Negotiation.bru @@ -5,7 +5,7 @@ meta { } post { - url: {{cpBaseUrl}}/participants/{{consumer_id}}/contractnegotiations + url: {{cpBaseUrl}}/v5beta/participants/{{consumer_id}}/contractnegotiations body: json auth: inherit } @@ -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", diff --git a/requests/EDC-V Onboarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Setup Transfer.bru b/requests/EDC-V Onboarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Setup Transfer.bru index 8ead490c..d5bb303e 100644 --- a/requests/EDC-V Onboarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Setup Transfer.bru +++ b/requests/EDC-V Onboarding/EDC-V Management/Data Transfer/Http Certs/Consumer/Setup Transfer.bru @@ -5,7 +5,7 @@ meta { } post { - url: {{cpBaseUrl}}/participants/{{consumer_id}}/transferprocesses + url: {{cpBaseUrl}}/v5beta/participants/{{consumer_id}}/transferprocesses body: json auth: inherit } @@ -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" } diff --git a/requests/EDC-V Onboarding/EDC-V Management/Prepare Consumer Participant/Create CEL expression (Manufacturing).bru b/requests/EDC-V Onboarding/EDC-V Management/Prepare Consumer Participant/Create CEL expression (Manufacturing).bru index 4949b282..776d9c47 100644 --- a/requests/EDC-V Onboarding/EDC-V Management/Prepare Consumer Participant/Create CEL expression (Manufacturing).bru +++ b/requests/EDC-V Onboarding/EDC-V Management/Prepare Consumer Participant/Create CEL expression (Manufacturing).bru @@ -5,7 +5,7 @@ meta { } post { - url: {{cpBaseUrl}}/celexpressions + url: {{cpBaseUrl}}/v5beta/celexpressions body: json auth: inherit } diff --git a/requests/EDC-V Onboarding/EDC-V Management/Prepare Consumer Participant/Prepare Dataplane.bru b/requests/EDC-V Onboarding/EDC-V Management/Prepare Consumer Participant/Prepare Dataplane.bru index d0874b5f..158af0aa 100644 --- a/requests/EDC-V Onboarding/EDC-V Management/Prepare Consumer Participant/Prepare Dataplane.bru +++ b/requests/EDC-V Onboarding/EDC-V Management/Prepare Consumer Participant/Prepare Dataplane.bru @@ -5,7 +5,7 @@ meta { } put { - url: {{cpBaseUrl}}/participants/{{consumer_id}}/dataplanes + url: {{cpBaseUrl}}/v5beta/participants/{{consumer_id}}/dataplanes body: json auth: inherit } diff --git a/requests/EDC-V Onboarding/EDC-V Management/Prepare Provider Participant/Create Cert Asset.bru b/requests/EDC-V Onboarding/EDC-V Management/Prepare Provider Participant/Create Cert Asset.bru index a2292713..c7782c2a 100644 --- a/requests/EDC-V Onboarding/EDC-V Management/Prepare Provider Participant/Create Cert Asset.bru +++ b/requests/EDC-V Onboarding/EDC-V Management/Prepare Provider Participant/Create Cert Asset.bru @@ -5,7 +5,7 @@ meta { } post { - url: {{cpBaseUrl}}/participants/{{provider_id}}/assets + url: {{cpBaseUrl}}/v5beta/participants/{{provider_id}}/assets body: json auth: inherit } diff --git a/requests/EDC-V Onboarding/EDC-V Management/Prepare Provider Participant/Create Contract Definition.bru b/requests/EDC-V Onboarding/EDC-V Management/Prepare Provider Participant/Create Contract Definition.bru index 848947dd..8667e68c 100644 --- a/requests/EDC-V Onboarding/EDC-V Management/Prepare Provider Participant/Create Contract Definition.bru +++ b/requests/EDC-V Onboarding/EDC-V Management/Prepare Provider Participant/Create Contract Definition.bru @@ -5,7 +5,7 @@ meta { } post { - url: {{cpBaseUrl}}/participants/{{provider_id}}/contractdefinitions + url: {{cpBaseUrl}}/v5beta/participants/{{provider_id}}/contractdefinitions body: json auth: inherit } diff --git a/requests/EDC-V Onboarding/EDC-V Management/Prepare Provider Participant/Create Policy.bru b/requests/EDC-V Onboarding/EDC-V Management/Prepare Provider Participant/Create Policy.bru index 761f0be4..b01adff1 100644 --- a/requests/EDC-V Onboarding/EDC-V Management/Prepare Provider Participant/Create Policy.bru +++ b/requests/EDC-V Onboarding/EDC-V Management/Prepare Provider Participant/Create Policy.bru @@ -5,7 +5,7 @@ meta { } post { - url: {{cpBaseUrl}}/participants/{{provider_id}}/policydefinitions + url: {{cpBaseUrl}}/v5beta/participants/{{provider_id}}/policydefinitions body: json auth: inherit } diff --git a/requests/EDC-V Onboarding/EDC-V Management/Prepare Provider Participant/Prepare Dataplane.bru b/requests/EDC-V Onboarding/EDC-V Management/Prepare Provider Participant/Prepare Dataplane.bru index c6317f6e..e44c5d89 100644 --- a/requests/EDC-V Onboarding/EDC-V Management/Prepare Provider Participant/Prepare Dataplane.bru +++ b/requests/EDC-V Onboarding/EDC-V Management/Prepare Provider Participant/Prepare Dataplane.bru @@ -5,7 +5,7 @@ meta { } put { - url: {{cpBaseUrl}}/participants/{{provider_id}}/dataplanes + url: {{cpBaseUrl}}/v5beta/participants/{{provider_id}}/dataplanes body: json auth: inherit } diff --git a/tests/end2end/src/test/java/org/eclipse/edc/jad/tests/Constants.java b/tests/end2end/src/test/java/org/eclipse/edc/jad/tests/Constants.java index e75ccb9e..838b1714 100644 --- a/tests/end2end/src/test/java/org/eclipse/edc/jad/tests/Constants.java +++ b/tests/end2end/src/test/java/org/eclipse/edc/jad/tests/Constants.java @@ -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"; } diff --git a/tests/end2end/src/test/java/org/eclipse/edc/jad/tests/DataTransferEndToEndTest.java b/tests/end2end/src/test/java/org/eclipse/edc/jad/tests/DataTransferEndToEndTest.java index ae595a8d..993b9a86 100644 --- a/tests/end2end/src/test/java/org/eclipse/edc/jad/tests/DataTransferEndToEndTest.java +++ b/tests/end2end/src/test/java/org/eclipse/edc/jad/tests/DataTransferEndToEndTest.java @@ -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"); @@ -214,7 +214,7 @@ 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); @@ -222,7 +222,7 @@ void testTransferLimitedAccess() { 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"); diff --git a/tests/end2end/src/test/resources/contract-request.json b/tests/end2end/src/test/resources/contract-request.json index 2006e5a8..fc333b9a 100644 --- a/tests/end2end/src/test/resources/contract-request.json +++ b/tests/end2end/src/test/resources/contract-request.json @@ -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}}",