Merge pull request #246 from catenax-ng/release/v2.2.0-update-edcs-ve…

…rsion-v0.6.0

Release/v2.2.0 update edcs version v0.6.0: update edc helm version and make backend compatibility

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,26 +1,3 @@
-<!-- 
-  Tractus-X - Digital Product Passport Application 
- 
-  Copyright (c) 2022, 2024 BASF SE, BMW AG, Henkel AG & Co. KGaA
-  Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
-
-  See the NOTICE file(s) distributed with this work for additional
-  information regarding copyright ownership.
- 
-  This program and the accompanying materials are made available under the
-  terms of the Apache License, Version 2.0 which is available at
-  https://www.apache.org/licenses/LICENSE-2.0.
- 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-  either express or implied. See the
-  License for the specific language govern in permissions and limitations
-  under the License.
- 
-  SPDX-License-Identifier: Apache-2.0
--->
-
 # Why we create this PR?
 
 << Quick description why the PR is being opened >>
@@ -37,6 +14,11 @@
 
 << If there is a ticket include it here >>
 
+<!--
+Include here the issues if available that will be closed with this PR.
+Use the notation `Closes #<issueId>`
+-->
+
 | Tickets |
 | :---:   |
 | [cmp-xxx](www.link.com) |

.pre-commit-config.yaml

@@ -23,11 +23,11 @@
 
 repos:
   - repo: https://github.com/gitguardian/ggshield
-    rev: v1.13.6
+    rev: v1.24.0
     hooks:
-      # - id: ggshield
-      #   language_version: python3
-      #   stages: [commit]
-      - id: ggshield
-        language_version: python3
-        stages: [push]
+     - id: ggshield
+       language_version: python3
+       stages: [commit]
+     - id: ggshield-push
+       language_version: python3
+       stages: [push]

CHANGELOG.md

@@ -34,10 +34,17 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
 - Updated the digital twin registry version to v0.3.31
 - Updated postman collection to adjust the APIs from EDC `v0.6.0`
 - Updated IRS collection to change authentication process from OAuth2 to the API-Key
+- Updated models to support the new EDC 0.6.0 semantics (alias for retro-compatibility enabled)
+- Updated edc-consumer and edc-provider helm charts version to `v0.6.0`
+- Updated the catalog request semantics
+- Optimized/refactored the contract negotiation and transfer flow.
+- Updated Data Plane Service data parsing
 - Updated the following readme files:
     - Postman readme
     - dpp-script readme
 
+## Added
+- Added timeout in negotiation and transfer requests for avoiding infinite loops. When status from transfer does not changes from STARTED.
 
 ## [released]
 ## [v2.1.3] - 19-02-2024

DEPENDENCIES_BACKEND

@@ -48,7 +48,7 @@ maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.105.Final, Ap
 maven/mavencentral/io.netty/netty-transport/4.1.105.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.projectreactor.netty/reactor-netty-core/1.1.15, Apache-2.0, approved, #5946
 maven/mavencentral/io.projectreactor.netty/reactor-netty-http/1.1.15, Apache-2.0, approved, #6999
-maven/mavencentral/io.projectreactor/reactor-core/3.6.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.projectreactor/reactor-core/3.6.2, Apache-2.0, approved, #13392
 maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.7, Apache-2.0, approved, #5947
 maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.7, Apache-2.0, approved, #5929
 maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.7, Apache-2.0, approved, #5919

charts/digital-product-pass/templates/configmap-backend.yaml

@@ -24,7 +24,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: backend-config
+  name: {{ .Release.Name }}-backend-config
   namespace: {{ .Values.namespace }}
 data:
   application.yaml: |-
@@ -56,6 +56,7 @@ data:
       # -- edc consumer connection configuration
       edc:
         endpoint: "https://{{ .Values.backend.edc.hostname }}"
+        readiness: {{ .Values.backend.edc.apis.readiness }}
         management: {{ .Values.backend.edc.apis.management }}
         catalog: {{ .Values.backend.edc.apis.catalog }}
         negotiation: {{ .Values.backend.edc.apis.negotiation }}

charts/digital-product-pass/templates/deployment-backend.yaml

@@ -57,27 +57,27 @@ spec:
               valueFrom:
                 secretKeyRef:
                   key:  appId
-                  name: avp-consumer-backend-auth          
+                  name: {{ .Release.Name }}-avp-consumer-backend-auth          
             - name: "client.id"
               valueFrom:
                 secretKeyRef:
                   key:  clientId
-                  name: avp-consumer-backend-auth
+                  name: {{ .Release.Name }}-avp-consumer-backend-auth
             - name: "client.secret"
               valueFrom:
                 secretKeyRef:
                   key:  clientSecret
-                  name: avp-consumer-backend-auth
+                  name: {{ .Release.Name }}-avp-consumer-backend-auth
             - name: "edc.apiKey"
               valueFrom:
                 secretKeyRef:
                   key:  xApiKey
-                  name: avp-consumer-backend-edc-oauth
+                  name: {{ .Release.Name }}-avp-consumer-backend-edc-oauth
             - name: "edc.participantId"
               valueFrom:
                 secretKeyRef:
                   key:  participantId
-                  name: avp-consumer-backend-edc-oauth
+                  name: {{ .Release.Name }}-avp-consumer-backend-edc-oauth
           volumeMounts:
             {{- toYaml .Values.backend.volumeMounts | nindent 12 }}
           ports:
@@ -99,5 +99,5 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       volumes:
-        {{- toYaml .Values.backend.volumes | nindent 12 }}
+        {{- tpl (toYaml .Values.backend.volumes | nindent 12) .}}
 

charts/digital-product-pass/templates/pvc-data.yaml

@@ -24,7 +24,7 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: pvc-data
+  name: {{ .Release.Name }}-pvc-data
   labels:
     {{- include "chart.labels" . | nindent 4 }}
   namespace: {{ .Values.namespace }}

charts/digital-product-pass/templates/secret-backend.yaml

@@ -24,7 +24,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: avp-consumer-backend-auth
+  name: {{ .Release.Name }}-avp-consumer-backend-auth
   labels:
     {{- include "chart.labels" . | nindent 4 }}
   namespace: {{ .Values.namespace }}
@@ -38,7 +38,7 @@ stringData:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: avp-consumer-backend-edc-oauth
+  name: {{ .Release.Name }}-avp-consumer-backend-edc-oauth
   labels:
     {{- include "chart.labels" . | nindent 4 }}
   namespace: {{ .Values.namespace }}

charts/digital-product-pass/values.yaml

@@ -27,6 +27,8 @@
 name: "digital-product-pass"
 replicaCount: 1
 namespace: ""
+nameOverride: ""
+fullnameOverride: ""
 
 # -- Backend configuration
 backend:
@@ -118,11 +120,11 @@ backend:
     # -- persist the backend configuration
     - name: backend-config
       configMap:
-        name: backend-config
+        name: "{{ .Release.Name }}-backend-config"
     # -- persist the backend data directories
     - name: pvc-backend
       persistentVolumeClaim:
-        claimName: pvc-data
+        claimName: "{{ .Release.Name }}-pvc-data"
     # -- temporary file system mount
     - name: tmpfs
       emptyDir: {}
@@ -136,6 +138,7 @@ backend:
     # -- edc consumer connection configuration
     hostname: ""
     apis:
+      readiness: "/api/check/readiness"
       management: "/management/v2"
       catalog: "/catalog/request"
       negotiation: "/contractnegotiations"
@@ -189,9 +192,9 @@ backend:
     # -- timeouts for the digital twin registry async negotiation
     timeouts:
       search: 50
-      negotiation: 40
-      transfer: 10
-      digitalTwin: 20
+      negotiation: 60
+      transfer: 20
+      digitalTwin: 40
     # -- temporary storage of dDTRs for optimization
     temporaryStorage:
       enabled: true
@@ -287,7 +290,7 @@ frontend:
     max_retries: 30
     # -- default timeout  - 90 seconds in milliseconds
     timeout:
-      negotiate: 40000
+      negotiate: 60000
       search: 60000
       decline: 20000
     # -- delay from getting status

deployment/infrastructure/edc-consumer/Chart.yaml

@@ -27,15 +27,15 @@ description: |
   A Helm chart for Tractus-X Eclipse Data Space Connector. This chart is a test mock that can be used as edc consumer for the DPP applicatiton.
 type: application
 version: 0.3.3
-appVersion: "0.5.0"
+appVersion: "0.6.0"
 home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
 sources:
   - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
 urls:
   - https://github.com/eclipse-tractusx/tractusx-edc/releases/download/tractusx-connector-0.5.0/tractusx-connector-0.5.0.tgz
 dependencies:
   - name: tractusx-connector
-    version: "0.5.0"
+    version: "0.6.0"
     repository: https://eclipse-tractusx.github.io/charts/dev
     condition: enabled
   - name: postgresql
@@ -45,5 +45,5 @@ dependencies:
     condition: postgresql.enabled
   - name: irs-helm
     repository: https://eclipse-tractusx.github.io/item-relationship-service
-    version: 6.11.0
+    version: 6.14.0
     condition: irs-helm.enabled