Merge pull request #41 from eclipse-tractusx/release/0.0.4

Release version 0.0.4

charts/bdrs-server-memory/Chart.yaml

@@ -34,12 +34,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.3
+version: 0.0.4
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.0.3"
+appVersion: "0.0.4"
 home: https://github.com/eclipse-tractusx/bpn-did-resolution-service/tree/main/charts/bdrs-server
 sources:
   - https://github.com/eclipse-tractusx/bpn-did-resolution-service/tree/main/charts/bdrs-server

charts/bdrs-server-memory/README.md

@@ -1,6 +1,6 @@
 # bdrs-server-memory
 
-![Version: 0.0.3](https://img.shields.io/badge/Version-0.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.3](https://img.shields.io/badge/AppVersion-0.0.3-informational?style=flat-square)
+![Version: 0.0.4](https://img.shields.io/badge/Version-0.0.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.4](https://img.shields.io/badge/AppVersion-0.0.4-informational?style=flat-square)
 
 A Helm chart for the Tractus-X BPN-DID Resolution Service (only in-memory persistence)
 
@@ -25,7 +25,7 @@ Simply execute these commands on a shell:
 
 ```shell
 helm repo add tractusx https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/bdrs-server --version 0.0.3 \
+helm install my-release tractusx-edc/bdrs-server --version 0.0.4 \
      -f <path-to>/additional-values-file.yaml \
      --wait-for-jobs --timeout=120s --dependency-update
 ```
@@ -127,6 +127,7 @@ helm install my-release tractusx-edc/bdrs-server --version 0.0.3 \
 | server.service.annotations | object | `{}` |  |
 | server.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
 | server.tolerations | list | `[]` |  |
+| server.trustedIssuers | list | `[]` | Configures the trusted issuers for this runtime. Must not be empty. |
 | server.url.protocol | string | `""` | Explicitly declared url for reaching the dsp api (e.g. if ingresses not used) |
 | server.url.public | string | `""` |  |
 | server.url.readiness | string | `""` |  |

charts/bdrs-server-memory/templates/deployment.yaml

@@ -160,6 +160,18 @@ spec:
             - name: "WEB_HTTP_DIRECTORY_PATH"
               value: {{ .Values.server.endpoints.directory.path | quote }}
 
+            #############################
+            ## TRUSTED ISSUER CONFIG
+            #############################
+            {{- if empty .Values.server.trustedIssuers }}
+            {{- required "List of trusted issuers cannot be empty!" "" }}
+            {{- else }}
+            {{- range $index, $issuer := .Values.server.trustedIssuers }}
+            - name: "EDC_IAM_TRUSTED-ISSUER_{{$index}}-ISSUER_ID"
+              value: {{ $issuer | quote }}
+            {{- end }}
+            {{- end }}
+
             ######################################
             ## Additional environment variables ##
             ######################################

charts/bdrs-server-memory/templates/tests/test.yaml

@@ -36,11 +36,6 @@ spec:
       image: curlimages/curl
       command: [ 'curl', '--fail' ]
       args: [ '{{- printf "http://%s:%v%s/check/readiness" (include "bdrs.fullname" $ ) $.Values.server.endpoints.default.port $.Values.server.endpoints.default.path -}}' ]
-    {{/* Try getting a BPN/DID mapping via the management API   */}}
-    - name: bdrs-management-api
-      image: curlimages/curl
-      command: [ 'curl', '-i', '--fail', '-X', 'GET', '-H', '{{- printf "x-api-key: %s" $.Values.server.endpoints.management.authKey }}' ]
-      args: [ '{{- printf "http://%s:%v%s/bpn-directory" (include "bdrs.fullname" $ ) $.Values.server.endpoints.management.port $.Values.server.endpoints.management.path -}}' ]
   restartPolicy: Never
   securityContext:
     fsGroup: 101 # curl_group

charts/bdrs-server-memory/values.yaml

@@ -93,6 +93,9 @@ server:
       path: /api/directory
     # -- dsp api, used for inter connector communication and must be internet facing
 
+  # -- Configures the trusted issuers for this runtime. Must not be empty.
+  trustedIssuers: []
+
   service:
     # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
     type: ClusterIP

charts/bdrs-server/Chart.yaml

@@ -34,12 +34,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.3
+version: 0.0.4
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.0.3"
+appVersion: "0.0.4"
 home: https://github.com/eclipse-tractusx/bpn-did-resolution-service/tree/main/charts/bdrs-server
 sources:
   - https://github.com/eclipse-tractusx/bpn-did-resolution-service/tree/main/charts/bdrs-server

charts/bdrs-server/README.md

@@ -1,6 +1,6 @@
 # bdrs-server
 
-![Version: 0.0.3](https://img.shields.io/badge/Version-0.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.3](https://img.shields.io/badge/AppVersion-0.0.3-informational?style=flat-square)
+![Version: 0.0.4](https://img.shields.io/badge/Version-0.0.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.4](https://img.shields.io/badge/AppVersion-0.0.4-informational?style=flat-square)
 
 A Helm chart for the Tractus-X BPN-DID Resolution Service
 
@@ -22,7 +22,7 @@ Simply execute these commands on a shell:
 
 ```shell
 helm repo add tractusx https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/bdrs-server --version 0.0.3 \
+helm install my-release tractusx-edc/bdrs-server --version 0.0.4 \
      -f <path-to>/additional-values-file.yaml \
      --wait-for-jobs --timeout=120s --dependency-update
 ```
@@ -139,6 +139,7 @@ helm install my-release tractusx-edc/bdrs-server --version 0.0.3 \
 | server.service.annotations | object | `{}` |  |
 | server.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
 | server.tolerations | list | `[]` |  |
+| server.trustedIssuers | list | `[]` | Configures the trusted issuers for this runtime. Must not be empty. |
 | server.url.protocol | string | `""` | Explicitly declared url for reaching the dsp api (e.g. if ingresses not used) |
 | server.url.public | string | `""` |  |
 | server.url.readiness | string | `""` |  |

charts/bdrs-server/templates/deployment.yaml

@@ -95,7 +95,7 @@ spec:
           {{- if .Values.server.image.repository }}
           image: "{{ .Values.server.image.repository }}:{{ .Values.server.image.tag | default .Chart.AppVersion }}"
           {{- else }}
-          image: "tractusx/bdrs-server-memory:{{ .Values.server.image.tag | default .Chart.AppVersion }}"
+          image: "tractusx/bdrs-server:{{ .Values.server.image.tag | default .Chart.AppVersion }}"
           {{- end }}
 
           imagePullPolicy: {{ .Values.server.image.pullPolicy }}
@@ -192,6 +192,18 @@ spec:
               value: {{ .Values.vault.hashicorp.paths.health | quote }}
 
 
+            #############################
+            ## TRUSTED ISSUER CONFIG
+            #############################
+            {{- if empty .Values.server.trustedIssuers }}
+            {{- required "List of trusted issuers cannot be empty!" "" }}
+            {{- else }}
+            {{- range $index, $issuer := .Values.server.trustedIssuers }}
+            - name: "EDC_IAM_TRUSTED-ISSUER_{{$index}}-ISSUER_ID"
+              value: {{ $issuer | quote }}
+            {{- end }}
+            {{- end }}
+
             ######################################
             ## Additional environment variables ##
             ######################################

charts/bdrs-server/values.yaml

@@ -98,6 +98,9 @@ server:
       path: /api/directory
     # -- dsp api, used for inter connector communication and must be internet facing
 
+  # -- Configures the trusted issuers for this runtime. Must not be empty.
+  trustedIssuers: []
+
   service:
     # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
     type: ClusterIP

gradle.properties

@@ -19,7 +19,7 @@
 #
 #
 group=org.eclipse.tractusx
-version=0.0.3
+version=0.0.4
 # these define the versions of the EDC Build Plugin, the Annotation Processor and the Metamodel.
 # generally this should match the version of EDC in gradle/libs.versions.toml
 edcGradlePluginsVersion=0.5.1

system-tests/helm/values-test.yaml

@@ -22,6 +22,11 @@
 install:
   vault: false
 server:
+  trustedIssuers:
+    # these must be the DIDs of the dataspace credential issuer
+    - "did:web:tractusx-issuer1"
+    - "did:web:tractusx-issuer2"
+
   ingresses:
     - enabled: true
       hostname: "localhost"