fix: adapt after upstream edc multi profile changes (#105)

wolf4ood · web-flow · commit 848694216d7c · 2026-05-13T16:58:14.000+02:00
diff --git 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
@@ -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
diff --git 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
+    controlplane.protocol.url: http://controlplane.edc-v.svc.cluster.local:8082/api/dsp/%s/http-dsp-profile-2025-1
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,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");
 
 
diff --git 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}}",

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ meta {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`post {`
`8`		`- url: {{cpBaseUrl}}/participants/{{consumer_id}}/catalog/request`
	`8`	`+ url: {{cpBaseUrl}}/v5beta/participants/{{consumer_id}}/catalog/request`
`9`	`9`	`body: json`
`10`	`10`	`auth: inherit`
`11`	`11`	`}`
`@@ -16,8 +16,8 @@ body:json {`
`16`	`16`	`"https://w3id.org/edc/connector/management/v2"`
`17`	`17`	`],`
`18`	`18`	`"@type": "CatalogRequest",`
`19`		`- "protocol": "dataspace-protocol-http:2025-1",`
`20`		`- "counterPartyAddress": "http://controlplane.edc-v.svc.cluster.local:8082/api/dsp/{{provider_id}}/2025-1",`
	`19`	`+ "protocol": "http-dsp-profile-2025-1",`
	`20`	`+ "counterPartyAddress": "http://controlplane.edc-v.svc.cluster.local:8082/api/dsp/{{provider_id}}/http-dsp-profile-2025-1",`
`21`	`21`	`"counterPartyId": "did:web:identityhub.edc-v.svc.cluster.local%3A7083:provider"`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ meta {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`get {`
`8`		`- url: {{cpBaseUrl}}/participants/{{consumer_id}}/contractnegotiations/{{NEGOTIATION_ID}}`
	`8`	`+ url: {{cpBaseUrl}}/v5beta/participants/{{consumer_id}}/contractnegotiations/{{NEGOTIATION_ID}}`
`9`	`9`	`body: json`
`10`	`10`	`auth: inherit`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ meta {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`post {`
`8`		`- url: {{cpBaseUrl}}/celexpressions`
	`8`	`+ url: {{cpBaseUrl}}/v5beta/celexpressions`
`9`	`9`	`body: json`
`10`	`10`	`auth: inherit`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ meta {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`put {`
`8`		`- url: {{cpBaseUrl}}/participants/{{consumer_id}}/dataplanes`
	`8`	`+ url: {{cpBaseUrl}}/v5beta/participants/{{consumer_id}}/dataplanes`
`9`	`9`	`body: json`
`10`	`10`	`auth: inherit`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ meta {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`post {`
`8`		`- url: {{cpBaseUrl}}/participants/{{provider_id}}/assets`
	`8`	`+ url: {{cpBaseUrl}}/v5beta/participants/{{provider_id}}/assets`
`9`	`9`	`body: json`
`10`	`10`	`auth: inherit`
`11`	`11`	`}`