Merge pull request #1399 from eclipse-tractusx/feature/update-EDC-to-0.9

feat(tx-backend): update EDC management paths to /v3/
eclipse-tractusx · Feb 24, 2025 · 853ac9a · 853ac9a
2 parents 22e6bcc + cf76437
commit 853ac9a
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 60 deletions.
diff --git a/charts/traceability-foss/Chart.yaml b/charts/traceability-foss/Chart.yaml
@@ -46,7 +46,7 @@ dependencies:
     condition: item-relationship-service.enabled
   - name: tractusx-connector
     repository: https://eclipse-tractusx.github.io/tractusx-edc
-    version: 0.7.7
+    version: 0.9.0-rc2
     condition: tractusx-connector.enabled
   - name: postgresql
     alias: edc-postgresql

diff --git a/tx-backend/collection/tracex.json b/tx-backend/collection/tracex.json
@@ -2787,7 +2787,7 @@
       "parentId" : "fld_7c71498799ca4fbfb6a6b5c11fce20e7",
       "modified" : 1715859902452,
       "created" : 1715077835400,
-      "url" : "{{ _.edc_provider_own }}/management/v2/policydefinitions/request",
+      "url" : "{{ _.edc_provider_own }}/management/v3/policydefinitions/request",
       "name" : "GetPolicyDefinitions",
       "description" : "",
       "method" : "POST",
@@ -2833,7 +2833,7 @@
       "parentId" : "fld_7c71498799ca4fbfb6a6b5c11fce20e7",
       "modified" : 1721663452956,
       "created" : 1715717035169,
-      "url" : "{{ _.edc_provider_own }}/management/v2/policydefinitions/testandor",
+      "url" : "{{ _.edc_provider_own }}/management/v3/policydefinitions/testandor",
       "name" : "GetPolicyDefinitionsById",
       "description" : "",
       "method" : "GET",
@@ -2880,7 +2880,7 @@
       "parentId" : "fld_7c71498799ca4fbfb6a6b5c11fce20e7",
       "modified" : 1715859913363,
       "created" : 1688117338685,
-      "url" : "{{ _.edc_provider_own }}/management/v2/contractdefinitions/request",
+      "url" : "{{ _.edc_provider_own }}/management/v3/contractdefinitions/request",
       "name" : "GetContractDefinitions",
       "description" : "",
       "method" : "POST",
@@ -2972,7 +2972,7 @@
       "parentId" : "fld_7c71498799ca4fbfb6a6b5c11fce20e7",
       "modified" : 1715859942287,
       "created" : 1688111070053,
-      "url" : "{{ _.edc_consumer_own }}/management/v2/contractdefinitions",
+      "url" : "{{ _.edc_consumer_own }}/management/v3/contractdefinitions",
       "name" : "CreateContractDefinition_Notification",
       "description" : "",
       "method" : "POST",
@@ -3018,7 +3018,7 @@
       "parentId" : "fld_7c71498799ca4fbfb6a6b5c11fce20e7",
       "modified" : 1715859947805,
       "created" : 1688584566632,
-      "url" : "{{ _.edc_provider_own }}/management/v2/contractdefinitions/CONTRACT_DEFINITION_NO_POLICY",
+      "url" : "{{ _.edc_provider_own }}/management/v3/contractdefinitions/CONTRACT_DEFINITION_NO_POLICY",
       "name" : "DeleteContractDefinition",
       "description" : "",
       "method" : "DELETE",
@@ -3064,7 +3064,7 @@
       "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2",
       "modified" : 1715860385314,
       "created" : 1688482638565,
-      "url" : "{{ _.edc_consumer_own }}/management/v2/transferprocesses/aaf0f231-a111-4b59-8829-7ec7218c84e3",
+      "url" : "{{ _.edc_consumer_own }}/management/v3/transferprocesses/aaf0f231-a111-4b59-8829-7ec7218c84e3",
       "name" : "TransferProcessesGetById",
       "description" : "",
       "method" : "GET",
@@ -3122,7 +3122,7 @@
       "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2",
       "modified" : 1715860383886,
       "created" : 1688482543409,
-      "url" : "{{ _.edc_consumer_own }}/management/v2/transferprocesses/",
+      "url" : "{{ _.edc_consumer_own }}/management/v3/transferprocesses/",
       "name" : "TransferProcesses",
       "description" : "",
       "method" : "POST",
@@ -3168,7 +3168,7 @@
       "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2",
       "modified" : 1715860382234,
       "created" : 1688539872765,
-      "url" : "{{ _.edc_consumer_own }}/management/v2/contractnegotiations/61ebead5-8ad5-475b-a96a-72ab450e612c",
+      "url" : "{{ _.edc_consumer_own }}/management/v3/contractnegotiations/61ebead5-8ad5-475b-a96a-72ab450e612c",
       "name" : "NegotiationState",
       "description" : "",
       "method" : "GET",
@@ -3214,7 +3214,7 @@
       "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2",
       "modified" : 1715860380790,
       "created" : 1688547509998,
-      "url" : "{{ _.edc_consumer_own }}/management/v2/contractnegotiations",
+      "url" : "{{ _.edc_consumer_own }}/management/v3/contractnegotiations",
       "name" : "InitiateNegotiation",
       "description" : "",
       "method" : "POST",
@@ -3260,7 +3260,7 @@
       "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2",
       "modified" : 1721976407101,
       "created" : 1694772093336,
-      "url" : "{{ _.edc_consumer_own }}/management/v2/catalog/request",
+      "url" : "{{ _.edc_consumer_own }}/management/v3/catalog/request",
       "name" : "GetCatalog_Provider_Notifications",
       "description" : "",
       "method" : "POST",
@@ -3305,7 +3305,7 @@
       "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2",
       "modified" : 1722838408748,
       "created" : 1721663626744,
-      "url" : "{{ _.edc_consumer_own }}/management/v2/catalog/request",
+      "url" : "{{ _.edc_consumer_own }}/management/v3/catalog/request",
       "name" : "GetCatalog_Provider_Notifications_test",
       "description" : "",
       "method" : "POST",
@@ -3351,7 +3351,7 @@
       "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2",
       "modified" : 1722339226384,
       "created" : 1721291787921,
-      "url" : "{{ _.edc_consumer_own }}/management/v2/catalog/request",
+      "url" : "{{ _.edc_consumer_own }}/management/v3/catalog/request",
       "name" : "GetCatalog_Provider_Notifications2",
       "description" : "",
       "method" : "POST",
@@ -3396,7 +3396,7 @@
       "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2",
       "modified" : 1715860377621,
       "created" : 1696919016531,
-      "url" : "{{ _.edc_consumer_own }}/management/v2/catalog/request",
+      "url" : "{{ _.edc_consumer_own }}/management/v3/catalog/request",
       "name" : "GetCatalog_Provider_RegistryAsset",
       "description" : "",
       "method" : "POST",
@@ -3441,7 +3441,7 @@
       "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2",
       "modified" : 1719300613804,
       "created" : 1719300602911,
-      "url" : "{{ _.edc_consumer_own }}/management/v2/catalog/request",
+      "url" : "{{ _.edc_consumer_own }}/management/v3/catalog/request",
       "name" : "GetCatalog_Provider_RegistryAssetById",
       "description" : "",
       "method" : "POST",
@@ -3486,7 +3486,7 @@
       "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2",
       "modified" : 1722838418077,
       "created" : 1716910154202,
-      "url" : "{{ _.edc_consumer_own }}/management/v2/catalog/request",
+      "url" : "{{ _.edc_consumer_own }}/management/v3/catalog/request",
       "name" : "GetCatalog_Provider_RegistryAsset_GEC",
       "description" : "",
       "method" : "POST",
@@ -3531,7 +3531,7 @@
       "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2",
       "modified" : 1715860376148,
       "created" : 1715768647024,
-      "url" : "{{ _.edc_consumer_own }}/management/v2/catalog/request",
+      "url" : "{{ _.edc_consumer_own }}/management/v3/catalog/request",
       "name" : "GetCatalog_Provider",
       "description" : "",
       "method" : "POST",
@@ -3576,7 +3576,7 @@
       "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2",
       "modified" : 1715860374537,
       "created" : 1708933609478,
-      "url" : "{{ _.edc_consumer_own }}/management/v2/contractagreements/ODA3MmUyNTQtOGNlZi00YzQ2LTljNGYtNGYzNjE2YjQ5NTZl:cmVnaXN0cnktYXNzZXQ=:MDljNDMzY2EtODI5OS00OGE3LWI0MjYtNzZmZjJmODE1ZWE2/negotiation",
+      "url" : "{{ _.edc_consumer_own }}/management/v3/contractagreements/ODA3MmUyNTQtOGNlZi00YzQ2LTljNGYtNGYzNjE2YjQ5NTZl:cmVnaXN0cnktYXNzZXQ=:MDljNDMzY2EtODI5OS00OGE3LWI0MjYtNzZmZjJmODE1ZWE2/negotiation",
       "name" : "GetContractAgreementNegotiation",
       "description" : "",
       "method" : "GET",
@@ -3622,7 +3622,7 @@
       "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2",
       "modified" : 1715860373162,
       "created" : 1708933018506,
-      "url" : "{{ _.edc_consumer_own }}/management/v2/contractagreements/request",
+      "url" : "{{ _.edc_consumer_own }}/management/v3/contractagreements/request",
       "name" : "GetContractAgreement",
       "description" : "",
       "method" : "POST",
@@ -3668,7 +3668,7 @@
       "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2",
       "modified" : 1722838427159,
       "created" : 1688067318173,
-      "url" : "{{ _.edc_provider_own }}/management/v2/policydefinitions",
+      "url" : "{{ _.edc_provider_own }}/management/v3/policydefinitions",
       "name" : "CreatePolicyDefinition_Notification",
       "description" : "",
       "method" : "POST",

diff --git a/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_assets__DELETE__SUCCESS.json b/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_assets__DELETE__SUCCESS.json
@@ -2,7 +2,7 @@
   "priority": 1,
   "request": {
     "method": "DELETE",
-    "urlPathPattern": "/edc/management/v2/assets/.*"
+    "urlPathPattern": "/edc/management/v3/assets/.*"
   },
   "response": {
     "status": 200

diff --git a/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_assets__POST__SUCCESS.json b/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_assets__POST__SUCCESS.json
@@ -2,7 +2,7 @@
   "priority": 10,
   "request": {
     "method": "POST",
-    "urlPath": "/edc/management/v2/assets"
+    "urlPath": "/edc/management/v3/assets"
   },
   "response": {
     "status": 200

diff --git a/...ock/mappings/edc/edc_management_v2_contractdefinitions__POST__CONFLICT__ObjectExists.json b/...ock/mappings/edc/edc_management_v2_contractdefinitions__POST__CONFLICT__ObjectExists.json
@@ -2,7 +2,7 @@
   "priority": 1,
   "request": {
     "method": "POST",
-    "urlPath": "/edc/management/v2/contractdefinitions",
+    "urlPath": "/edc/management/v3/contractdefinitions",
     "bodyPatterns": [
       {
         "matchesJsonPath": "$.[?(@.@id == 'definition-id-already-exists')]"

diff --git a/...nd/docker/wiremock/mappings/edc/edc_management_v2_contractdefinitions__POST__SUCCESS.json b/...nd/docker/wiremock/mappings/edc/edc_management_v2_contractdefinitions__POST__SUCCESS.json
@@ -2,7 +2,7 @@
   "priority": 10,
   "request": {
     "method": "POST",
-    "urlPath": "/edc/management/v2/contractdefinitions"},
+    "urlPath": "/edc/management/v3/contractdefinitions"},
   "response": {
     "status": 200,
     "jsonBody": {

diff --git a/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions_GET_SUCCESS.json b/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions_GET_SUCCESS.json
@@ -1,7 +1,7 @@
 {
   "request": {
     "method": "GET",
-    "urlPath": "/edc/management/v2/policydefinitions/default-policy"
+    "urlPath": "/edc/management/v3/policydefinitions/default-policy"
   },
   "response": {
     "status": 200,

diff --git a/...nd/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions__DELETE__SUCCESS.json b/...nd/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions__DELETE__SUCCESS.json
@@ -2,7 +2,7 @@
   "priority": 1,
   "request": {
     "method": "DELETE",
-    "urlPathPattern": "/edc/management/v2/policydefinitions/.*"
+    "urlPathPattern": "/edc/management/v3/policydefinitions/.*"
   },
   "response": {
     "status": 200

diff --git a/...emock/mappings/edc/edc_management_v2_policydefinitions__POST__CONFLICT__ObjectExists.json b/...emock/mappings/edc/edc_management_v2_policydefinitions__POST__CONFLICT__ObjectExists.json
@@ -2,7 +2,7 @@
   "priority": 1,
   "request": {
     "method": "POST",
-    "urlPath": "/edc/management/v2/policydefinitions",
+    "urlPath": "/edc/management/v3/policydefinitions",
     "bodyPatterns": [
       {
         "matchesJsonPath": "$.[?(@.@id == 'definition-id-already-exists')]"

diff --git a/...kend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions__POST__SUCCESS.json b/...kend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions__POST__SUCCESS.json
@@ -2,7 +2,7 @@
   "priority": 10,
   "request": {
     "method": "POST",
-    "urlPath": "/edc/management/v2/policydefinitions"
+    "urlPath": "/edc/management/v3/policydefinitions"
   },
   "response": {
     "status": 200,

diff --git a/tx-backend/src/main/resources/application.yml b/tx-backend/src/main/resources/application.yml
@@ -82,13 +82,13 @@ irs-edc-client:
     endpoint:
       data: ${EDC_DATA_ENDPOINT_URL}
       asset: /management/v3/assets
-      contract-definition: /management/v2/contractdefinitions
-      policy-definition: /management/v2/policydefinitions
-      catalog: /v2/catalog/request # EDC consumer controlplane catalog path
-      contract-negotiation: /v2/contractnegotiations # EDC consumer controlplane contract negotiation path
-      transfer-process: /v2/transferprocesses # EDC consumer controlplane transfer process path
+      contract-definition: /management/v3/contractdefinitions
+      policy-definition: /management/v3/policydefinitions
+      catalog: /v3/catalog/request # EDC consumer controlplane catalog path
+      contract-negotiation: /v3/contractnegotiations # EDC consumer controlplane contract negotiation path
+      transfer-process: /v3/transferprocesses # EDC consumer controlplane transfer process path
       state-suffix: /state # Path of the state suffix for contract negotiation and transfer process
-      contract-agreements: /v2/contractagreements # EDC consumer controlplane contract agreements path
+      contract-agreements: /v3/contractagreements # EDC consumer controlplane contract agreements path
     provider-suffix: /api/v1/dsp # Suffix to add to data requests to the EDC provider controlplane
     catalog-limit: 1000 # Max number of items to fetch from the EDC provider catalog
     catalog-page-size: 50 # Number of items to fetch at one page from the EDC provider catalog when using pagination