Merge branch 'eclipse-tractusx:main' into release-v3.0.0/update-postman

eclipse-tractusx · May 10, 2024 · 0345eb4 · 0345eb4
2 parents 0e1cedc + 295caf7
commit 0345eb4
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/charts/digital-product-pass/Chart.yaml b/charts/digital-product-pass/Chart.yaml
@@ -42,7 +42,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 2.3.0
+version: 2.3.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/digital-product-pass/templates/configmap-backend.yaml b/charts/digital-product-pass/templates/configmap-backend.yaml
@@ -126,7 +126,7 @@ data:
         edc:
           key: {{ tpl (.Values.backend.discovery.edcDiscovery.key | default "bpn") . | quote }}
       # -- configuration to the single API endpoint
-      singleApi:
+      single-api:
         maxRetries: {{ .Values.backend.singleApi.maxRetries }}
         delay: {{ .Values.backend.singleApi.delay }}
       # -- process configuration

diff --git a/charts/digital-product-pass/values-int.yaml b/charts/digital-product-pass/values-int.yaml
@@ -62,7 +62,7 @@ backend:
   discovery:
     hostname: "semantics.int.demo.catena-x.net/discoveryfinder"
 
-  singleApi:
+  single-api:
     maxRetries: 30
     delay: 1000
 

diff --git a/charts/digital-product-pass/values.yaml b/charts/digital-product-pass/values.yaml
@@ -205,8 +205,8 @@ backend:
                 - leftOperand: "cx-policy:UsagePurpose"
                   operator: "odrl:eq"
                   rightOperand: "cx.circular.dpp:1"
-          prohibition: [ ]
-          obligation: [ ]
+          prohibition: []
+          obligation: []
   digitalTwinRegistry:
     endpoints:
       search: "/lookup/shells"
@@ -241,8 +241,8 @@ backend:
                 - leftOperand: "cx-policy:UsagePurpose"
                   operator: "odrl:eq"
                   rightOperand: "cx.core.digitalTwinRegistry:1"
-          prohibition: [ ]
-          obligation: [ ]
+          prohibition: []
+          obligation: []
   # -- discovery configuration
   discovery:
     # -- discovery finder configuration

diff --git a/dpp-backend/charts/digital-product-pass-backend/templates/configmap.yaml b/dpp-backend/charts/digital-product-pass-backend/templates/configmap.yaml
@@ -127,7 +127,7 @@ data:
         edc:
           key: {{ tpl (.Values.discovery.edcDiscovery.key | default "bpn") . | quote }}
       # -- configuration to the single API endpoint
-      singleApi:
+      single-api:
         maxRetries: {{ .Values.singleApi.maxRetries }}
         delay: {{ .Values.singleApi.delay }}
       # -- process configuration

diff --git a/dpp-backend/charts/digital-product-pass-backend/values-int.yaml b/dpp-backend/charts/digital-product-pass-backend/values-int.yaml
@@ -60,7 +60,7 @@ process:
 discovery:
   hostname: "semantics.int.demo.catena-x.net/discoveryfinder"
 
-singleApi:
+single-api:
   maxRetries: 30
   delay: 1000
 

diff --git a/dpp-backend/charts/digital-product-pass-backend/values.yaml b/dpp-backend/charts/digital-product-pass-backend/values.yaml
@@ -176,7 +176,7 @@ discovery:
   edcDiscovery:
     key: "bpn"
 # -- configuration to the single API endpoint
-singleApi:
+single-api:
   maxRetries: 30
   delay: 1000
 

diff --git a/...uctpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/SingleApiConfig.java b/...uctpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/SingleApiConfig.java
@@ -33,7 +33,7 @@
  * This class consists exclusively to define the attributes and methods needed for the Simple API configuration.
  **/
 @Configuration
-@ConfigurationProperties(prefix="configuration.singleApi")
+@ConfigurationProperties(prefix="configuration.single-api")
 public class SingleApiConfig {
 
     /** ATTRIBUTES **/

diff --git a/dpp-backend/digitalproductpass/src/main/resources/application.yml b/dpp-backend/digitalproductpass/src/main/resources/application.yml
@@ -128,7 +128,7 @@ configuration:
       key: "bpn"
       timeout: 1500
 
-  singleApi:
+  single-api:
     maxRetries: 30
     delay: 1000
 

diff --git a/dpp-backend/digitalproductpass/src/test/resources/application-test.yml b/dpp-backend/digitalproductpass/src/test/resources/application-test.yml
@@ -128,7 +128,7 @@ configuration:
       key: "bpn"
       timeout: 1500
 
-  singleApi:
+  single-api:
     maxRetries: 30
     delay: 1000