Merge pull request #242 from catenax-ng/feat/update-edc

Update EDC and IRS for data chain kit
catenax-ng · Apr 5, 2023 · dfd7a22 · dfd7a22
2 parents 8527002 + f485b0e
commit dfd7a22
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 31 deletions.
diff --git a/local/full-irs/Chart.yaml b/local/full-irs/Chart.yaml
@@ -108,7 +108,7 @@ dependencies:
   - name: irs-helm
     alias: irs
     repository: https://catenax-ng.github.io/tx-item-relationship-service
-    version: 5.0.4
+    version: 5.0.9
     condition: irs.enabled
 
   # IRS Frontend Service

diff --git a/local/full-irs/subcharts/edc-control-plane/templates/configmap.yaml b/local/full-irs/subcharts/edc-control-plane/templates/configmap.yaml
@@ -10,14 +10,14 @@ data:
   configuration.properties: |-
     web.http.default.port={{ .Values.edc.endpoints.default.port }}
     web.http.default.path={{ .Values.edc.endpoints.default.path }}
-    web.http.data.port={{ .Values.edc.endpoints.management.port }}
-    web.http.data.path={{ .Values.edc.endpoints.management.path }}
+    web.http.management.port={{ .Values.edc.endpoints.management.port }}
+    web.http.management.path={{ .Values.edc.endpoints.management.path }}
     web.http.validation.port={{ .Values.edc.endpoints.validation.port }}
     web.http.validation.path={{ .Values.edc.endpoints.validation.path }}
     web.http.control.port={{ .Values.edc.endpoints.control.port }}
     web.http.control.path={{ .Values.edc.endpoints.control.path }}
-    web.http.ids.port={{ .Values.edc.endpoints.ids.port }}
-    web.http.ids.path={{ .Values.edc.endpoints.ids.path }}
+    web.http.protocol.port={{ .Values.edc.endpoints.protocol.port }}
+    web.http.protocol.path={{ .Values.edc.endpoints.protocol.path }}
     edc.hostname={{ .Values.edc.hostname }}
     
     edc.vault.hashicorp.health.check.enabled=false
@@ -52,7 +52,7 @@ data:
     edc.data.encryption.algorithm=NONE
 
     edc.oauth.token.url={{ .Values.edc.oauth.token.url }}
-    edc.oauth.public.key.alias={{ .Values.edc.oauth.public.key.alias }}
+    edc.oauth.certificate.alias={{ .Values.edc.oauth.public.key.alias }}
     edc.oauth.private.key.alias={{ .Values.edc.oauth.private.key.alias }}
 
     edc.oauth.client.id={{ .Values.edc.oauth.client.id }}
@@ -66,7 +66,7 @@ data:
 
     edc.api.auth.key={{ .Values.edc.api.auth.key }}
 
-    edc.receiver.http.endpoint={{ .Values.edc.receiver.http.endpoint }}
+    edc.receiver.http.dynamic.endpoint={{ .Values.edc.receiver.http.endpoint }}
     
     edc.ids.title=Eclipse Dataspace Connector
     edc.ids.description=Eclipse Dataspace Connector

diff --git a/local/full-irs/subcharts/edc-control-plane/templates/deployment.yaml b/local/full-irs/subcharts/edc-control-plane/templates/deployment.yaml
@@ -41,8 +41,8 @@ spec:
             - name: control
               containerPort: {{ .Values.edc.endpoints.control.port }}
               protocol: TCP
-            - name: ids
-              containerPort: {{ .Values.edc.endpoints.ids.port }}
+            - name: protocol
+              containerPort: {{ .Values.edc.endpoints.protocol.port }}
               protocol: TCP
             - name: metrics
               containerPort: {{ .Values.edc.endpoints.metrics.port }}

diff --git a/local/full-irs/subcharts/edc-control-plane/templates/service.yaml b/local/full-irs/subcharts/edc-control-plane/templates/service.yaml
@@ -24,15 +24,15 @@ spec:
     - port: {{ .Values.edc.endpoints.management.port }}
       targetPort: management
       protocol: TCP
-      name: data
+      name: management
     - port: {{ .Values.edc.endpoints.validation.port }}
       targetPort: validation
       protocol: TCP
       name: validation
-    - port: {{ .Values.edc.endpoints.ids.port }}
-      targetPort: ids
+    - port: {{ .Values.edc.endpoints.protocol.port }}
+      targetPort: protocol
       protocol: TCP
-      name: ids
+      name: protocol
     - port: {{ .Values.edc.endpoints.metrics.port }}
       targetPort: metrics
       protocol: TCP

diff --git a/local/full-irs/subcharts/edc-control-plane/values.yaml b/local/full-irs/subcharts/edc-control-plane/values.yaml
@@ -4,7 +4,7 @@ replicaCount: 1
 image:
   repository: ghcr.io/catenax-ng/product-edc/edc-controlplane-postgresql-hashicorp-vault
   pullPolicy: IfNotPresent
-  tag: "0.2.0"
+  tag: "0.3.0"
 
 serviceAccount:
   create: true
@@ -61,14 +61,14 @@ edc:
       path: /api
     management:
       port: "8181"
-      path: /data
+      path: /api/v1/management
     validation:
       port: "8182"
       path: /validation
     control:
       port: "9999"
       path: /api/controlplane/control
-    ids:
+    protocol:
       port: "8282"
       path: /api/v1/ids
     metrics:

diff --git a/local/full-irs/subcharts/edc-data-plane/templates/configmap.yaml b/local/full-irs/subcharts/edc-data-plane/templates/configmap.yaml
@@ -19,7 +19,7 @@ data:
     edc.oauth.client.id={{ .Values.edc.oauth.client.id }}
     edc.oauth.private.key.alias={{ .Values.edc.oauth.private.key.alias }}
     edc.oauth.provider.jwks.url={{ .Values.edc.oauth.provider.jwks.url}}
-    edc.oauth.public.key.alias={{ .Values.edc.oauth.public.key.alias }}
+    edc.oauth.certificate.alias={{ .Values.edc.oauth.public.key.alias }}
     edc.oauth.token.url={{ .Values.edc.oauth.token.url }}
     edc.vault.hashicorp.timeout.seconds=30
     edc.vault.hashicorp.health.check.enabled=false

diff --git a/local/full-irs/subcharts/edc-data-plane/values.yaml b/local/full-irs/subcharts/edc-data-plane/values.yaml
@@ -4,7 +4,7 @@ replicaCount: 1
 image:
   repository: ghcr.io/catenax-ng/product-edc/edc-dataplane-hashicorp-vault
   pullPolicy: IfNotPresent
-  tag: "0.2.0"
+  tag: "0.3.0"
 
 serviceAccount:
   create: true

diff --git a/local/full-irs/subcharts/keycloak/templates/configmap.yaml b/local/full-irs/subcharts/keycloak/templates/configmap.yaml
@@ -56,6 +56,11 @@ data:
             "Type": "resource_access",
             "Value": "{\"Cl20-CX-IRS\": {\"roles\": [\"view_irs\"]}}",
             "ValueType": "json"
+          },
+          {
+            "Type": "bpn",
+            "Value": "BPNL00000003CRHK",
+            "ValueType": "string"
           }
         ]
       }

diff --git a/local/full-irs/test/edc-consumer-control-plane.rest b/local/full-irs/test/edc-consumer-control-plane.rest
@@ -2,7 +2,7 @@
 @port = 7181
 @host = {{hostname}}:{{port}}
 @contentType = application/json
-@catalogEndpoint = /data/catalog
+@catalogEndpoint = /api/v1/management/catalog
 @headerName = X-Api-Key
 @headerValue = password
 
@@ -16,6 +16,6 @@ Content-Type: {{contentType}}
 
 ### Get Assets
 
-GET http://{{host}}/data/assets HTTP/1.1
+GET http://{{host}}/api/v1/management/assets HTTP/1.1
 {{headerName}}: {{headerValue}}
 Content-Type: {{contentType}}
diff --git a/local/full-irs/test/edc-consumer-data-plane.rest b/local/full-irs/test/edc-consumer-data-plane.rest
@@ -2,7 +2,7 @@
 @port = 7181
 @host = {{hostname}}:{{port}}
 @contentType = application/json
-@assetsEndpoint = /data/assets
+@assetsEndpoint = /api/v1/management/assets
 @headerName = X-Api-Key
 @headerValue = password
 

diff --git a/local/full-irs/test/edc-provider-control-plane.rest b/local/full-irs/test/edc-provider-control-plane.rest
@@ -16,19 +16,19 @@ Content-Type: {{contentType}}
 
 ### Get Assets
 
-GET http://{{host}}/data/assets
+GET http://{{host}}/api/v1/management/assets
 {{headerName}}: {{headerValue}}
 Content-Type: {{contentType}}
 
 ### Get Policy Definitions
 
-GET http://{{host}}/data/policydefinitions
+GET http://{{host}}/api/v1/management/policydefinitions
 {{headerName}}: {{headerValue}}
 Content-Type: {{contentType}}
 
 ### Get Contract Definitions
 
-GET http://{{host}}/data/contractdefinitions
+GET http://{{host}}/api/v1/management/contractdefinitions
 {{headerName}}: {{headerValue}}
 Content-Type: {{contentType}}
 
diff --git a/local/full-irs/values-dev.yaml b/local/full-irs/values-dev.yaml
@@ -576,7 +576,7 @@ irs:
   edc:
     controlplane:
       endpoint:
-        data: "http://edc-consumer-control-plane:8181/data"
+        data: "http://edc-consumer-control-plane:8181/api/v1/management"
       request:
         ttl: PT10M
       provider:

diff --git a/local/full-irs/values.yaml b/local/full-irs/values.yaml
@@ -47,7 +47,7 @@ config:
   edc:
     consumer:
       hostname:
-        controlplane: &config-edc-consumer-controlplane-hostname "http://edc-consumer-control-plane:8080/BPNL00000003AWSS/"
+        controlplane: &config-edc-consumer-controlplane-hostname "http://edc-consumer-control-plane:8282/api/v1/ids"
       database:
         host: &config-edc-consumer-database-host "edc-consumer-database"
         name: &config-edc-consumer-database-name "edc-consumer"
@@ -59,7 +59,7 @@ config:
           name: &config-edc-consumer-database-secret-name edc-consumer-database
     provider:
       hostname:
-        controlplane: &config-edc-provider-controlplane-hostname "http://edc-provider-control-plane:8080/BPNL00000003AWSS/"
+        controlplane: &config-edc-provider-controlplane-hostname "http://edc-provider-control-plane:8282/api/v1/ids"
       database:
         host: &config-edc-provider-database-host "edc-provider-database"
         name: &config-edc-provider-database-name "edc-provider"
@@ -565,7 +565,7 @@ irs:
   edc:
     controlplane:
       endpoint:
-        data: "http://edc-consumer-control-plane:8181/data"
+        data: "http://edc-consumer-control-plane:8181/api/v1/management"
       request:
         ttl: PT10M
       provider:

diff --git a/testdata-transform/transform-and-upload.py b/testdata-transform/transform-and-upload.py
@@ -203,9 +203,9 @@ def check_url_args(submodel_server_upload_urls_, submodel_server_urls_, edc_uplo
 
     check_url_args(submodel_server_upload_urls, submodel_server_urls, edc_upload_urls, edc_urls)
 
-    edc_asset_path = "/data/assets"
-    edc_policy_path = "/data/policydefinitions"
-    edc_contract_definition_path = "/data/contractdefinitions"
+    edc_asset_path = "/api/v1/management/assets"
+    edc_policy_path = "/api/v1/management/policydefinitions"
+    edc_contract_definition_path = "/api/v1/management/contractdefinitions"
 
     headers = {
         'Content-Type': 'application/json'