fix: upgrade to MgmtAPI v4 (#600)

paullatzelsperger · web-flow · commit a97bdcbad368 · 2026-04-17T09:36:42.000+02:00
diff --git a/Requests/ControlPlane Management/Get Assets.bru b/Requests/ControlPlane Management/Get Assets.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{CONSUMER_CP}}/api/mgmt/v4beta/assets/request
+  url: {{CONSUMER_CP}}/api/mgmt/v4/assets/request
   body: json
   auth: inherit
 }
diff --git a/Requests/ControlPlane Management/Get Contract Negotiations.bru b/Requests/ControlPlane Management/Get Contract Negotiations.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{CONSUMER_CP}}/api/mgmt/v4beta/contractnegotiations/request
+  url: {{CONSUMER_CP}}/api/mgmt/v4/contractnegotiations/request
   body: json
   auth: inherit
 }
diff --git a/Requests/ControlPlane Management/Get EDR DataAddress for TransferId.bru b/Requests/ControlPlane Management/Get EDR DataAddress for TransferId.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: {{CONSUMER_CP}}/api/mgmt/v4beta/edrs/{{TRANSFER_PROCESS_ID}}/dataaddress
+  url: {{CONSUMER_CP}}/api/mgmt/v4/edrs/{{TRANSFER_PROCESS_ID}}/dataaddress
   body: none
   auth: inherit
 }
diff --git a/Requests/ControlPlane Management/Get cached EDRs.bru b/Requests/ControlPlane Management/Get cached EDRs.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{CONSUMER_CP}}/api/mgmt/v4beta/edrs/request
+  url: {{CONSUMER_CP}}/api/mgmt/v4/edrs/request
   body: json
   auth: inherit
 }
diff --git a/Requests/ControlPlane Management/Get transfer processes.bru b/Requests/ControlPlane Management/Get transfer processes.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{CONSUMER_CP}}/api/mgmt/v4beta/transferprocesses/request
+  url: {{CONSUMER_CP}}/api/mgmt/v4/transferprocesses/request
   body: json
   auth: inherit
 }
diff --git a/Requests/ControlPlane Management/Initiate Transfer.bru b/Requests/ControlPlane Management/Initiate Transfer.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{CONSUMER_CP}}/api/mgmt/v4beta/transferprocesses
+  url: {{CONSUMER_CP}}/api/mgmt/v4/transferprocesses
   body: json
   auth: inherit
 }
diff --git a/Requests/ControlPlane Management/Initiate negotiation.bru b/Requests/ControlPlane Management/Initiate negotiation.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{CONSUMER_CP}}/api/mgmt/v4beta/contractnegotiations
+  url: {{CONSUMER_CP}}/api/mgmt/v4/contractnegotiations
   body: json
   auth: inherit
 }
diff --git a/Requests/ControlPlane Management/Request Catalog.bru b/Requests/ControlPlane Management/Request Catalog.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{CONSUMER_CP}}/api/mgmt/v4beta/catalog/request
+  url: {{CONSUMER_CP}}/api/mgmt/v4/catalog/request
   body: json
   auth: inherit
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ format.version = "1.1"
 [versions]
 awaitility = "4.3.0"
 edc = "0.17.0-SNAPSHOT"
-edc-build = "1.4.0"
+edc-build = "1.5.0"
 jackson = "2.21.2"
 jakarta-json = "2.1.3"
 parsson = "1.1.6"
diff --git a/k8s/consumer/application/controlplane-seed.yaml b/k8s/consumer/application/controlplane-seed.yaml
@@ -52,7 +52,7 @@ spec:
             - |
               set -e
 
-              MGMT_URL="http://controlplane.consumer.svc.cluster.local:8081/api/mgmt/v5alpha/celexpressions"
+              MGMT_URL="http://controlplane.consumer.svc.cluster.local:8081/api/mgmt/v5beta/celexpressions"
 
               # Posts to the management API, treating 409 (already exists) as success.
               create_cel() {
diff --git a/k8s/provider/application/controlplane-seed.yaml b/k8s/provider/application/controlplane-seed.yaml
@@ -54,11 +54,11 @@ spec:
             - |
               set -e
 
-              ASSETS_URL="http://controlplane.provider.svc.cluster.local:8081/api/mgmt/v4beta/assets"
-              POLICIES_URL="http://controlplane.provider.svc.cluster.local:8081/api/mgmt/v4beta/policydefinitions"
-              CONTRACTDEFS_URL="http://controlplane.provider.svc.cluster.local:8081/api/mgmt/v4beta/contractdefinitions"
+              ASSETS_URL="http://controlplane.provider.svc.cluster.local:8081/api/mgmt/v4/assets"
+              POLICIES_URL="http://controlplane.provider.svc.cluster.local:8081/api/mgmt/v4/policydefinitions"
+              CONTRACTDEFS_URL="http://controlplane.provider.svc.cluster.local:8081/api/mgmt/v4/contractdefinitions"
               DATAPLANE_URL="http://controlplane.provider.svc.cluster.local:8081/api/mgmt/v4beta/dataplanes"
-              CEL_URL="http://controlplane.provider.svc.cluster.local:8081/api/mgmt/v5alpha/celexpressions"
+              CEL_URL="http://controlplane.provider.svc.cluster.local:8081/api/mgmt/v5beta/celexpressions"
 
               # Posts to the management API, treating 409 (already exists) as success.
               post() {
diff --git a/tests/end2end/src/test/java/org/eclipse/edc/demo/tests/transfer/TransferEndToEndTest.java b/tests/end2end/src/test/java/org/eclipse/edc/demo/tests/transfer/TransferEndToEndTest.java
@@ -75,7 +75,7 @@ void transferData_hasPermission_shouldTransferData() {
                 .pollDelay(TEST_POLL_DELAY)
                 .untilAsserted(() -> {
                     var jp = baseRequest()
-                            .get(PROVIDER_MANAGEMENT_URL + "/api/mgmt/v4beta/dataplanes")
+                            .get(PROVIDER_MANAGEMENT_URL + "/api/mgmt/v4/dataplanes")
                             .then()
                             .statusCode(200)
                             .log().ifValidationFails()
@@ -102,7 +102,7 @@ void transferData_hasPermission_shouldTransferData() {
                 .untilAsserted(() -> {
                     var res = baseRequest()
                             .body(catalogRequestBody)
-                            .post(CONSUMER_MANAGEMENT_URL + "/api/mgmt/v4beta/catalog/request")
+                            .post(CONSUMER_MANAGEMENT_URL + "/api/mgmt/v4/catalog/request")
                             .then()
                             .log().ifValidationFails()
                             .statusCode(200)
@@ -126,7 +126,7 @@ void transferData_hasPermission_shouldTransferData() {
                 .replace("{{OFFER_ID}}", offerId.get());
         var negotiationId = baseRequest()
                 .body(negotiationRequest)
-                .post(CONSUMER_MANAGEMENT_URL + "/api/mgmt/v4beta/contractnegotiations")
+                .post(CONSUMER_MANAGEMENT_URL + "/api/mgmt/v4/contractnegotiations")
                 .then()
                 .log().ifError()
                 .statusCode(200)
@@ -140,7 +140,7 @@ void transferData_hasPermission_shouldTransferData() {
                 .pollDelay(TEST_POLL_DELAY)
                 .untilAsserted(() -> {
                     var jp = baseRequest()
-                            .get(CONSUMER_MANAGEMENT_URL + "/api/mgmt/v4beta/contractnegotiations/" + negotiationId)
+                            .get(CONSUMER_MANAGEMENT_URL + "/api/mgmt/v4/contractnegotiations/" + negotiationId)
                             .then()
                             .statusCode(200)
                             .extract().body().jsonPath();
@@ -158,7 +158,7 @@ void transferData_hasPermission_shouldTransferData() {
 
         var transferProcessId = baseRequest()
                 .body(tpRequest)
-                .post(CONSUMER_MANAGEMENT_URL + "/api/mgmt/v4beta/transferprocesses")
+                .post(CONSUMER_MANAGEMENT_URL + "/api/mgmt/v4/transferprocesses")
                 .then()
                 .log().ifError()
                 .statusCode(200)
@@ -170,7 +170,7 @@ void transferData_hasPermission_shouldTransferData() {
                 .pollDelay(TEST_POLL_DELAY)
                 .untilAsserted(() -> {
                     var jp = baseRequest()
-                            .get(CONSUMER_MANAGEMENT_URL + "/api/mgmt/v4beta/transferprocesses/%s/state".formatted(transferProcessId))
+                            .get(CONSUMER_MANAGEMENT_URL + "/api/mgmt/v4/transferprocesses/%s/state".formatted(transferProcessId))
                             .then()
                             .statusCode(200)
                             .extract().body().jsonPath();
@@ -221,7 +221,7 @@ void transferData_doesNotHavePermission_shouldTerminate() {
                 .pollDelay(TEST_POLL_DELAY)
                 .untilAsserted(() -> {
                     var jp = baseRequest()
-                            .get(PROVIDER_MANAGEMENT_URL + "/api/mgmt/v4beta/dataplanes")
+                            .get(PROVIDER_MANAGEMENT_URL + "/api/mgmt/v4/dataplanes")
                             .then()
                             .statusCode(200)
                             .log().ifValidationFails()
@@ -248,7 +248,7 @@ void transferData_doesNotHavePermission_shouldTerminate() {
                 .untilAsserted(() -> {
                     var res = baseRequest()
                             .body(catalogRequestBody)
-                            .post(CONSUMER_MANAGEMENT_URL + "/api/mgmt/v4beta/catalog/request")
+                            .post(CONSUMER_MANAGEMENT_URL + "/api/mgmt/v4/catalog/request")
                             .then()
                             .log().ifValidationFails()
                             .statusCode(200)
@@ -272,7 +272,7 @@ void transferData_doesNotHavePermission_shouldTerminate() {
                 .replace("{{OFFER_ID}}", offerId.get());
         var negotiationId = baseRequest()
                 .body(negotiationRequest)
-                .post(CONSUMER_MANAGEMENT_URL + "/api/mgmt/v4beta/contractnegotiations")
+                .post(CONSUMER_MANAGEMENT_URL + "/api/mgmt/v4/contractnegotiations")
                 .then()
                 .log().ifError()
                 .statusCode(200)
@@ -286,7 +286,7 @@ void transferData_doesNotHavePermission_shouldTerminate() {
                 .pollDelay(TEST_POLL_DELAY)
                 .untilAsserted(() -> {
                     var jp = baseRequest()
-                            .get(CONSUMER_MANAGEMENT_URL + "/api/mgmt/v4beta/contractnegotiations/" + negotiationId)
+                            .get(CONSUMER_MANAGEMENT_URL + "/api/mgmt/v4/contractnegotiations/" + negotiationId)
                             .then()
                             .statusCode(200)
                             .extract().body().jsonPath();

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ meta {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`post {`
`8`		`- url: {{CONSUMER_CP}}/api/mgmt/v4beta/assets/request`
	`8`	`+ url: {{CONSUMER_CP}}/api/mgmt/v4/assets/request`
`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`	`get {`
`8`		`- url: {{CONSUMER_CP}}/api/mgmt/v4beta/edrs/{{TRANSFER_PROCESS_ID}}/dataaddress`
	`8`	`+ url: {{CONSUMER_CP}}/api/mgmt/v4/edrs/{{TRANSFER_PROCESS_ID}}/dataaddress`
`9`	`9`	`body: none`
`10`	`10`	`auth: inherit`
`11`	`11`	`}`