Merge pull request #420 from eclipse-tractusx/hotfix/testdata

Hotfix: fixed irs helm configuration and updated testdata
eclipse-tractusx · Oct 2, 2024 · 177334f · 177334f
2 parents edc081c + d42a8c7
commit 177334f
Show file tree

Hide file tree

Showing 6 changed files with 2,233 additions and 3,970 deletions.
diff --git a/.github/workflows/trufflehog.yaml → .github/workflows/trufflehog.yml b/.github/workflows/trufflehog.yaml → .github/workflows/trufflehog.yml
@@ -65,7 +65,7 @@ jobs:
 
       - name: TruffleHog OSS
         id: trufflehog
-        uses: trufflesecurity/trufflehog@main
+        uses: trufflesecurity/trufflehog@7e78ca385fb82c19568c7a4b341c97d57d9aa5e1
         continue-on-error: true
         with:
           path: ./  # Scan the entire repository

diff --git a/deployment/infrastructure/data-consumer/edc-consumer/values-int.yaml b/deployment/infrastructure/data-consumer/edc-consumer/values-int.yaml
@@ -218,19 +218,21 @@ item-relationship-service:
     type: decentral
     url: https://dpp-registry.int.catena-x.net/semantics/registry/api/v3
 
-    discovery:
-      oAuthClientId: discovery  # ID of the OAuth2 client registration to use, see config spring.security.oauth2.client
-      discoveryFinderUrl: https://semantics.int.catena-x.net/discoveryfinder/api/v1.0/administration/connectors/discovery/search
-    semanticshub:
-      url: https://semantics.int.catena-x.net/hub/apimodels
-      oAuthClientId: semantics
-    bpdm:
-      url: https://partners-pool.int.catena-x.net
-      oAuthClientId: bpdm
-    bpnEndpoint: >-
-      {{- if .Values.bpdm.url }}
-      {{- tpl (.Values.bpdm.url | default "") . }}/api/catena/legal-entities/{partnerId}?idType={idType}
-      {{- end }}
+  discovery:
+    oAuthClientId: discovery  # ID of the OAuth2 client registration to use, see config spring.security.oauth2.client
+    discoveryFinderUrl: https://semantics.int.catena-x.net/discoveryfinder/api/v1.0/administration/connectors/discovery/search
+
+  semanticshub:
+    url: https://semantics.int.catena-x.net/hub/apimodels
+    oAuthClientId: semantics
+
+  bpdm:
+    url: https://partners-pool.int.catena-x.net
+    oAuthClientId: bpdm
+  bpnEndpoint: >-
+    {{- if .Values.bpdm.url }}
+    {{- tpl (.Values.bpdm.url | default "") . }}/api/catena/legal-entities/{partnerId}?idType={idType}
+    {{- end }}
 
   minioUser: <path:digital-product-pass/data/int/irs/minio#user>
   minioPassword: <path:digital-product-pass/data/int/irs/minio#password>
@@ -314,6 +316,10 @@ item-relationship-service:
       apikey:
         header: "X-Api-Key"
         secret: <path:digital-product-pass/data/int/edc/oauth#api.key>
+    submodel:
+      request-ttl: "PT10M"
+      urn-prefix: "/urn"
+      submodel-suffix: ""
 
   minio:
     serviceAccount:

diff --git a/deployment/infrastructure/data-consumer/edc-consumer/values.yaml b/deployment/infrastructure/data-consumer/edc-consumer/values.yaml
@@ -627,12 +627,12 @@ item-relationship-service:
     type: decentral
     url: ""
 
-    discovery:
-      oAuthClientId: discovery  # ID of the OAuth2 client registration to use, see config spring.security.oauth2.client
-      discoveryFinderUrl: ""
-    semanticshub:
-      url: ""
-      oAuthClientId: semantics
+  discovery:
+    oAuthClientId: discovery  # ID of the OAuth2 client registration to use, see config spring.security.oauth2.client
+    discoveryFinderUrl: ""
+  semanticshub:
+    url: ""
+    oAuthClientId: semantics
     bpdm:
       url: ""
       oAuthClientId: bpdm
@@ -708,6 +708,10 @@ item-relationship-service:
       apikey:
         header: "X-Api-Key"
         secret: ""
+    submodel:
+        request-ttl: "PT10M"
+        urn-prefix: "/urn"
+        submodel-suffix: "/$value"
 
   minio:
     serviceAccount: