feature: participant id configuration and extractor (#427)

* Update Postman Collection for the version 0.4.0 * feat(Identity): add identity extractor from referringConnector * feat(Identity): updated charts * chore(protocol): switch default to /api/v1/dsp * chore(DataPlaneProxy): adds configuration for DataPlaneProxy * pr remarks * pr remarks * open api update * fix after review * fix after review --------- Co-authored-by: Tuncay Tunc (ZF Friedrichshafen AG) <[email protected]>
eclipse-tractusx · May 30, 2023 · 1a554e6 · 1a554e6
1 parent c94a86b
commit 1a554e6
Show file tree

Hide file tree

Showing 39 changed files with 834 additions and 415 deletions.
diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
@@ -109,6 +109,12 @@ spec:
             {{- end }}
           {{- end }}
 
+            ########################
+            ## ID CONFIGURATION ##
+            ########################
+            - name: EDC_PARTICIPANT_ID
+              value: {{ .Values.participant.id | required ".Values.participant.id is required" | quote }}
+
             ########################
             ## DAPS CONFIGURATION ##
             ########################
@@ -154,31 +160,15 @@ spec:
               value: {{ .Values.controlplane.endpoints.observability.insecure | quote }}
 
             #########
-            ## IDS ##
+            ## DSP ##
             #########
-            - name: "IDS_WEBHOOK_ADDRESS"
-              value: {{ include "txdc.controlplane.url.protocol" . | quote }}
-            - name: "EDC_IDS_ENDPOINT"
+
+            - name: "EDC_DSP_CALLBACK_ADDRESS"
               value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" .) .Values.controlplane.endpoints.protocol.path | quote }}
-            - name: "EDC_IDS_ID"
-              value: {{ printf "urn:connector:%s" (lower .Values.controlplane.internationalDataSpaces.id) | quote }}
-            - name: "EDC_IDS_DESCRIPTION"
-              value: {{ .Values.controlplane.internationalDataSpaces.description | quote }}
-            - name: "EDC_IDS_TITLE"
-              value: {{ .Values.controlplane.internationalDataSpaces.title | quote }}
-            - name: "EDC_IDS_MAINTAINER"
-              value: {{ .Values.controlplane.internationalDataSpaces.maintainer | quote }}
-            - name: "EDC_IDS_CURATOR"
-              value: {{ .Values.controlplane.internationalDataSpaces.curator | quote }}
-            - name: "EDC_IDS_CATALOG_ID"
-              value: {{ printf "urn:catalog:%s" (lower .Values.controlplane.internationalDataSpaces.catalogId) | quote }}
             - name: "EDC_OAUTH_PROVIDER_AUDIENCE"
               value: "idsc:IDS_CONNECTORS_ALL"
             - name: "EDC_OAUTH_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
-            # this is the old setting name for 'EDC_OAUTH_ENDPOINT_AUDIENCE' and is mandatory for Produce EDC v0.1.2 and older
-            - name: "EDC_IDS_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
+              value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path | quote }}
 
             ################
             ## POSTGRESQL ##
@@ -234,6 +224,16 @@ spec:
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/edr-cache-sql
+            - name: "EDC_DATASOURCE_EDR_NAME"
+              value: "edr"
+            - name: "EDC_DATASOURCE_EDR_USER"
+              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_PASSWORD"
+              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_URL"
+              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+
             ################
             ## DATA PLANE ##
             ################

diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
@@ -147,6 +147,20 @@ spec:
               value: {{ .Values.dataplane.aws.accessKeyId | quote }}
             {{- end }}
 
+            ###############
+            ## EDR CACHE ##
+            ###############
+
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/edr-cache-sql
+            - name: "EDC_DATASOURCE_EDR_NAME"
+              value: "edr"
+            - name: "EDC_DATASOURCE_EDR_USER"
+              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_PASSWORD"
+              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_URL"
+              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+
             ###########
             ## VAULT ##
             ###########

diff --git a/charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml
@@ -48,5 +48,9 @@ spec:
       targetPort: metrics
       protocol: TCP
       name: metrics
+    - port: {{ .Values.dataplane.endpoints.proxy.port }}
+      targetPort: proxy
+      protocol: TCP
+      name: proxy
   selector:
     {{- include "txdc.dataplane.selectorLabels" . | nindent 4 }}
diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml
@@ -34,6 +34,9 @@ imagePullSecrets: []
 
 customLabels: {}
 
+participant:
+  id: ""
+
 controlplane:
   image:
     # -- Which derivate of the control plane to use. when left empty the deployment will select the correct image automatically
@@ -107,7 +110,7 @@ controlplane:
       # -- port for incoming api calls
       port: 8084
       # -- path for incoming api calls
-      path: /api/v1/ids
+      path: /api/v1/dsp
     # -- metrics api, used for application metrics, must not be internet facing
     metrics:
       # -- port for incoming api calls
@@ -340,6 +343,9 @@ dataplane:
     control:
       port: 8083
       path: /api/dataplane/control
+    proxy:
+      port: 8186
+      path: /proxy
     observability:
       # -- port for incoming API calls
       port: 8085

diff --git a/charts/tractusx-connector-memory/example.yaml b/charts/tractusx-connector-memory/example.yaml
@@ -32,6 +32,10 @@
 
 ---
 fullnameOverride: tx-inmem
+
+participant:
+  id: "test-participant"
+
 runtime:
   service:
     type: NodePort

diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
@@ -109,6 +109,12 @@ spec:
             {{- end }}
           {{- end }}
 
+            ########################
+            ## ID CONFIGURATION ##
+            ########################
+            - name: EDC_PARTICIPANT_ID
+              value: {{ .Values.participant.id | required ".Values.participant.id is required" | quote }}
+
             ########################
             ## DAPS CONFIGURATION ##
             ########################
@@ -175,31 +181,15 @@ spec:
               value: {{ include "txdc.runtime.url.validation" .}}
 
             #########
-            ## IDS ##
+            ## DSP ##
             #########
-            - name: "IDS_WEBHOOK_ADDRESS"
-              value: {{ include "txdc.runtime.url.protocol" . | quote }}
-            - name: "EDC_IDS_ENDPOINT"
+
+            - name: "EDC_DSP_CALLBACK_ADDRESS"
               value: {{ printf "%s%s" (include "txdc.runtime.url.protocol" .) .Values.runtime.endpoints.protocol.path | quote }}
-            - name: "EDC_IDS_ID"
-              value: {{ printf "urn:connector:%s" (lower .Values.runtime.internationalDataSpaces.id) | quote }}
-            - name: "EDC_IDS_DESCRIPTION"
-              value: {{ .Values.runtime.internationalDataSpaces.description | quote }}
-            - name: "EDC_IDS_TITLE"
-              value: {{ .Values.runtime.internationalDataSpaces.title | quote }}
-            - name: "EDC_IDS_MAINTAINER"
-              value: {{ .Values.runtime.internationalDataSpaces.maintainer | quote }}
-            - name: "EDC_IDS_CURATOR"
-              value: {{ .Values.runtime.internationalDataSpaces.curator | quote }}
-            - name: "EDC_IDS_CATALOG_ID"
-              value: {{ printf "urn:catalog:%s" (lower .Values.runtime.internationalDataSpaces.catalogId) | quote }}
             - name: "EDC_OAUTH_PROVIDER_AUDIENCE"
               value: "idsc:IDS_CONNECTORS_ALL"
             - name: "EDC_OAUTH_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.runtime.url.protocol" . ) .Values.runtime.endpoints.protocol.path "/data" | quote }}
-            # this is the old setting name for 'EDC_OAUTH_ENDPOINT_AUDIENCE' and is mandatory for Produce EDC v0.1.2 and older
-            - name: "EDC_IDS_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.runtime.url.protocol" . ) .Values.runtime.endpoints.protocol.path "/data" | quote }}
+              value: {{ printf "%s%s" (include "txdc.runtime.url.protocol" . ) .Values.runtime.endpoints.protocol.path | quote }}
 
             ################
             ## DATA PLANE ##

diff --git a/charts/tractusx-connector-memory/values.yaml b/charts/tractusx-connector-memory/values.yaml
@@ -31,6 +31,9 @@ imagePullSecrets: []
 
 customLabels: {}
 
+participant:
+  id: ""
+
 runtime:
   image:
     repository: ""
@@ -109,7 +112,7 @@ runtime:
       # -- port for incoming api calls
       port: 8084
       # -- path for incoming api calls
-      path: /api/v1/ids
+      path: /api/v1/dsp
     # -- observability api with unsecured access, must not be internet facing
     observability:
       # -- port for incoming API calls
@@ -121,6 +124,9 @@ runtime:
     public:
       port: 8086
       path: /api/public
+    proxy:
+      port: 8186
+      path: /proxy
   businessPartnerValidation:
     log:
       agreementValidation: true

diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -109,6 +109,12 @@ spec:
             {{- end }}
           {{- end }}
 
+            ########################
+            ## ID CONFIGURATION ##
+            ########################
+            - name: EDC_PARTICIPANT_ID
+              value: {{ .Values.participant.id | required ".Values.participant.id is required" | quote }}
+
             ########################
             ## DAPS CONFIGURATION ##
             ########################
@@ -154,31 +160,15 @@ spec:
               value: {{ .Values.controlplane.endpoints.observability.insecure | quote }}
 
             #########
-            ## IDS ##
+            ## DSP ##
             #########
-            - name: "IDS_WEBHOOK_ADDRESS"
-              value: {{ include "txdc.controlplane.url.protocol" . | quote }}
-            - name: "EDC_IDS_ENDPOINT"
+
+            - name: "EDC_DSP_CALLBACK_ADDRESS"
               value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" .) .Values.controlplane.endpoints.protocol.path | quote }}
-            - name: "EDC_IDS_ID"
-              value: {{ printf "urn:connector:%s" (lower .Values.controlplane.internationalDataSpaces.id) | quote }}
-            - name: "EDC_IDS_DESCRIPTION"
-              value: {{ .Values.controlplane.internationalDataSpaces.description | quote }}
-            - name: "EDC_IDS_TITLE"
-              value: {{ .Values.controlplane.internationalDataSpaces.title | quote }}
-            - name: "EDC_IDS_MAINTAINER"
-              value: {{ .Values.controlplane.internationalDataSpaces.maintainer | quote }}
-            - name: "EDC_IDS_CURATOR"
-              value: {{ .Values.controlplane.internationalDataSpaces.curator | quote }}
-            - name: "EDC_IDS_CATALOG_ID"
-              value: {{ printf "urn:catalog:%s" (lower .Values.controlplane.internationalDataSpaces.catalogId) | quote }}
             - name: "EDC_OAUTH_PROVIDER_AUDIENCE"
               value: "idsc:IDS_CONNECTORS_ALL"
             - name: "EDC_OAUTH_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
-            # this is the old setting name for 'EDC_OAUTH_ENDPOINT_AUDIENCE' and is mandatory for Produce EDC v0.1.2 and older
-            - name: "EDC_IDS_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
+              value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path | quote }}
 
             ################
             ## POSTGRESQL ##
@@ -234,6 +224,16 @@ spec:
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/edr-cache-sql
+            - name: "EDC_DATASOURCE_EDR_NAME"
+              value: "edr"
+            - name: "EDC_DATASOURCE_EDR_USER"
+              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_PASSWORD"
+              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_URL"
+              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+
             ################
             ## DATA PLANE ##
             ################

diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -147,6 +147,20 @@ spec:
               value: {{ .Values.dataplane.aws.accessKeyId | quote }}
             {{- end }}
 
+            ###############
+            ## EDR CACHE ##
+            ###############
+
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/edr-cache-sql
+            - name: "EDC_DATASOURCE_EDR_NAME"
+              value: "edr"
+            - name: "EDC_DATASOURCE_EDR_USER"
+              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_PASSWORD"
+              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_URL"
+              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+
             ###########
             ## VAULT ##
             ###########

diff --git a/charts/tractusx-connector/templates/service-dataplane.yaml b/charts/tractusx-connector/templates/service-dataplane.yaml
@@ -51,5 +51,10 @@ spec:
       targetPort: metrics
       protocol: TCP
       name: metrics
+    - port: {{ .Values.dataplane.endpoints.proxy.port }}
+      targetPort: proxy
+      protocol: TCP
+      name: proxy
+
   selector:
     {{- include "txdc.dataplane.selectorLabels" . | nindent 4 }}
diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
@@ -34,6 +34,9 @@ imagePullSecrets: []
 
 customLabels: {}
 
+participant:
+  id: ""
+
 controlplane:
   image:
     # -- Which derivate of the control plane to use. when left empty the deployment will select the correct image automatically
@@ -107,7 +110,7 @@ controlplane:
       # -- port for incoming api calls
       port: 8084
       # -- path for incoming api calls
-      path: /api/v1/ids
+      path: /api/v1/dsp
     # -- metrics api, used for application metrics, must not be internet facing
     metrics:
       # -- port for incoming api calls
@@ -340,6 +343,9 @@ dataplane:
     control:
       port: 8083
       path: /api/dataplane/control
+    proxy:
+      port: 8186
+      path: /proxy
     observability:
       # -- port for incoming API calls
       port: 8085