From 23720724fc1fa0d779428342a311a8fe650be127 Mon Sep 17 00:00:00 2001 From: Muhammad Saud Khan Date: Wed, 29 Nov 2023 15:21:08 +0100 Subject: [PATCH 01/11] feat: prepared dpp helm chart for backend reference implementation - work in progress --- .../helm/digital-product-pass/.helmignore | 26 +++ .../helm/digital-product-pass/Chart.yaml | 49 +++++ deployment/helm/digital-product-pass/LICENSE | 202 ++++++++++++++++++ .../helm/digital-product-pass/README.md | 56 +++++ .../digital-product-pass/templates/NOTES.txt | 44 ++++ .../templates/_helpers.tpl | 84 ++++++++ .../templates/configmap.yaml | 147 +++++++++++++ .../templates/deployment.yaml | 115 ++++++++++ .../templates/ingress.yaml | 87 ++++++++ .../templates/pvc-data.yaml | 36 ++++ .../templates/secret.yaml | 46 ++++ .../templates/service.yaml | 37 ++++ .../templates/serviceaccount.yaml | 34 +++ .../templates/tests/test-connection.yaml | 38 ++++ .../helm/digital-product-pass/values-int.yaml | 101 +++++++++ .../helm/digital-product-pass/values.yaml | 187 ++++++++++++++++ 16 files changed, 1289 insertions(+) create mode 100644 deployment/helm/digital-product-pass/.helmignore create mode 100644 deployment/helm/digital-product-pass/Chart.yaml create mode 100644 deployment/helm/digital-product-pass/LICENSE create mode 100644 deployment/helm/digital-product-pass/README.md create mode 100644 deployment/helm/digital-product-pass/templates/NOTES.txt create mode 100644 deployment/helm/digital-product-pass/templates/_helpers.tpl create mode 100644 deployment/helm/digital-product-pass/templates/configmap.yaml create mode 100644 deployment/helm/digital-product-pass/templates/deployment.yaml create mode 100644 deployment/helm/digital-product-pass/templates/ingress.yaml create mode 100644 deployment/helm/digital-product-pass/templates/pvc-data.yaml create mode 100644 deployment/helm/digital-product-pass/templates/secret.yaml create mode 100644 deployment/helm/digital-product-pass/templates/service.yaml create mode 100644 deployment/helm/digital-product-pass/templates/serviceaccount.yaml create mode 100644 deployment/helm/digital-product-pass/templates/tests/test-connection.yaml create mode 100644 deployment/helm/digital-product-pass/values-int.yaml create mode 100644 deployment/helm/digital-product-pass/values.yaml diff --git a/deployment/helm/digital-product-pass/.helmignore b/deployment/helm/digital-product-pass/.helmignore new file mode 100644 index 000000000..876f60bc4 --- /dev/null +++ b/deployment/helm/digital-product-pass/.helmignore @@ -0,0 +1,26 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ +# Accept only values.yaml +values?*.yaml +values?*.yml diff --git a/deployment/helm/digital-product-pass/Chart.yaml b/deployment/helm/digital-product-pass/Chart.yaml new file mode 100644 index 000000000..837a43c37 --- /dev/null +++ b/deployment/helm/digital-product-pass/Chart.yaml @@ -0,0 +1,49 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# +--- +apiVersion: v2 +name: digital-product-pass +description: A Helm chart for Tractus-X Digital Product Pass Kubernetes +home: https://github.com/eclipse-tractusx/digital-product-pass/tree/main/charts/digital-product-pass +sources: + - https://github.com/eclipse-tractusx/digital-product-pass/tree/main/charts/digital-product-pass +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +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: 1.3.1 + +# 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: "1.3.1" diff --git a/deployment/helm/digital-product-pass/LICENSE b/deployment/helm/digital-product-pass/LICENSE new file mode 100644 index 000000000..c1e5cadd4 --- /dev/null +++ b/deployment/helm/digital-product-pass/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/deployment/helm/digital-product-pass/README.md b/deployment/helm/digital-product-pass/README.md new file mode 100644 index 000000000..c038f05da --- /dev/null +++ b/deployment/helm/digital-product-pass/README.md @@ -0,0 +1,56 @@ +# digital-product-pass + +![Version: 1.3.1](https://img.shields.io/badge/Version-1.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.1](https://img.shields.io/badge/AppVersion-1.3.1-informational?style=flat-square) + +A Helm chart for Tractus-X Digital Product Pass Kubernetes + +**Homepage:** + +## Source Code + +* + +## Values + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| affinity | object | `{}` | | +| backend | object | `{"application":{"yml":"# -- spring boot configuration\nspring:\n name: \"Catena-X Product Passport Consumer Backend\"\n main:\n allow-bean-definition-overriding: true\n devtools:\n add-properties: false\n jackson:\n serialization:\n indent_output: true\nlogging:\n level:\n # -- general logging level\n root: INFO\n # -- logging for the util components\n utils: INFO\nconfiguration:\n # -- max retries for the backend services\n maxRetries: 5\n # -- keycloak configuration\n keycloak:\n realm: CX-Central\n resource: Cl13-CX-Battery\n tokenUri: 'https:///auth/realms//protocol/openid-connect/token'\n userInfoUri: 'https:///auth/realms//protocol/openid-connect/userinfo'\n # -- edc consumer connection configuration\n edc:\n endpoint: 'https://'\n management: '/management/v2'\n catalog: '/catalog/request'\n negotiation: '/contractnegotiations'\n transfer: '/transferprocesses'\n receiverEndpoint: 'https:///endpoint'\n delay: 100 # -- Negotiation status Delay in milliseconds in between async requests [<= 500]\n # -- security configuration\n security:\n check:\n enabled: false\n bpn: false\n edc: false\n # -- irs configuration\n irs:\n enabled: true # -- Enable search for children in the requests\n endpoint: \"https://\" # -- IRS endpoint\n paths:\n job: \"/irs/jobs\" # -- API path for calling in the IRS endpoints and staring/getting jobs\n tree:\n fileName: \"treeDataModel\" # -- Tree dataModel filename created in the processId directory\n indent: true # -- Indent tree file\n callbackUrl: \"https:///api/irs\" # -- Backend call back base url for the irs controller\n # -- digital twin registry configuration\n dtr:\n central: false\n # -- central digital twin registry url\n centralUrl: 'https://'\n # -- asset type to search for the registry in the edc\n assetType: 'data.core.digitalTwinRegistry'\n # -- submodel endpoint interface to search\n endpointInterface: 'SUBMODEL-3.0'\n # -- dsp endpoint key inside submodel body\n dspEndpointKey: 'dspEndpoint'\n # -- decentral digital twin apis\n decentralApis:\n search: \"/lookup/shells\"\n digitalTwin: \"/shell-descriptors\"\n subModel: \"/submodel-descriptors\"\n # -- timeouts for the digital twin registry async negotiation\n timeouts:\n search: 10\n negotiation: 40\n transfer: 10\n digitalTwin: 20\n # -- temporary storage of dDTRs for optimization\n temporaryStorage: true\n # -- discovery configuration\n discovery:\n # -- discovery finder configuration\n endpoint: \"https:///discoveryfinder/api/v1.0/administration/connectors/discovery/search\"\n # -- bpn discovery configuration\n bpn:\n key: \"manufacturerPartId\"\n searchPath: \"/api/v1.0/administration/connectors/bpnDiscovery/search\"\n timeout: 2000 # -- timeout in milliseconds for the bpn discovery APIs to respond\n # -- edc discovery configuration\n edc:\n key: \"bpn\"\n timeout: 2000 # -- timeout in milliseconds for the bpn discovery APIs to respond\n # -- process configuration\n process:\n # -- directory for storing the contract negotiation files\n dir: \"process\"\n # -- indent the process negotiation files\n indent: true\n # -- unique sha512 hash key used for the passport encryption\n signKey: \"\"\n # -- passport data transfer configuration\n passport:\n # -- configure the data transfer\n dataTransfer:\n # -- encrypt the passport when he arrives from the edc data plane\n encrypt: true\n # -- the indent from the passport\n indent: true\n # -- directory to store the passport when is not linked to a process\n dir: \"data/transfer\"\n # -- passport versions and aspects allowed\n aspects:\n - \"urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport\"\n - \"urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass\"\n# -- configuration of the spring boot server\nserver:\n # -- configuration of backend errors\n error:\n include-message: ALWAYS\n include-binding-errors: ALWAYS\n include-stacktrace: ON_PARAM\n include-exception: false\n # -- listening port for the backend\n port: 8888\n # -- maximum allowed connections\n tomcat:\n max-connections: 10000"},"edc":{"clientId":"","clientSecret":"","participantId":"","xApiKey":""},"image":{"pullPolicy":"Always","repository":"docker.io/tractusx/digital-product-pass-backend"},"imagePullSecrets":[],"ingress":{"enabled":false},"name":"dpp-backend","service":{"port":8888,"type":"ClusterIP"}}` | Backend configuration | +| backend.application | object | `{"yml":"# -- spring boot configuration\nspring:\n name: \"Catena-X Product Passport Consumer Backend\"\n main:\n allow-bean-definition-overriding: true\n devtools:\n add-properties: false\n jackson:\n serialization:\n indent_output: true\nlogging:\n level:\n # -- general logging level\n root: INFO\n # -- logging for the util components\n utils: INFO\nconfiguration:\n # -- max retries for the backend services\n maxRetries: 5\n # -- keycloak configuration\n keycloak:\n realm: CX-Central\n resource: Cl13-CX-Battery\n tokenUri: 'https:///auth/realms//protocol/openid-connect/token'\n userInfoUri: 'https:///auth/realms//protocol/openid-connect/userinfo'\n # -- edc consumer connection configuration\n edc:\n endpoint: 'https://'\n management: '/management/v2'\n catalog: '/catalog/request'\n negotiation: '/contractnegotiations'\n transfer: '/transferprocesses'\n receiverEndpoint: 'https:///endpoint'\n delay: 100 # -- Negotiation status Delay in milliseconds in between async requests [<= 500]\n # -- security configuration\n security:\n check:\n enabled: false\n bpn: false\n edc: false\n # -- irs configuration\n irs:\n enabled: true # -- Enable search for children in the requests\n endpoint: \"https://\" # -- IRS endpoint\n paths:\n job: \"/irs/jobs\" # -- API path for calling in the IRS endpoints and staring/getting jobs\n tree:\n fileName: \"treeDataModel\" # -- Tree dataModel filename created in the processId directory\n indent: true # -- Indent tree file\n callbackUrl: \"https:///api/irs\" # -- Backend call back base url for the irs controller\n # -- digital twin registry configuration\n dtr:\n central: false\n # -- central digital twin registry url\n centralUrl: 'https://'\n # -- asset type to search for the registry in the edc\n assetType: 'data.core.digitalTwinRegistry'\n # -- submodel endpoint interface to search\n endpointInterface: 'SUBMODEL-3.0'\n # -- dsp endpoint key inside submodel body\n dspEndpointKey: 'dspEndpoint'\n # -- decentral digital twin apis\n decentralApis:\n search: \"/lookup/shells\"\n digitalTwin: \"/shell-descriptors\"\n subModel: \"/submodel-descriptors\"\n # -- timeouts for the digital twin registry async negotiation\n timeouts:\n search: 10\n negotiation: 40\n transfer: 10\n digitalTwin: 20\n # -- temporary storage of dDTRs for optimization\n temporaryStorage: true\n # -- discovery configuration\n discovery:\n # -- discovery finder configuration\n endpoint: \"https:///discoveryfinder/api/v1.0/administration/connectors/discovery/search\"\n # -- bpn discovery configuration\n bpn:\n key: \"manufacturerPartId\"\n searchPath: \"/api/v1.0/administration/connectors/bpnDiscovery/search\"\n timeout: 2000 # -- timeout in milliseconds for the bpn discovery APIs to respond\n # -- edc discovery configuration\n edc:\n key: \"bpn\"\n timeout: 2000 # -- timeout in milliseconds for the bpn discovery APIs to respond\n # -- process configuration\n process:\n # -- directory for storing the contract negotiation files\n dir: \"process\"\n # -- indent the process negotiation files\n indent: true\n # -- unique sha512 hash key used for the passport encryption\n signKey: \"\"\n # -- passport data transfer configuration\n passport:\n # -- configure the data transfer\n dataTransfer:\n # -- encrypt the passport when he arrives from the edc data plane\n encrypt: true\n # -- the indent from the passport\n indent: true\n # -- directory to store the passport when is not linked to a process\n dir: \"data/transfer\"\n # -- passport versions and aspects allowed\n aspects:\n - \"urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport\"\n - \"urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass\"\n# -- configuration of the spring boot server\nserver:\n # -- configuration of backend errors\n error:\n include-message: ALWAYS\n include-binding-errors: ALWAYS\n include-stacktrace: ON_PARAM\n include-exception: false\n # -- listening port for the backend\n port: 8888\n # -- maximum allowed connections\n tomcat:\n max-connections: 10000"}` | specific backend and spring boot configurations | +| backend.edc | object | `{"clientId":"","clientSecret":"","participantId":"","xApiKey":""}` | in this section we configure the values that are inserted as secrets in the backend | +| backend.edc.clientId | string | `""` | note: this credentials need to have access to the Discovery Finder, BPN Discovery and EDC Discovery | +| backend.edc.participantId | string | `""` | BPN Number | +| backend.edc.xApiKey | string | `""` | the secret for assesing the edc management API | +| backend.imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) | +| backend.ingress | object | `{"enabled":false}` | ingress declaration to expose the dpp-backend service | +| backend.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 | +| frontend.image.pullPolicy | string | `"Always"` | | +| frontend.image.repository | string | `"docker.io/tractusx/digital-product-pass-frontend"` | | +| frontend.imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) | +| frontend.ingress | object | `{"enabled":false,"hosts":[]}` | ingress declaration to expose the dpp-frontend service | +| frontend.name | string | `"dpp-frontend"` | | +| frontend.productpass | object | `{"api":{"delay":1000,"max_retries":30,"timeout":90000},"backend_url":"","idp_url":"","irs":{"maxWaitingTime":30,"requestDelay":30000},"keycloak":{"clientId":"","onLoad":"login-required","realm":""}}` | product passport UI configuration | +| frontend.productpass.api | object | `{"delay":1000,"max_retries":30,"timeout":90000}` | api timeouts | +| frontend.productpass.api.delay | int | `1000` | delay from getting status | +| frontend.productpass.api.max_retries | int | `30` | max retries for getting status | +| frontend.productpass.api.timeout | int | `90000` | default timeout - 90 seconds in milliseconds | +| frontend.productpass.backend_url | string | `""` | url of the digital product pass backend service | +| frontend.productpass.idp_url | string | `""` | url of the identity provider service | +| frontend.productpass.irs | object | `{"maxWaitingTime":30,"requestDelay":30000}` | irs api timeouts | +| frontend.productpass.irs.maxWaitingTime | int | `30` | maximum waiting time to get the irs job status | +| frontend.productpass.irs.requestDelay | int | `30000` | request timeout delay | +| frontend.productpass.keycloak | object | `{"clientId":"","onLoad":"login-required","realm":""}` | keycloak specific configuration for frontend authentication | +| frontend.service.port | int | `8080` | | +| frontend.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 | +| name | string | `"digital-product-pass"` | | +| namespace | string | `""` | | +| nodeSelector | object | `{}` | | +| replicaCount | int | `1` | | +| resources.limits.cpu | string | `"500m"` | | +| resources.limits.memory | string | `"512Mi"` | | +| resources.requests.cpu | string | `"250m"` | | +| resources.requests.memory | string | `"512Mi"` | | +| tolerations | list | `[]` | | + +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) diff --git a/deployment/helm/digital-product-pass/templates/NOTES.txt b/deployment/helm/digital-product-pass/templates/NOTES.txt new file mode 100644 index 000000000..8b4cbc0c3 --- /dev/null +++ b/deployment/helm/digital-product-pass/templates/NOTES.txt @@ -0,0 +1,44 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "digital-product-pass.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "digital-product-pass.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "digital-product-pass.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "digital-product-pass.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/deployment/helm/digital-product-pass/templates/_helpers.tpl b/deployment/helm/digital-product-pass/templates/_helpers.tpl new file mode 100644 index 000000000..87730456d --- /dev/null +++ b/deployment/helm/digital-product-pass/templates/_helpers.tpl @@ -0,0 +1,84 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +#################################################################################e governing permissions and + +{{/* +Expand the name of the chart. +*/}} +{{- define "digital-product-pass.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "digital-product-pass.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "digital-product-pass.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "digital-product-pass.labels" -}} +helm.sh/chart: {{ include "digital-product-pass.chart" . }} +{{ include "digital-product-pass.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "digital-product-pass.selectorLabels" -}} +app.kubernetes.io/name: {{ include "digital-product-pass.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "digital-product-pass.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "digital-product-pass.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/deployment/helm/digital-product-pass/templates/configmap.yaml b/deployment/helm/digital-product-pass/templates/configmap.yaml new file mode 100644 index 000000000..5c3478a72 --- /dev/null +++ b/deployment/helm/digital-product-pass/templates/configmap.yaml @@ -0,0 +1,147 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +apiVersion: v1 +kind: ConfigMap +metadata: + name: backend-config + namespace: {{ .Values.namespace }} +data: + application.yaml: |- + spring: + name: "Digital Product Passport Consumer Backend" + main: + allow-bean-definition-overriding: true + devtools: + add-properties: false + jackson: + serialization: + indent_output: true + logging: + level: + # -- general logging level + root: {{ tpl (.Values.logging.level.root | default "INFO") . | quote }} + # -- logging for the util components + utils: {{ tpl (.Values.logging.level.utils | default "INFO") . | quote }} + + configuration: + # -- max retries for the backend services + maxRetries: {{ .Values.maxRetries }} + # -- keycloak configuration + keycloak: + realm: {{ .Values.oauth.realm }} + resource: {{ .Values.oauth.resource }} + tokenUri: {{ tpl (.Values.oauth.tokenUri | default "http://localhost") . | quote }} + userInfoUri: {{ tpl (.Values.oauth.userInfoUri | default "http://localhost") . | quote }} + # -- edc consumer connection configuration + edc: + endpoint: {{ .Values.edc.endpoint }} + management: {{ .Values.edc.management }} + catalog: {{ .Values.edc.catalog }} + negotiation: {{ .Values.edc.negotiation }} + transfer: {{ .Values.edc.transfer }} + receiverEndpoint: "https://{{ .Values.url }}/endpoint" + delay: {{ .Values.edc.delay }} # -- Negotiation status Delay in milliseconds in between async requests [<= 500] + # -- security configuration + security: + check: + enabled: {{ .Values.securityCheck.enabled }} + bpn: {{ .Values.securityCheck.bpn }} + edc: {{ .Values.securityCheck.edc }} + # -- irs configuration + irs: + enabled: true # -- Enable search for children in the requests + endpoint: "https://{{ .Values.irs.endpoint }}" # -- IRS endpoint + paths: + job: "/irs/jobs" # -- API path for calling in the IRS endpoints and staring/getting jobs + tree: + fileName: "treeDataModel" # -- Tree dataModel filename created in the processId directory + indent: true # -- Indent tree file + callbackUrl: "https://{{ .Values.url }}/api/irs" # -- Backend call back base url for the irs controller + # -- digital twin registry configuration + dtr: + central: false + # -- central digital twin registry url + centralUrl: 'https://{{ .Values.digitalTwinRegistry.url }}' + # -- asset type to search for the registry in the edc + assetType: 'data.core.digitalTwinRegistry' + # -- submodel endpoint interface to search + endpointInterface: 'SUBMODEL-3.0' + # -- dsp endpoint key inside submodel body + dspEndpointKey: 'dspEndpoint' + # -- decentral digital twin apis + decentralApis: + search: {{ .Values.digitalTwinRegistry.endpoints.search }} + digitalTwin: {{ .Values.digitalTwinRegistry.endpoints.digitalTwin }} + subModel: {{ .Values.digitalTwinRegistry.endpoints.subModel }} + # -- timeouts for the digital twin registry async negotiation + timeouts: + search: {{ .Values.digitalTwinRegistry.timeouts.search }} + negotiation: {{ .Values.digitalTwinRegistry.timeouts.negotiation }} + transfer: {{ .Values.digitalTwinRegistry.timeouts.transfer }} + digitalTwin: {{ .Values.digitalTwinRegistry.timeouts.digitalTwin }} + # -- temporary storage of dDTRs for optimization + temporaryStorage: {{ .Values.digitalTwinRegistry.temporaryStorage.enabled }} + # -- discovery configuration + discovery: + # -- discovery finder configuration + endpoint: {{ tpl (.Values.discovery.url | default "") . | quote }} + # -- bpn discovery configuration + bpn: + key: {{ tpl (.Values.discovery.bpnDiscovery.key | default "manufacturerPartId") . | quote }} + searchPath: {{ tpl (.Values.discovery.bpnDiscovery.path | default "") . | quote }} + # -- edc discovery configuration + edc: + key: {{ tpl (.Values.discovery.edcDiscovery.key | default "bpn") . | quote }} + # -- process configuration + process: + # -- directory for storing the contract negotiation files + dir: "process" + # -- indent the process negotiation files + indent: true + # -- unique sha512 hash key used for the passport encryption + signKey: {{ tpl (.Values.process.encryptionKey | default "") . | quote }} + # -- passport data transfer configuration + passport: + # -- configure the data transfer + dataTransfer: + # -- encrypt the passport when he arrives from the edc data plane + encrypt: true + # -- the indent from the passport + indent: true + # -- directory to store the passport when is not linked to a process + dir: "data/transfer" + # -- passport versions and aspects allowed + aspects: {{ .Values.passport.aspects }} + # -- configuration of the spring boot server + server: + # -- configuration of backend errors + error: + include-message: ALWAYS + include-binding-errors: ALWAYS + include-stacktrace: ON_PARAM + include-exception: false + # -- listening port for the backend + port: {{ .Values.serverPort }} + # -- maximum allowed connections + tomcat: + max-connections: 10000 diff --git a/deployment/helm/digital-product-pass/templates/deployment.yaml b/deployment/helm/digital-product-pass/templates/deployment.yaml new file mode 100644 index 000000000..7b30dc10e --- /dev/null +++ b/deployment/helm/digital-product-pass/templates/deployment.yaml @@ -0,0 +1,115 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "digital-product-pass.fullname" . }} + labels: + {{- include "digital-product-pass.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "digital-product-pass.selectorLabels" . | nindent 6 }} + template: + labels: + {{- include "digital-product-pass.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "digital-product-pass.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + env: + - name: "client.id" + valueFrom: + secretKeyRef: + key: clientId + name: consumer-backend-oauth + - name: "client.secret" + valueFrom: + secretKeyRef: + key: clientSecret + name: consumer-backend-oauth + - name: "edc.apiKey" + valueFrom: + secretKeyRef: + key: xApiKey + name: consumer-edc + - name: "edc.participantId" + valueFrom: + secretKeyRef: + key: participantId + name: consumer-edc + volumeMounts: + - name: backend-config + mountPath: /app/config + - name: pvc-backend + mountPath: /app/data + subPath: data + - name: pvc-backend + mountPath: /app/log + subPath: log + ports: + - name: http + containerPort: 8888 + protocol: TCP + livenessProbe: + httpGet: + path: /health + port: http + readinessProbe: + httpGet: + path: /health + port: http + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + volumes: + - name: backend-config + configMap: + name: backend-config + - name: pvc-backend + persistentVolumeClaim: + claimName: pvc-data diff --git a/deployment/helm/digital-product-pass/templates/ingress.yaml b/deployment/helm/digital-product-pass/templates/ingress.yaml new file mode 100644 index 000000000..dbde39aa7 --- /dev/null +++ b/deployment/helm/digital-product-pass/templates/ingress.yaml @@ -0,0 +1,87 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "digital-product-pass.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} + {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} + {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} + {{- end }} +{{- end }} + +# {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +# apiVersion: networking.k8s.io/v1 +# {{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +# apiVersion: networking.k8s.io/v1beta1 +# {{- else -}} +# apiVersion: extensions/v1beta1 +# {{- end }} + +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ $fullName }} + namespace: {{ .Values.namespace }} + labels: + {{- include "digital-product-pass.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} diff --git a/deployment/helm/digital-product-pass/templates/pvc-data.yaml b/deployment/helm/digital-product-pass/templates/pvc-data.yaml new file mode 100644 index 000000000..b023691ae --- /dev/null +++ b/deployment/helm/digital-product-pass/templates/pvc-data.yaml @@ -0,0 +1,36 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: pvc-data + labels: + {{- include "chart.labels" . | nindent 4 }} + namespace: {{ .Values.namespace }} +spec: + storageClassName: default + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 1Gi diff --git a/deployment/helm/digital-product-pass/templates/secret.yaml b/deployment/helm/digital-product-pass/templates/secret.yaml new file mode 100644 index 000000000..c6ef854fa --- /dev/null +++ b/deployment/helm/digital-product-pass/templates/secret.yaml @@ -0,0 +1,46 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +apiVersion: v1 +kind: Secret +metadata: + name: consumer-backend-oauth + labels: + {{- include "chart.labels" . | nindent 4 }} + namespace: {{ .Values.namespace }} +type: Opaque +stringData: + clientId: {{ .Values.oauth.techUser.clientId }} + clientSecret: {{ .Values.oauth.techUser.clientSecret }} +--- + +apiVersion: v1 +kind: Secret +metadata: + name: consumer-edc + labels: + {{- include "chart.labels" . | nindent 4 }} + namespace: {{ .Values.namespace }} +type: Opaque +stringData: + xApiKey: {{ .Values.edc.xApiKey }} + participantId: {{ .Values.edc.participantId }} diff --git a/deployment/helm/digital-product-pass/templates/service.yaml b/deployment/helm/digital-product-pass/templates/service.yaml new file mode 100644 index 000000000..89fad2414 --- /dev/null +++ b/deployment/helm/digital-product-pass/templates/service.yaml @@ -0,0 +1,37 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +apiVersion: v1 +kind: Service +metadata: + name: {{ include "digital-product-pass.fullname" . }} + labels: + {{- include "digital-product-pass.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "digital-product-pass.selectorLabels" . | nindent 4 }} diff --git a/deployment/helm/digital-product-pass/templates/serviceaccount.yaml b/deployment/helm/digital-product-pass/templates/serviceaccount.yaml new file mode 100644 index 000000000..54af0f9c8 --- /dev/null +++ b/deployment/helm/digital-product-pass/templates/serviceaccount.yaml @@ -0,0 +1,34 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "digital-product-pass.serviceAccountName" . }} + labels: + {{- include "digital-product-pass.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/deployment/helm/digital-product-pass/templates/tests/test-connection.yaml b/deployment/helm/digital-product-pass/templates/tests/test-connection.yaml new file mode 100644 index 000000000..2fa5ecf30 --- /dev/null +++ b/deployment/helm/digital-product-pass/templates/tests/test-connection.yaml @@ -0,0 +1,38 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "digital-product-pass.fullname" . }}-test-connection" + labels: + {{- include "digital-product-pass.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['/bin/sh','-c'] + args: ["i=0; wget '{{ .Values.name }}:{{ .Values.service.port }}'/health -O /dev/null; while [ $i -ne 5 ]; do wget '{{ .Values.name }}:{{ .Values.service.port }}'/health -O /dev/null; sleep 6; i=$(($i+1)); done"] + # args: ['{{ include "digital-product-pass.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/deployment/helm/digital-product-pass/values-int.yaml b/deployment/helm/digital-product-pass/values-int.yaml new file mode 100644 index 000000000..6708332cc --- /dev/null +++ b/deployment/helm/digital-product-pass/values-int.yaml @@ -0,0 +1,101 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# +fullname: "dpp-backend" +ingress: + enabled: true + # className: "nginx" + annotations: + ingressClassName: nginx + # kubernetes.io/tls-acme: "true" + nginx.ingress.kubernetes.io/force-ssl-redirect: "true" + nginx.ingress.kubernetes.io/ssl-passthrough: "false" + nginx.ingress.kubernetes.io/backend-protocol: "HTTP" + hosts: + - host: &hostname "materialpass.int.demo.catena-x.net" + paths: + - path: / + pathType: Prefix + tls: + - secretName: tls-secret + hosts: + - *hostname + +edc: + xApiKey: + participantId: + endpoint: "https://materialpass.int.demo.catena-x.net/consumer" + management: "/management/v2" + catalog: "/catalog/request" + negotiation: "/contractnegotiations" + transfer: "/transferprocesses" + delay: 100 + +oauth: + techUser: + clientId: + clientSecret: + realm: CX-Central + resource: Cl13-CX-Battery + tokenUri: "https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token" + userInfoUri: "https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/userinfo" + +url: *hostname + +serverPort: 8888 + logging: + level: + root: INFO + utils: INFO +maxRetries: 10 +securityCheck: + enabled: true + bpn: true + edc: true +irs: + endpoint: "materialpass-irs.int.demo.catena-x.net" +process: + encryptionKey: "" +passport: + aspects: + - "urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport" + - "urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass" + - "urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass" +digitalTwinRegistry: + url: "https://semantics.int.demo.catena-x.net/registry" + endpoints: + search: "/lookup/shells" + digitalTwin: "/shell-descriptors" + subModel: "/submodel-descriptors" + timeouts: + search: 10 + negotiation: 40 + transfer: 10 + digitalTwin: 20 + temporaryStorage: + enabled: true +discovery: + url: "https://semantics.int.demo.catena-x.net/discoveryfinder/api/v1.0/administration/connectors/discovery/search" + bpnDiscovery: + key: "manufacturerPartId" + path: "/api/v1.0/administration/connectors/bpnDiscovery/search" + edcDiscovery: + key: "bpn" diff --git a/deployment/helm/digital-product-pass/values.yaml b/deployment/helm/digital-product-pass/values.yaml new file mode 100644 index 000000000..3cd7d7783 --- /dev/null +++ b/deployment/helm/digital-product-pass/values.yaml @@ -0,0 +1,187 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +# Default values for dpp-frontend. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +name: "digital-product-pass" +replicaCount: 1 +namespace: "" +fullname: "dpp-backend" + +image: + repository: docker.io/tractusx/digital-product-pass-backend + pullPolicy: Always + # -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) +imagePullSecrets: [] + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +# podAnnotations: {} + +podSecurityContext: + runAsUser: 10000 + fsGroup: 3000 + +securityContext: + readOnlyRootFilesystem: true + allowPrivilegeEscalation: false + runAsNonRoot: true + runAsUser: 10000 + runAsGroup: 3000 + +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 + port: 8888 + + # -- ingress declaration to expose the dpp-backend service +ingress: + enabled: false + # className: "" + annotations: + ingressClassName: nginx + # kubernetes.io/tls-acme: "true" + nginx.ingress.kubernetes.io/force-ssl-redirect: "true" + nginx.ingress.kubernetes.io/ssl-passthrough: "false" + nginx.ingress.kubernetes.io/backend-protocol: "HTTP" + hosts: + - host: &hostname "localhost" + paths: + - path: / + pathType: Prefix + tls: [] + +# -- in this section we configure the values that are inserted as secrets in the backend +edc: + # -- the secret to access the edc management API + xApiKey: "" + # -- BPN Number + participantId: "" + # -- edc consumer connection configuration + endpoint: "" + management: "" + catalog: "" + negotiation: "" + transfer: "" + delay: 100 # -- Negotiation status Delay in milliseconds in between async requests [<= 500] + +oauth: + # -- technical user credentials centrally managed by keycloak + # -- note: these credentials are required for the Discovery Finder, BPN Discovery and EDC Discovery services + techUser: + clientId: "" + clientSecret: "" + realm: CX-Central + resource: "" + tokenUri: "" + userInfoUri: "" + +# -- backend server url +url: *hostname + +# -- configuration of the spring boot server +serverPort: 8888 +logging: + level: + # -- general logging level + root: INFO + # -- logging for the util components + utils: INFO +# -- Provide your custom configuration here (this overrides the DPP backend spring application.yaml) +# -- max retries for the backend services +maxRetries: 5 +# -- security configuration +securityCheck: + enabled: false + bpn: false + edc: false +# -- irs configuration +irs: + endpoint: "" +# -- digital twin registry configuration +process: + # -- unique sha512 hash key used for the passport encryption + encryptionKey: "" +# -- passport data transfer configuration +passport: + # -- passport versions and aspects allowed + aspects: + - "urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport" + - "urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass" + - "urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass" +digitalTwinRegistry: + # -- central digital twin registry url + url: "" + # -- decentral digital twin apis + endpoints: + search: "/lookup/shells" + digitalTwin: "/shell-descriptors" + subModel: "/submodel-descriptors" + # -- timeouts for the digital twin registry async negotiation + timeouts: + search: 10 + negotiation: 40 + transfer: 10 + digitalTwin: 20 + # -- temporary storage of dDTRs for optimization + temporaryStorage: + enabled: true +# -- discovery configuration +discovery: + # -- discovery finder configuration + url: "" + # -- bpn discovery configuration + bpnDiscovery: + key: "manufacturerPartId" + path: "/api/v1.0/administration/connectors/bpnDiscovery/search" + # -- edc discovery configuration + edcDiscovery: + key: "bpn" + + +# Following Catena-X Helm Best Practices @url: https://catenax-ng.github.io/docs/kubernetes-basics/helm +# @url: https://cloud.google.com/blog/products/containers-kubernetes/kubernetes-best-practices-resource-requests-and-limits +resources: + limits: + cpu: 500m + memory: 512Mi + requests: + cpu: 250m + memory: 512Mi + +# [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes +nodeSelector: {} + +# [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes +tolerations: [] + +# [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on +affinity: {} From 3c6abb543bfc608998711c0cc249d4fc28983fc2 Mon Sep 17 00:00:00 2001 From: Muhammad Saud Khan Date: Tue, 19 Dec 2023 15:50:26 +0100 Subject: [PATCH 02/11] chore: update and refactor dpp helm chart --- .../helm/digital-product-pass/Chart.yaml | 4 +- .../templates/_helpers.tpl | 26 ++-- .../templates/configmap.yaml | 31 ++--- .../templates/deployment.yaml | 34 +++-- .../templates/ingress.yaml | 4 +- .../templates/service.yaml | 33 +++-- .../templates/serviceaccount.yaml | 26 +--- .../templates/tests/test-connection.yaml | 10 +- .../helm/digital-product-pass/values-dev.yaml | 70 ++++++++++ .../helm/digital-product-pass/values-int.yaml | 67 +++------ .../helm/digital-product-pass/values.yaml | 130 +++++++++--------- 11 files changed, 235 insertions(+), 200 deletions(-) create mode 100644 deployment/helm/digital-product-pass/values-dev.yaml diff --git a/deployment/helm/digital-product-pass/Chart.yaml b/deployment/helm/digital-product-pass/Chart.yaml index 837a43c37..36015a71c 100644 --- a/deployment/helm/digital-product-pass/Chart.yaml +++ b/deployment/helm/digital-product-pass/Chart.yaml @@ -40,10 +40,10 @@ type: application # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.3.1 +version: 1.4.0 # 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: "1.3.1" +appVersion: "1.4.0" diff --git a/deployment/helm/digital-product-pass/templates/_helpers.tpl b/deployment/helm/digital-product-pass/templates/_helpers.tpl index 87730456d..8394da30e 100644 --- a/deployment/helm/digital-product-pass/templates/_helpers.tpl +++ b/deployment/helm/digital-product-pass/templates/_helpers.tpl @@ -23,8 +23,8 @@ {{/* Expand the name of the chart. */}} -{{- define "digital-product-pass.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- define "chart.name" -}} +{{- default .Chart.Name .Values.name | trunc 63 | trimSuffix "-" }} {{- end }} {{/* @@ -32,11 +32,11 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name. */}} -{{- define "digital-product-pass.fullname" -}} +{{- define "chart.fullname" -}} {{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- .Values.name | trunc 63 | trimSuffix "-" }} {{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} +{{- $name := default .Chart.Name .Values.name }} {{- if contains $name .Release.Name }} {{- .Release.Name | trunc 63 | trimSuffix "-" }} {{- else }} @@ -48,16 +48,16 @@ If release name contains chart name it will be used as a full name. {{/* Create chart name and version as used by the chart label. */}} -{{- define "digital-product-pass.chart" -}} +{{- define "chart.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} {{/* Common labels */}} -{{- define "digital-product-pass.labels" -}} -helm.sh/chart: {{ include "digital-product-pass.chart" . }} -{{ include "digital-product-pass.selectorLabels" . }} +{{- define "chart.labels" -}} +helm.sh/chart: {{ include "chart.chart" . }} +{{ include "chart.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -67,17 +67,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{/* Selector labels */}} -{{- define "digital-product-pass.selectorLabels" -}} -app.kubernetes.io/name: {{ include "digital-product-pass.name" . }} +{{- define "chart.selectorLabels" -}} +app.kubernetes.io/name: {{ include "chart.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} {{/* Create the name of the service account to use */}} -{{- define "digital-product-pass.serviceAccountName" -}} +{{- define "chart.serviceAccountName" -}} {{- if .Values.serviceAccount.create }} -{{- default (include "digital-product-pass.fullname" .) .Values.serviceAccount.name }} +{{- default (include "chart.fullname" .) .Values.serviceAccount.name }} {{- else }} {{- default "default" .Values.serviceAccount.name }} {{- end }} diff --git a/deployment/helm/digital-product-pass/templates/configmap.yaml b/deployment/helm/digital-product-pass/templates/configmap.yaml index 5c3478a72..1617aa8d5 100644 --- a/deployment/helm/digital-product-pass/templates/configmap.yaml +++ b/deployment/helm/digital-product-pass/templates/configmap.yaml @@ -49,17 +49,17 @@ data: # -- keycloak configuration keycloak: realm: {{ .Values.oauth.realm }} - resource: {{ .Values.oauth.resource }} - tokenUri: {{ tpl (.Values.oauth.tokenUri | default "http://localhost") . | quote }} - userInfoUri: {{ tpl (.Values.oauth.userInfoUri | default "http://localhost") . | quote }} + resource: {{ .Values.oauth.appId }} + tokenUri: "https://{{ tpl (.Values.oauth.hostname | default "http://localhost") . }}/auth/realms/{{ .Values.oauth.realm }}/protocol/openid-connect/token" + userInfoUri: "https://{{ tpl (.Values.oauth.hostname | default "http://localhost") . }}/auth/realms/{{ .Values.oauth.realm }}/protocol/openid-connect/userinfo" # -- edc consumer connection configuration edc: - endpoint: {{ .Values.edc.endpoint }} - management: {{ .Values.edc.management }} - catalog: {{ .Values.edc.catalog }} - negotiation: {{ .Values.edc.negotiation }} - transfer: {{ .Values.edc.transfer }} - receiverEndpoint: "https://{{ .Values.url }}/endpoint" + endpoint: "https://{{ .Values.edc.endpoint }}" + management: {{ .Values.edc.apis.management }} + catalog: {{ .Values.edc.apis.catalog }} + negotiation: {{ .Values.edc.apis.negotiation }} + transfer: {{ .Values.edc.apis.transfer }} + receiverEndpoint: "https://{{ .Values.hostname }}/endpoint" delay: {{ .Values.edc.delay }} # -- Negotiation status Delay in milliseconds in between async requests [<= 500] # -- security configuration security: @@ -69,19 +69,16 @@ data: edc: {{ .Values.securityCheck.edc }} # -- irs configuration irs: - enabled: true # -- Enable search for children in the requests - endpoint: "https://{{ .Values.irs.endpoint }}" # -- IRS endpoint + enabled: {{ .Values.irs.enabled }} # -- Enable search for children in the requests + endpoint: "https://{{ .Values.irs.hostname }}" # -- IRS endpoint paths: job: "/irs/jobs" # -- API path for calling in the IRS endpoints and staring/getting jobs tree: fileName: "treeDataModel" # -- Tree dataModel filename created in the processId directory indent: true # -- Indent tree file - callbackUrl: "https://{{ .Values.url }}/api/irs" # -- Backend call back base url for the irs controller + callbackUrl: "https://{{ .Values.hostname }}/api/irs" # -- Backend call back base url for the irs controller # -- digital twin registry configuration dtr: - central: false - # -- central digital twin registry url - centralUrl: 'https://{{ .Values.digitalTwinRegistry.url }}' # -- asset type to search for the registry in the edc assetType: 'data.core.digitalTwinRegistry' # -- submodel endpoint interface to search @@ -104,7 +101,7 @@ data: # -- discovery configuration discovery: # -- discovery finder configuration - endpoint: {{ tpl (.Values.discovery.url | default "") . | quote }} + endpoint: "https://{{ tpl (.Values.discovery.hostname | default "") . }}/api/v1.0/administration/connectors/discovery/search" # -- bpn discovery configuration bpn: key: {{ tpl (.Values.discovery.bpnDiscovery.key | default "manufacturerPartId") . | quote }} @@ -131,7 +128,7 @@ data: # -- directory to store the passport when is not linked to a process dir: "data/transfer" # -- passport versions and aspects allowed - aspects: {{ .Values.passport.aspects }} + aspects: {{- toYaml .Values.passport.aspects | nindent 10 }} # -- configuration of the spring boot server server: # -- configuration of backend errors diff --git a/deployment/helm/digital-product-pass/templates/deployment.yaml b/deployment/helm/digital-product-pass/templates/deployment.yaml index 7b30dc10e..878639bd1 100644 --- a/deployment/helm/digital-product-pass/templates/deployment.yaml +++ b/deployment/helm/digital-product-pass/templates/deployment.yaml @@ -23,60 +23,68 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "digital-product-pass.fullname" . }} + name: {{ .Values.name }} labels: - {{- include "digital-product-pass.labels" . | nindent 4 }} + {{- include "chart.labels" . | nindent 4 }} + namespace: {{ .Values.namespace }} spec: {{- if not .Values.autoscaling.enabled }} replicas: {{ .Values.replicaCount }} {{- end }} selector: matchLabels: - {{- include "digital-product-pass.selectorLabels" . | nindent 6 }} + {{- include "chart.selectorLabels" . | nindent 6 }} + component: backend template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} labels: - {{- include "digital-product-pass.selectorLabels" . | nindent 8 }} + {{- include "chart.selectorLabels" . | nindent 8 }} + component: backend spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - serviceAccountName: {{ include "digital-product-pass.serviceAccountName" . }} + serviceAccountName: {{ include "chart.serviceAccountName" . }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: - - name: {{ .Chart.Name }} + - name: {{ .Values.name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} - env: + env: - name: "client.id" valueFrom: secretKeyRef: - key: clientId + key: clientId name: consumer-backend-oauth - name: "client.secret" valueFrom: secretKeyRef: - key: clientSecret + key: clientSecret name: consumer-backend-oauth - name: "edc.apiKey" valueFrom: secretKeyRef: - key: xApiKey + key: xApiKey name: consumer-edc - name: "edc.participantId" valueFrom: secretKeyRef: - key: participantId + key: participantId name: consumer-edc volumeMounts: - name: backend-config mountPath: /app/config - name: pvc-backend - mountPath: /app/data - subPath: data + mountPath: /app/data/process + subPath: data/process - name: pvc-backend mountPath: /app/log subPath: log diff --git a/deployment/helm/digital-product-pass/templates/ingress.yaml b/deployment/helm/digital-product-pass/templates/ingress.yaml index dbde39aa7..b02155bbb 100644 --- a/deployment/helm/digital-product-pass/templates/ingress.yaml +++ b/deployment/helm/digital-product-pass/templates/ingress.yaml @@ -21,7 +21,7 @@ ################################################################################# {{- if .Values.ingress.enabled -}} -{{- $fullName := include "digital-product-pass.fullname" . -}} +{{- $fullName := .Values.name -}} {{- $svcPort := .Values.service.port -}} {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} @@ -43,7 +43,7 @@ metadata: name: {{ $fullName }} namespace: {{ .Values.namespace }} labels: - {{- include "digital-product-pass.labels" . | nindent 4 }} + {{- include "chart.labels" . | nindent 4 }} {{- with .Values.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/deployment/helm/digital-product-pass/templates/service.yaml b/deployment/helm/digital-product-pass/templates/service.yaml index 89fad2414..0a094be7b 100644 --- a/deployment/helm/digital-product-pass/templates/service.yaml +++ b/deployment/helm/digital-product-pass/templates/service.yaml @@ -21,17 +21,26 @@ ################################################################################# apiVersion: v1 -kind: Service +kind: Secret metadata: - name: {{ include "digital-product-pass.fullname" . }} + name: avp-consumer-backend-cx-registry-auth labels: - {{- include "digital-product-pass.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: http - protocol: TCP - name: http - selector: - {{- include "digital-product-pass.selectorLabels" . | nindent 4 }} + {{- include "chart.labels" . | nindent 4 }} + namespace: {{ .Values.namespace }} +type: Opaque +stringData: + clientId: {{ .Values.oauth.techUser.clientId }} + clientSecret: {{ .Values.oauth.techUser.clientSecret }} +--- + +apiVersion: v1 +kind: Secret +metadata: + name: avp-consumer-backend-edc-oauth + labels: + {{- include "chart.labels" . | nindent 4 }} + namespace: {{ .Values.namespace }} +type: Opaque +stringData: + xApiKey: {{ .Values.edc.xApiKey }} + participantId: {{ .Values.edc.participantId }} diff --git a/deployment/helm/digital-product-pass/templates/serviceaccount.yaml b/deployment/helm/digital-product-pass/templates/serviceaccount.yaml index 54af0f9c8..26a57fa86 100644 --- a/deployment/helm/digital-product-pass/templates/serviceaccount.yaml +++ b/deployment/helm/digital-product-pass/templates/serviceaccount.yaml @@ -1,32 +1,10 @@ -################################################################################# -# Catena-X - Product Passport Consumer Application -# -# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the -# License for the specific language govern in permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -################################################################################# - {{- if .Values.serviceAccount.create -}} apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "digital-product-pass.serviceAccountName" . }} + name: {{ include "chart.serviceAccountName" . }} labels: - {{- include "digital-product-pass.labels" . | nindent 4 }} + {{- include "chart.labels" . | nindent 4 }} {{- with .Values.serviceAccount.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/deployment/helm/digital-product-pass/templates/tests/test-connection.yaml b/deployment/helm/digital-product-pass/templates/tests/test-connection.yaml index 2fa5ecf30..4cb2c6e1a 100644 --- a/deployment/helm/digital-product-pass/templates/tests/test-connection.yaml +++ b/deployment/helm/digital-product-pass/templates/tests/test-connection.yaml @@ -1,4 +1,4 @@ -################################################################################# + ################################################################################# # Catena-X - Product Passport Consumer Application # # Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA @@ -23,16 +23,16 @@ apiVersion: v1 kind: Pod metadata: - name: "{{ include "digital-product-pass.fullname" . }}-test-connection" + name: dpp-test-connection labels: - {{- include "digital-product-pass.labels" . | nindent 4 }} + {{- include "chart.labels" . | nindent 4 }} annotations: "helm.sh/hook": test spec: containers: - - name: wget + - name: backend image: busybox command: ['/bin/sh','-c'] args: ["i=0; wget '{{ .Values.name }}:{{ .Values.service.port }}'/health -O /dev/null; while [ $i -ne 5 ]; do wget '{{ .Values.name }}:{{ .Values.service.port }}'/health -O /dev/null; sleep 6; i=$(($i+1)); done"] - # args: ['{{ include "digital-product-pass.fullname" . }}:{{ .Values.service.port }}'] restartPolicy: Never + diff --git a/deployment/helm/digital-product-pass/values-dev.yaml b/deployment/helm/digital-product-pass/values-dev.yaml new file mode 100644 index 000000000..25e4ee2be --- /dev/null +++ b/deployment/helm/digital-product-pass/values-dev.yaml @@ -0,0 +1,70 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +ingress: + enabled: true + # className: "nginx" + annotations: + ingressClassName: nginx + # kubernetes.io/tls-acme: "true" + nginx.ingress.kubernetes.io/force-ssl-redirect: "true" + nginx.ingress.kubernetes.io/ssl-passthrough: "false" + nginx.ingress.kubernetes.io/backend-protocol: "HTTP" + hosts: + - host: &hostname "materialpass.dev.demo.catena-x.net" + paths: + - path: / + pathType: Prefix + tls: + - secretName: tls-secret + hosts: + - *hostname + +edc: + xApiKey: + participantId: + endpoint: "materialpass.dev.demo.catena-x.net/consumer" + +hostname: *hostname + +securityCheck: + enabled: true + bpn: true + edc: true + +irs: + enabled: true + hostname: "materialpass-irs.dev.demo.catena-x.net" + +process: + encryptionKey: "" + +discovery: + hostname: "semantics.dev.demo.catena-x.net/discoveryfinder" + +oauth: + hostname: "centralidp.dev.demo.catena-x.net" + techUser: + clientId: + clientSecret: + realm: + appId: diff --git a/deployment/helm/digital-product-pass/values-int.yaml b/deployment/helm/digital-product-pass/values-int.yaml index 6708332cc..2b044ad98 100644 --- a/deployment/helm/digital-product-pass/values-int.yaml +++ b/deployment/helm/digital-product-pass/values-int.yaml @@ -19,7 +19,7 @@ # # SPDX-License-Identifier: Apache-2.0 ################################################################################# -fullname: "dpp-backend" + ingress: enabled: true # className: "nginx" @@ -38,64 +38,31 @@ ingress: - secretName: tls-secret hosts: - *hostname - edc: xApiKey: participantId: - endpoint: "https://materialpass.int.demo.catena-x.net/consumer" - management: "/management/v2" - catalog: "/catalog/request" - negotiation: "/contractnegotiations" - transfer: "/transferprocesses" - delay: 100 + endpoint: "materialpass.int.demo.catena-x.net/consumer" -oauth: - techUser: - clientId: - clientSecret: - realm: CX-Central - resource: Cl13-CX-Battery - tokenUri: "https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token" - userInfoUri: "https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/userinfo" - -url: *hostname - -serverPort: 8888 - logging: - level: - root: INFO - utils: INFO -maxRetries: 10 +hostname: *hostname securityCheck: enabled: true bpn: true edc: true + irs: - endpoint: "materialpass-irs.int.demo.catena-x.net" + enabled: true + hostname: "materialpass-irs.int.demo.catena-x.net" + process: encryptionKey: "" -passport: - aspects: - - "urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport" - - "urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass" - - "urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass" -digitalTwinRegistry: - url: "https://semantics.int.demo.catena-x.net/registry" - endpoints: - search: "/lookup/shells" - digitalTwin: "/shell-descriptors" - subModel: "/submodel-descriptors" - timeouts: - search: 10 - negotiation: 40 - transfer: 10 - digitalTwin: 20 - temporaryStorage: - enabled: true + discovery: - url: "https://semantics.int.demo.catena-x.net/discoveryfinder/api/v1.0/administration/connectors/discovery/search" - bpnDiscovery: - key: "manufacturerPartId" - path: "/api/v1.0/administration/connectors/bpnDiscovery/search" - edcDiscovery: - key: "bpn" + hostname: "semantics.int.demo.catena-x.net/discoveryfinder" + +oauth: + hostname: "centralidp.int.demo.catena-x.net" + techUser: + clientId: + clientSecret: + realm: + appId: diff --git a/deployment/helm/digital-product-pass/values.yaml b/deployment/helm/digital-product-pass/values.yaml index 3cd7d7783..ebfa01b5d 100644 --- a/deployment/helm/digital-product-pass/values.yaml +++ b/deployment/helm/digital-product-pass/values.yaml @@ -24,112 +24,78 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -name: "digital-product-pass" +name: "dpp-backend" replicaCount: 1 namespace: "" -fullname: "dpp-backend" image: repository: docker.io/tractusx/digital-product-pass-backend pullPolicy: Always - # -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) +# -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) imagePullSecrets: [] -serviceAccount: - # Specifies whether a service account should be created - create: true - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -# podAnnotations: {} - -podSecurityContext: - runAsUser: 10000 - fsGroup: 3000 - -securityContext: - readOnlyRootFilesystem: true - allowPrivilegeEscalation: false - runAsNonRoot: true - runAsUser: 10000 - runAsGroup: 3000 - 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 - port: 8888 +# -- [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 + port: 8888 - # -- ingress declaration to expose the dpp-backend service + +# -- ingress declaration to expose the dpp-backend service ingress: enabled: false - # className: "" - annotations: - ingressClassName: nginx - # kubernetes.io/tls-acme: "true" - nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - nginx.ingress.kubernetes.io/ssl-passthrough: "false" - nginx.ingress.kubernetes.io/backend-protocol: "HTTP" hosts: - host: &hostname "localhost" paths: - path: / pathType: Prefix - tls: [] # -- in this section we configure the values that are inserted as secrets in the backend edc: - # -- the secret to access the edc management API + # -- the secret for assesing the edc management API xApiKey: "" # -- BPN Number participantId: "" # -- edc consumer connection configuration endpoint: "" - management: "" - catalog: "" - negotiation: "" - transfer: "" + apis: + management: '/management/v2' + catalog: '/catalog/request' + negotiation: '/contractnegotiations' + transfer: '/transferprocesses' delay: 100 # -- Negotiation status Delay in milliseconds in between async requests [<= 500] -oauth: - # -- technical user credentials centrally managed by keycloak - # -- note: these credentials are required for the Discovery Finder, BPN Discovery and EDC Discovery services - techUser: - clientId: "" - clientSecret: "" - realm: CX-Central - resource: "" - tokenUri: "" - userInfoUri: "" - -# -- backend server url -url: *hostname - +# -- backend hostname (without protocol prefix [DEFAULT HTTPS] for security ) +hostname: *hostname # -- configuration of the spring boot server serverPort: 8888 + logging: level: # -- general logging level root: INFO # -- logging for the util components utils: INFO + # -- Provide your custom configuration here (this overrides the DPP backend spring application.yaml) # -- max retries for the backend services maxRetries: 5 -# -- security configuration + + # -- security configuration securityCheck: enabled: false bpn: false edc: false + # -- irs configuration irs: - endpoint: "" + enabled: false + hostname: "" + # -- digital twin registry configuration process: # -- unique sha512 hash key used for the passport encryption encryptionKey: "" + # -- passport data transfer configuration passport: # -- passport versions and aspects allowed @@ -137,10 +103,8 @@ passport: - "urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport" - "urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass" - "urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass" + digitalTwinRegistry: - # -- central digital twin registry url - url: "" - # -- decentral digital twin apis endpoints: search: "/lookup/shells" digitalTwin: "/shell-descriptors" @@ -154,10 +118,11 @@ digitalTwinRegistry: # -- temporary storage of dDTRs for optimization temporaryStorage: enabled: true + # -- discovery configuration discovery: # -- discovery finder configuration - url: "" + hostname: "" # -- bpn discovery configuration bpnDiscovery: key: "manufacturerPartId" @@ -166,6 +131,38 @@ discovery: edcDiscovery: key: "bpn" +# -- oauth configuration +oauth: + # -- url of the identity provider service + hostname: "" + # -- technical user keycloak central id credentials + # -- note: this credentials need to have access to the Discovery Finder, BPN Discovery and EDC Discovery + techUser: + clientId: "" + clientSecret: "" + realm: "" + appId: "" + onLoad: "login-required" + +podSecurityContext: + runAsUser: 10000 + fsGroup: 3000 + +securityContext: + readOnlyRootFilesystem: true + allowPrivilegeEscalation: false + runAsNonRoot: true + runAsUser: 10000 + runAsGroup: 3000 + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" # Following Catena-X Helm Best Practices @url: https://catenax-ng.github.io/docs/kubernetes-basics/helm # @url: https://cloud.google.com/blog/products/containers-kubernetes/kubernetes-best-practices-resource-requests-and-limits @@ -177,6 +174,15 @@ resources: cpu: 250m memory: 512Mi +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +podAnnotations: {} + # [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes nodeSelector: {} From b881fe119c9bc66253a3fbbb524b4181bfb1f5a3 Mon Sep 17 00:00:00 2001 From: Muhammad Saud Khan Date: Tue, 19 Dec 2023 15:53:27 +0100 Subject: [PATCH 03/11] chore: update readme --- .../helm/digital-product-pass/README.md | 79 ++++++++++++------- 1 file changed, 50 insertions(+), 29 deletions(-) diff --git a/deployment/helm/digital-product-pass/README.md b/deployment/helm/digital-product-pass/README.md index c038f05da..1a20e3710 100644 --- a/deployment/helm/digital-product-pass/README.md +++ b/deployment/helm/digital-product-pass/README.md @@ -1,6 +1,6 @@ # digital-product-pass -![Version: 1.3.1](https://img.shields.io/badge/Version-1.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.1](https://img.shields.io/badge/AppVersion-1.3.1-informational?style=flat-square) +![Version: 1.4.0](https://img.shields.io/badge/Version-1.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.0](https://img.shields.io/badge/AppVersion-1.4.0-informational?style=flat-square) A Helm chart for Tractus-X Digital Product Pass Kubernetes @@ -15,41 +15,62 @@ A Helm chart for Tractus-X Digital Product Pass Kubernetes | Key | Type | Default | Description | |-----|------|---------|-------------| | affinity | object | `{}` | | -| backend | object | `{"application":{"yml":"# -- spring boot configuration\nspring:\n name: \"Catena-X Product Passport Consumer Backend\"\n main:\n allow-bean-definition-overriding: true\n devtools:\n add-properties: false\n jackson:\n serialization:\n indent_output: true\nlogging:\n level:\n # -- general logging level\n root: INFO\n # -- logging for the util components\n utils: INFO\nconfiguration:\n # -- max retries for the backend services\n maxRetries: 5\n # -- keycloak configuration\n keycloak:\n realm: CX-Central\n resource: Cl13-CX-Battery\n tokenUri: 'https:///auth/realms//protocol/openid-connect/token'\n userInfoUri: 'https:///auth/realms//protocol/openid-connect/userinfo'\n # -- edc consumer connection configuration\n edc:\n endpoint: 'https://'\n management: '/management/v2'\n catalog: '/catalog/request'\n negotiation: '/contractnegotiations'\n transfer: '/transferprocesses'\n receiverEndpoint: 'https:///endpoint'\n delay: 100 # -- Negotiation status Delay in milliseconds in between async requests [<= 500]\n # -- security configuration\n security:\n check:\n enabled: false\n bpn: false\n edc: false\n # -- irs configuration\n irs:\n enabled: true # -- Enable search for children in the requests\n endpoint: \"https://\" # -- IRS endpoint\n paths:\n job: \"/irs/jobs\" # -- API path for calling in the IRS endpoints and staring/getting jobs\n tree:\n fileName: \"treeDataModel\" # -- Tree dataModel filename created in the processId directory\n indent: true # -- Indent tree file\n callbackUrl: \"https:///api/irs\" # -- Backend call back base url for the irs controller\n # -- digital twin registry configuration\n dtr:\n central: false\n # -- central digital twin registry url\n centralUrl: 'https://'\n # -- asset type to search for the registry in the edc\n assetType: 'data.core.digitalTwinRegistry'\n # -- submodel endpoint interface to search\n endpointInterface: 'SUBMODEL-3.0'\n # -- dsp endpoint key inside submodel body\n dspEndpointKey: 'dspEndpoint'\n # -- decentral digital twin apis\n decentralApis:\n search: \"/lookup/shells\"\n digitalTwin: \"/shell-descriptors\"\n subModel: \"/submodel-descriptors\"\n # -- timeouts for the digital twin registry async negotiation\n timeouts:\n search: 10\n negotiation: 40\n transfer: 10\n digitalTwin: 20\n # -- temporary storage of dDTRs for optimization\n temporaryStorage: true\n # -- discovery configuration\n discovery:\n # -- discovery finder configuration\n endpoint: \"https:///discoveryfinder/api/v1.0/administration/connectors/discovery/search\"\n # -- bpn discovery configuration\n bpn:\n key: \"manufacturerPartId\"\n searchPath: \"/api/v1.0/administration/connectors/bpnDiscovery/search\"\n timeout: 2000 # -- timeout in milliseconds for the bpn discovery APIs to respond\n # -- edc discovery configuration\n edc:\n key: \"bpn\"\n timeout: 2000 # -- timeout in milliseconds for the bpn discovery APIs to respond\n # -- process configuration\n process:\n # -- directory for storing the contract negotiation files\n dir: \"process\"\n # -- indent the process negotiation files\n indent: true\n # -- unique sha512 hash key used for the passport encryption\n signKey: \"\"\n # -- passport data transfer configuration\n passport:\n # -- configure the data transfer\n dataTransfer:\n # -- encrypt the passport when he arrives from the edc data plane\n encrypt: true\n # -- the indent from the passport\n indent: true\n # -- directory to store the passport when is not linked to a process\n dir: \"data/transfer\"\n # -- passport versions and aspects allowed\n aspects:\n - \"urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport\"\n - \"urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass\"\n# -- configuration of the spring boot server\nserver:\n # -- configuration of backend errors\n error:\n include-message: ALWAYS\n include-binding-errors: ALWAYS\n include-stacktrace: ON_PARAM\n include-exception: false\n # -- listening port for the backend\n port: 8888\n # -- maximum allowed connections\n tomcat:\n max-connections: 10000"},"edc":{"clientId":"","clientSecret":"","participantId":"","xApiKey":""},"image":{"pullPolicy":"Always","repository":"docker.io/tractusx/digital-product-pass-backend"},"imagePullSecrets":[],"ingress":{"enabled":false},"name":"dpp-backend","service":{"port":8888,"type":"ClusterIP"}}` | Backend configuration | -| backend.application | object | `{"yml":"# -- spring boot configuration\nspring:\n name: \"Catena-X Product Passport Consumer Backend\"\n main:\n allow-bean-definition-overriding: true\n devtools:\n add-properties: false\n jackson:\n serialization:\n indent_output: true\nlogging:\n level:\n # -- general logging level\n root: INFO\n # -- logging for the util components\n utils: INFO\nconfiguration:\n # -- max retries for the backend services\n maxRetries: 5\n # -- keycloak configuration\n keycloak:\n realm: CX-Central\n resource: Cl13-CX-Battery\n tokenUri: 'https:///auth/realms//protocol/openid-connect/token'\n userInfoUri: 'https:///auth/realms//protocol/openid-connect/userinfo'\n # -- edc consumer connection configuration\n edc:\n endpoint: 'https://'\n management: '/management/v2'\n catalog: '/catalog/request'\n negotiation: '/contractnegotiations'\n transfer: '/transferprocesses'\n receiverEndpoint: 'https:///endpoint'\n delay: 100 # -- Negotiation status Delay in milliseconds in between async requests [<= 500]\n # -- security configuration\n security:\n check:\n enabled: false\n bpn: false\n edc: false\n # -- irs configuration\n irs:\n enabled: true # -- Enable search for children in the requests\n endpoint: \"https://\" # -- IRS endpoint\n paths:\n job: \"/irs/jobs\" # -- API path for calling in the IRS endpoints and staring/getting jobs\n tree:\n fileName: \"treeDataModel\" # -- Tree dataModel filename created in the processId directory\n indent: true # -- Indent tree file\n callbackUrl: \"https:///api/irs\" # -- Backend call back base url for the irs controller\n # -- digital twin registry configuration\n dtr:\n central: false\n # -- central digital twin registry url\n centralUrl: 'https://'\n # -- asset type to search for the registry in the edc\n assetType: 'data.core.digitalTwinRegistry'\n # -- submodel endpoint interface to search\n endpointInterface: 'SUBMODEL-3.0'\n # -- dsp endpoint key inside submodel body\n dspEndpointKey: 'dspEndpoint'\n # -- decentral digital twin apis\n decentralApis:\n search: \"/lookup/shells\"\n digitalTwin: \"/shell-descriptors\"\n subModel: \"/submodel-descriptors\"\n # -- timeouts for the digital twin registry async negotiation\n timeouts:\n search: 10\n negotiation: 40\n transfer: 10\n digitalTwin: 20\n # -- temporary storage of dDTRs for optimization\n temporaryStorage: true\n # -- discovery configuration\n discovery:\n # -- discovery finder configuration\n endpoint: \"https:///discoveryfinder/api/v1.0/administration/connectors/discovery/search\"\n # -- bpn discovery configuration\n bpn:\n key: \"manufacturerPartId\"\n searchPath: \"/api/v1.0/administration/connectors/bpnDiscovery/search\"\n timeout: 2000 # -- timeout in milliseconds for the bpn discovery APIs to respond\n # -- edc discovery configuration\n edc:\n key: \"bpn\"\n timeout: 2000 # -- timeout in milliseconds for the bpn discovery APIs to respond\n # -- process configuration\n process:\n # -- directory for storing the contract negotiation files\n dir: \"process\"\n # -- indent the process negotiation files\n indent: true\n # -- unique sha512 hash key used for the passport encryption\n signKey: \"\"\n # -- passport data transfer configuration\n passport:\n # -- configure the data transfer\n dataTransfer:\n # -- encrypt the passport when he arrives from the edc data plane\n encrypt: true\n # -- the indent from the passport\n indent: true\n # -- directory to store the passport when is not linked to a process\n dir: \"data/transfer\"\n # -- passport versions and aspects allowed\n aspects:\n - \"urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport\"\n - \"urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass\"\n# -- configuration of the spring boot server\nserver:\n # -- configuration of backend errors\n error:\n include-message: ALWAYS\n include-binding-errors: ALWAYS\n include-stacktrace: ON_PARAM\n include-exception: false\n # -- listening port for the backend\n port: 8888\n # -- maximum allowed connections\n tomcat:\n max-connections: 10000"}` | specific backend and spring boot configurations | -| backend.edc | object | `{"clientId":"","clientSecret":"","participantId":"","xApiKey":""}` | in this section we configure the values that are inserted as secrets in the backend | -| backend.edc.clientId | string | `""` | note: this credentials need to have access to the Discovery Finder, BPN Discovery and EDC Discovery | -| backend.edc.participantId | string | `""` | BPN Number | -| backend.edc.xApiKey | string | `""` | the secret for assesing the edc management API | -| backend.imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) | -| backend.ingress | object | `{"enabled":false}` | ingress declaration to expose the dpp-backend service | -| backend.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 | -| frontend.image.pullPolicy | string | `"Always"` | | -| frontend.image.repository | string | `"docker.io/tractusx/digital-product-pass-frontend"` | | -| frontend.imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) | -| frontend.ingress | object | `{"enabled":false,"hosts":[]}` | ingress declaration to expose the dpp-frontend service | -| frontend.name | string | `"dpp-frontend"` | | -| frontend.productpass | object | `{"api":{"delay":1000,"max_retries":30,"timeout":90000},"backend_url":"","idp_url":"","irs":{"maxWaitingTime":30,"requestDelay":30000},"keycloak":{"clientId":"","onLoad":"login-required","realm":""}}` | product passport UI configuration | -| frontend.productpass.api | object | `{"delay":1000,"max_retries":30,"timeout":90000}` | api timeouts | -| frontend.productpass.api.delay | int | `1000` | delay from getting status | -| frontend.productpass.api.max_retries | int | `30` | max retries for getting status | -| frontend.productpass.api.timeout | int | `90000` | default timeout - 90 seconds in milliseconds | -| frontend.productpass.backend_url | string | `""` | url of the digital product pass backend service | -| frontend.productpass.idp_url | string | `""` | url of the identity provider service | -| frontend.productpass.irs | object | `{"maxWaitingTime":30,"requestDelay":30000}` | irs api timeouts | -| frontend.productpass.irs.maxWaitingTime | int | `30` | maximum waiting time to get the irs job status | -| frontend.productpass.irs.requestDelay | int | `30000` | request timeout delay | -| frontend.productpass.keycloak | object | `{"clientId":"","onLoad":"login-required","realm":""}` | keycloak specific configuration for frontend authentication | -| frontend.service.port | int | `8080` | | -| frontend.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 | -| name | string | `"digital-product-pass"` | | +| autoscaling.enabled | bool | `false` | | +| autoscaling.maxReplicas | int | `100` | | +| autoscaling.minReplicas | int | `1` | | +| autoscaling.targetCPUUtilizationPercentage | int | `80` | | +| digitalTwinRegistry.endpoints.digitalTwin | string | `"/shell-descriptors"` | | +| digitalTwinRegistry.endpoints.search | string | `"/lookup/shells"` | | +| digitalTwinRegistry.endpoints.subModel | string | `"/submodel-descriptors"` | | +| digitalTwinRegistry.temporaryStorage | object | `{"enabled":true}` | temporary storage of dDTRs for optimization | +| digitalTwinRegistry.timeouts | object | `{"digitalTwin":20,"negotiation":40,"search":10,"transfer":10}` | timeouts for the digital twin registry async negotiation | +| discovery | object | `{"bpnDiscovery":{"key":"manufacturerPartId","path":"/api/v1.0/administration/connectors/bpnDiscovery/search"},"edcDiscovery":{"key":"bpn"},"hostname":""}` | discovery configuration | +| discovery.bpnDiscovery | object | `{"key":"manufacturerPartId","path":"/api/v1.0/administration/connectors/bpnDiscovery/search"}` | bpn discovery configuration | +| discovery.edcDiscovery | object | `{"key":"bpn"}` | edc discovery configuration | +| discovery.hostname | string | `""` | discovery finder configuration | +| edc | object | `{"apis":{"catalog":"/catalog/request","management":"/management/v2","negotiation":"/contractnegotiations","transfer":"/transferprocesses"},"delay":100,"endpoint":"","participantId":"","xApiKey":""}` | in this section we configure the values that are inserted as secrets in the backend | +| edc.endpoint | string | `""` | edc consumer connection configuration | +| edc.participantId | string | `""` | BPN Number | +| edc.xApiKey | string | `""` | the secret for assesing the edc management API | +| hostname | string | `"localhost"` | backend hostname (without protocol prefix [DEFAULT HTTPS] for security ) | +| image.pullPolicy | string | `"Always"` | | +| image.repository | string | `"docker.io/tractusx/digital-product-pass-backend"` | | +| imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) | +| ingress | object | `{"enabled":false,"hosts":[{"host":"localhost","paths":[{"path":"/","pathType":"Prefix"}]}]}` | ingress declaration to expose the dpp-backend service | +| irs | object | `{"enabled":false,"hostname":""}` | irs configuration | +| logging.level.root | string | `"INFO"` | general logging level | +| logging.level.utils | string | `"INFO"` | logging for the util components | +| maxRetries | int | `5` | max retries for the backend services | +| name | string | `"dpp-backend"` | | | namespace | string | `""` | | | nodeSelector | object | `{}` | | +| oauth | object | `{"appId":"","hostname":"","onLoad":"login-required","realm":"","techUser":{"clientId":"","clientSecret":""}}` | oauth configuration | +| oauth.hostname | string | `""` | url of the identity provider service | +| oauth.techUser | object | `{"clientId":"","clientSecret":""}` | note: this credentials need to have access to the Discovery Finder, BPN Discovery and EDC Discovery | +| passport | object | `{"aspects":["urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport","urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass","urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass"]}` | passport data transfer configuration | +| passport.aspects | list | `["urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport","urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass","urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass"]` | passport versions and aspects allowed | +| podAnnotations | object | `{}` | | +| podSecurityContext.fsGroup | int | `3000` | | +| podSecurityContext.runAsUser | int | `10000` | | +| process | object | `{"encryptionKey":""}` | digital twin registry configuration | +| process.encryptionKey | string | `""` | unique sha512 hash key used for the passport encryption | | replicaCount | int | `1` | | | resources.limits.cpu | string | `"500m"` | | | resources.limits.memory | string | `"512Mi"` | | | resources.requests.cpu | string | `"250m"` | | | resources.requests.memory | string | `"512Mi"` | | +| securityCheck | object | `{"bpn":false,"edc":false,"enabled":false}` | security configuration | +| securityContext.allowPrivilegeEscalation | bool | `false` | | +| securityContext.readOnlyRootFilesystem | bool | `true` | | +| securityContext.runAsGroup | int | `3000` | | +| securityContext.runAsNonRoot | bool | `true` | | +| securityContext.runAsUser | int | `10000` | | +| serverPort | int | `8888` | configuration of the spring boot server | +| service.port | int | `8888` | | +| 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 | +| serviceAccount.annotations | object | `{}` | | +| serviceAccount.create | bool | `true` | | +| serviceAccount.name | string | `""` | | | tolerations | list | `[]` | | ---------------------------------------------- From 75bd7eeb13bc6a2e67728e4635d3b7f0de2ff380 Mon Sep 17 00:00:00 2001 From: Muhammad Saud Khan Date: Tue, 19 Dec 2023 17:46:33 +0100 Subject: [PATCH 04/11] chore: relocate dpp helm chart --- .../digital-product-pass/.helmignore | 0 .../digital-product-pass/Chart.yaml | 0 .../helm-chart}/digital-product-pass/LICENSE | 0 .../digital-product-pass/README.md | 44 +++++++++++++++++-- .../digital-product-pass/templates/NOTES.txt | 0 .../templates/_helpers.tpl | 0 .../templates/configmap.yaml | 0 .../templates/deployment.yaml | 0 .../templates/ingress.yaml | 0 .../templates/pvc-data.yaml | 0 .../templates/secret.yaml | 0 .../templates/service.yaml | 0 .../templates/serviceaccount.yaml | 0 .../templates/tests/test-connection.yaml | 0 .../digital-product-pass/values-dev.yaml | 0 .../digital-product-pass/values-int.yaml | 0 .../digital-product-pass/values.yaml | 0 17 files changed, 41 insertions(+), 3 deletions(-) rename {deployment/helm => consumer-backend/helm-chart}/digital-product-pass/.helmignore (100%) rename {deployment/helm => consumer-backend/helm-chart}/digital-product-pass/Chart.yaml (100%) rename {deployment/helm => consumer-backend/helm-chart}/digital-product-pass/LICENSE (100%) rename {deployment/helm => consumer-backend/helm-chart}/digital-product-pass/README.md (85%) rename {deployment/helm => consumer-backend/helm-chart}/digital-product-pass/templates/NOTES.txt (100%) rename {deployment/helm => consumer-backend/helm-chart}/digital-product-pass/templates/_helpers.tpl (100%) rename {deployment/helm => consumer-backend/helm-chart}/digital-product-pass/templates/configmap.yaml (100%) rename {deployment/helm => consumer-backend/helm-chart}/digital-product-pass/templates/deployment.yaml (100%) rename {deployment/helm => consumer-backend/helm-chart}/digital-product-pass/templates/ingress.yaml (100%) rename {deployment/helm => consumer-backend/helm-chart}/digital-product-pass/templates/pvc-data.yaml (100%) rename {deployment/helm => consumer-backend/helm-chart}/digital-product-pass/templates/secret.yaml (100%) rename {deployment/helm => consumer-backend/helm-chart}/digital-product-pass/templates/service.yaml (100%) rename {deployment/helm => consumer-backend/helm-chart}/digital-product-pass/templates/serviceaccount.yaml (100%) rename {deployment/helm => consumer-backend/helm-chart}/digital-product-pass/templates/tests/test-connection.yaml (100%) rename {deployment/helm => consumer-backend/helm-chart}/digital-product-pass/values-dev.yaml (100%) rename {deployment/helm => consumer-backend/helm-chart}/digital-product-pass/values-int.yaml (100%) rename {deployment/helm => consumer-backend/helm-chart}/digital-product-pass/values.yaml (100%) diff --git a/deployment/helm/digital-product-pass/.helmignore b/consumer-backend/helm-chart/digital-product-pass/.helmignore similarity index 100% rename from deployment/helm/digital-product-pass/.helmignore rename to consumer-backend/helm-chart/digital-product-pass/.helmignore diff --git a/deployment/helm/digital-product-pass/Chart.yaml b/consumer-backend/helm-chart/digital-product-pass/Chart.yaml similarity index 100% rename from deployment/helm/digital-product-pass/Chart.yaml rename to consumer-backend/helm-chart/digital-product-pass/Chart.yaml diff --git a/deployment/helm/digital-product-pass/LICENSE b/consumer-backend/helm-chart/digital-product-pass/LICENSE similarity index 100% rename from deployment/helm/digital-product-pass/LICENSE rename to consumer-backend/helm-chart/digital-product-pass/LICENSE diff --git a/deployment/helm/digital-product-pass/README.md b/consumer-backend/helm-chart/digital-product-pass/README.md similarity index 85% rename from deployment/helm/digital-product-pass/README.md rename to consumer-backend/helm-chart/digital-product-pass/README.md index 1a20e3710..d714ec62f 100644 --- a/deployment/helm/digital-product-pass/README.md +++ b/consumer-backend/helm-chart/digital-product-pass/README.md @@ -1,14 +1,52 @@ -# digital-product-pass +# Digital-product-pass Backend ![Version: 1.4.0](https://img.shields.io/badge/Version-1.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.0](https://img.shields.io/badge/AppVersion-1.4.0-informational?style=flat-square) A Helm chart for Tractus-X Digital Product Pass Kubernetes -**Homepage:** +## TL;DR + +### Install + +```bash +cd consumer-backend/helm-chart/digital-product-pass +helm install digital-product-pass -f ./values.yaml -f ./values-int.yaml +``` + +> **NOTE**: This command will deploy the backend application. + +### Exposing ports + +Once the application is running, the certain ports need to be exposed to access the backend outside the Kubernetes cluster. + +### Get pod name +Search for the application name: + +```bash +kubectl get pods --no-headers | awk '{if ($1 ~ "dpp-backend-*") print $1}' +``` +Copy the pod name with the prefix `dpp-backend-*` + +### Port forwarding + +```bash +kubectl port-forward dpp-backend-* 8888:8888 +``` + +> **NOTE**: The default port set is `8888` however it can be changed in the configuration. + +### Check if the application is running + +Open the web browser with the following url to check the health status: +``` +localhost:8888/health +``` + +**Homepage:** ## Source Code -* +* ## Values diff --git a/deployment/helm/digital-product-pass/templates/NOTES.txt b/consumer-backend/helm-chart/digital-product-pass/templates/NOTES.txt similarity index 100% rename from deployment/helm/digital-product-pass/templates/NOTES.txt rename to consumer-backend/helm-chart/digital-product-pass/templates/NOTES.txt diff --git a/deployment/helm/digital-product-pass/templates/_helpers.tpl b/consumer-backend/helm-chart/digital-product-pass/templates/_helpers.tpl similarity index 100% rename from deployment/helm/digital-product-pass/templates/_helpers.tpl rename to consumer-backend/helm-chart/digital-product-pass/templates/_helpers.tpl diff --git a/deployment/helm/digital-product-pass/templates/configmap.yaml b/consumer-backend/helm-chart/digital-product-pass/templates/configmap.yaml similarity index 100% rename from deployment/helm/digital-product-pass/templates/configmap.yaml rename to consumer-backend/helm-chart/digital-product-pass/templates/configmap.yaml diff --git a/deployment/helm/digital-product-pass/templates/deployment.yaml b/consumer-backend/helm-chart/digital-product-pass/templates/deployment.yaml similarity index 100% rename from deployment/helm/digital-product-pass/templates/deployment.yaml rename to consumer-backend/helm-chart/digital-product-pass/templates/deployment.yaml diff --git a/deployment/helm/digital-product-pass/templates/ingress.yaml b/consumer-backend/helm-chart/digital-product-pass/templates/ingress.yaml similarity index 100% rename from deployment/helm/digital-product-pass/templates/ingress.yaml rename to consumer-backend/helm-chart/digital-product-pass/templates/ingress.yaml diff --git a/deployment/helm/digital-product-pass/templates/pvc-data.yaml b/consumer-backend/helm-chart/digital-product-pass/templates/pvc-data.yaml similarity index 100% rename from deployment/helm/digital-product-pass/templates/pvc-data.yaml rename to consumer-backend/helm-chart/digital-product-pass/templates/pvc-data.yaml diff --git a/deployment/helm/digital-product-pass/templates/secret.yaml b/consumer-backend/helm-chart/digital-product-pass/templates/secret.yaml similarity index 100% rename from deployment/helm/digital-product-pass/templates/secret.yaml rename to consumer-backend/helm-chart/digital-product-pass/templates/secret.yaml diff --git a/deployment/helm/digital-product-pass/templates/service.yaml b/consumer-backend/helm-chart/digital-product-pass/templates/service.yaml similarity index 100% rename from deployment/helm/digital-product-pass/templates/service.yaml rename to consumer-backend/helm-chart/digital-product-pass/templates/service.yaml diff --git a/deployment/helm/digital-product-pass/templates/serviceaccount.yaml b/consumer-backend/helm-chart/digital-product-pass/templates/serviceaccount.yaml similarity index 100% rename from deployment/helm/digital-product-pass/templates/serviceaccount.yaml rename to consumer-backend/helm-chart/digital-product-pass/templates/serviceaccount.yaml diff --git a/deployment/helm/digital-product-pass/templates/tests/test-connection.yaml b/consumer-backend/helm-chart/digital-product-pass/templates/tests/test-connection.yaml similarity index 100% rename from deployment/helm/digital-product-pass/templates/tests/test-connection.yaml rename to consumer-backend/helm-chart/digital-product-pass/templates/tests/test-connection.yaml diff --git a/deployment/helm/digital-product-pass/values-dev.yaml b/consumer-backend/helm-chart/digital-product-pass/values-dev.yaml similarity index 100% rename from deployment/helm/digital-product-pass/values-dev.yaml rename to consumer-backend/helm-chart/digital-product-pass/values-dev.yaml diff --git a/deployment/helm/digital-product-pass/values-int.yaml b/consumer-backend/helm-chart/digital-product-pass/values-int.yaml similarity index 100% rename from deployment/helm/digital-product-pass/values-int.yaml rename to consumer-backend/helm-chart/digital-product-pass/values-int.yaml diff --git a/deployment/helm/digital-product-pass/values.yaml b/consumer-backend/helm-chart/digital-product-pass/values.yaml similarity index 100% rename from deployment/helm/digital-product-pass/values.yaml rename to consumer-backend/helm-chart/digital-product-pass/values.yaml From 17c07ead0afe38922bf7c1901b1a561ed1ea81bd Mon Sep 17 00:00:00 2001 From: Mathias Moser <71728767+matbmoser@users.noreply.github.com> Date: Fri, 22 Dec 2023 17:03:52 +0100 Subject: [PATCH 05/11] feat: updated helm charts directory from backend of digital product pass --- .../digital-product-pass-backend/.helmignore | 26 +++ .../digital-product-pass-backend/Chart.yaml | 49 +++++ .../digital-product-pass-backend/LICENSE | 202 ++++++++++++++++++ .../digital-product-pass-backend/README.md | 115 ++++++++++ .../templates/NOTES.txt | 44 ++++ .../templates/_helpers.tpl | 84 ++++++++ .../templates/configmap.yaml | 148 +++++++++++++ .../templates/deployment.yaml | 128 +++++++++++ .../templates/ingress.yaml | 87 ++++++++ .../templates/pvc-data.yaml | 36 ++++ .../templates/secret.yaml | 47 ++++ .../templates/service.yaml | 46 ++++ .../templates/serviceaccount.yaml | 12 ++ .../templates/tests/test-connection.yaml | 38 ++++ .../values-dev.yaml | 74 +++++++ .../values-int.yaml | 72 +++++++ .../digital-product-pass-backend/values.yaml | 200 +++++++++++++++++ 17 files changed, 1408 insertions(+) create mode 100644 backend/charts/digital-product-pass-backend/.helmignore create mode 100644 backend/charts/digital-product-pass-backend/Chart.yaml create mode 100644 backend/charts/digital-product-pass-backend/LICENSE create mode 100644 backend/charts/digital-product-pass-backend/README.md create mode 100644 backend/charts/digital-product-pass-backend/templates/NOTES.txt create mode 100644 backend/charts/digital-product-pass-backend/templates/_helpers.tpl create mode 100644 backend/charts/digital-product-pass-backend/templates/configmap.yaml create mode 100644 backend/charts/digital-product-pass-backend/templates/deployment.yaml create mode 100644 backend/charts/digital-product-pass-backend/templates/ingress.yaml create mode 100644 backend/charts/digital-product-pass-backend/templates/pvc-data.yaml create mode 100644 backend/charts/digital-product-pass-backend/templates/secret.yaml create mode 100644 backend/charts/digital-product-pass-backend/templates/service.yaml create mode 100644 backend/charts/digital-product-pass-backend/templates/serviceaccount.yaml create mode 100644 backend/charts/digital-product-pass-backend/templates/tests/test-connection.yaml create mode 100644 backend/charts/digital-product-pass-backend/values-dev.yaml create mode 100644 backend/charts/digital-product-pass-backend/values-int.yaml create mode 100644 backend/charts/digital-product-pass-backend/values.yaml diff --git a/backend/charts/digital-product-pass-backend/.helmignore b/backend/charts/digital-product-pass-backend/.helmignore new file mode 100644 index 000000000..876f60bc4 --- /dev/null +++ b/backend/charts/digital-product-pass-backend/.helmignore @@ -0,0 +1,26 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ +# Accept only values.yaml +values?*.yaml +values?*.yml diff --git a/backend/charts/digital-product-pass-backend/Chart.yaml b/backend/charts/digital-product-pass-backend/Chart.yaml new file mode 100644 index 000000000..36015a71c --- /dev/null +++ b/backend/charts/digital-product-pass-backend/Chart.yaml @@ -0,0 +1,49 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# +--- +apiVersion: v2 +name: digital-product-pass +description: A Helm chart for Tractus-X Digital Product Pass Kubernetes +home: https://github.com/eclipse-tractusx/digital-product-pass/tree/main/charts/digital-product-pass +sources: + - https://github.com/eclipse-tractusx/digital-product-pass/tree/main/charts/digital-product-pass +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +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: 1.4.0 + +# 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: "1.4.0" diff --git a/backend/charts/digital-product-pass-backend/LICENSE b/backend/charts/digital-product-pass-backend/LICENSE new file mode 100644 index 000000000..c1e5cadd4 --- /dev/null +++ b/backend/charts/digital-product-pass-backend/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/backend/charts/digital-product-pass-backend/README.md b/backend/charts/digital-product-pass-backend/README.md new file mode 100644 index 000000000..d714ec62f --- /dev/null +++ b/backend/charts/digital-product-pass-backend/README.md @@ -0,0 +1,115 @@ +# Digital-product-pass Backend + +![Version: 1.4.0](https://img.shields.io/badge/Version-1.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.0](https://img.shields.io/badge/AppVersion-1.4.0-informational?style=flat-square) + +A Helm chart for Tractus-X Digital Product Pass Kubernetes + +## TL;DR + +### Install + +```bash +cd consumer-backend/helm-chart/digital-product-pass +helm install digital-product-pass -f ./values.yaml -f ./values-int.yaml +``` + +> **NOTE**: This command will deploy the backend application. + +### Exposing ports + +Once the application is running, the certain ports need to be exposed to access the backend outside the Kubernetes cluster. + +### Get pod name +Search for the application name: + +```bash +kubectl get pods --no-headers | awk '{if ($1 ~ "dpp-backend-*") print $1}' +``` +Copy the pod name with the prefix `dpp-backend-*` + +### Port forwarding + +```bash +kubectl port-forward dpp-backend-* 8888:8888 +``` + +> **NOTE**: The default port set is `8888` however it can be changed in the configuration. + +### Check if the application is running + +Open the web browser with the following url to check the health status: +``` +localhost:8888/health +``` + +**Homepage:** + +## Source Code + +* + +## Values + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| affinity | object | `{}` | | +| autoscaling.enabled | bool | `false` | | +| autoscaling.maxReplicas | int | `100` | | +| autoscaling.minReplicas | int | `1` | | +| autoscaling.targetCPUUtilizationPercentage | int | `80` | | +| digitalTwinRegistry.endpoints.digitalTwin | string | `"/shell-descriptors"` | | +| digitalTwinRegistry.endpoints.search | string | `"/lookup/shells"` | | +| digitalTwinRegistry.endpoints.subModel | string | `"/submodel-descriptors"` | | +| digitalTwinRegistry.temporaryStorage | object | `{"enabled":true}` | temporary storage of dDTRs for optimization | +| digitalTwinRegistry.timeouts | object | `{"digitalTwin":20,"negotiation":40,"search":10,"transfer":10}` | timeouts for the digital twin registry async negotiation | +| discovery | object | `{"bpnDiscovery":{"key":"manufacturerPartId","path":"/api/v1.0/administration/connectors/bpnDiscovery/search"},"edcDiscovery":{"key":"bpn"},"hostname":""}` | discovery configuration | +| discovery.bpnDiscovery | object | `{"key":"manufacturerPartId","path":"/api/v1.0/administration/connectors/bpnDiscovery/search"}` | bpn discovery configuration | +| discovery.edcDiscovery | object | `{"key":"bpn"}` | edc discovery configuration | +| discovery.hostname | string | `""` | discovery finder configuration | +| edc | object | `{"apis":{"catalog":"/catalog/request","management":"/management/v2","negotiation":"/contractnegotiations","transfer":"/transferprocesses"},"delay":100,"endpoint":"","participantId":"","xApiKey":""}` | in this section we configure the values that are inserted as secrets in the backend | +| edc.endpoint | string | `""` | edc consumer connection configuration | +| edc.participantId | string | `""` | BPN Number | +| edc.xApiKey | string | `""` | the secret for assesing the edc management API | +| hostname | string | `"localhost"` | backend hostname (without protocol prefix [DEFAULT HTTPS] for security ) | +| image.pullPolicy | string | `"Always"` | | +| image.repository | string | `"docker.io/tractusx/digital-product-pass-backend"` | | +| imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) | +| ingress | object | `{"enabled":false,"hosts":[{"host":"localhost","paths":[{"path":"/","pathType":"Prefix"}]}]}` | ingress declaration to expose the dpp-backend service | +| irs | object | `{"enabled":false,"hostname":""}` | irs configuration | +| logging.level.root | string | `"INFO"` | general logging level | +| logging.level.utils | string | `"INFO"` | logging for the util components | +| maxRetries | int | `5` | max retries for the backend services | +| name | string | `"dpp-backend"` | | +| namespace | string | `""` | | +| nodeSelector | object | `{}` | | +| oauth | object | `{"appId":"","hostname":"","onLoad":"login-required","realm":"","techUser":{"clientId":"","clientSecret":""}}` | oauth configuration | +| oauth.hostname | string | `""` | url of the identity provider service | +| oauth.techUser | object | `{"clientId":"","clientSecret":""}` | note: this credentials need to have access to the Discovery Finder, BPN Discovery and EDC Discovery | +| passport | object | `{"aspects":["urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport","urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass","urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass"]}` | passport data transfer configuration | +| passport.aspects | list | `["urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport","urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass","urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass"]` | passport versions and aspects allowed | +| podAnnotations | object | `{}` | | +| podSecurityContext.fsGroup | int | `3000` | | +| podSecurityContext.runAsUser | int | `10000` | | +| process | object | `{"encryptionKey":""}` | digital twin registry configuration | +| process.encryptionKey | string | `""` | unique sha512 hash key used for the passport encryption | +| replicaCount | int | `1` | | +| resources.limits.cpu | string | `"500m"` | | +| resources.limits.memory | string | `"512Mi"` | | +| resources.requests.cpu | string | `"250m"` | | +| resources.requests.memory | string | `"512Mi"` | | +| securityCheck | object | `{"bpn":false,"edc":false,"enabled":false}` | security configuration | +| securityContext.allowPrivilegeEscalation | bool | `false` | | +| securityContext.readOnlyRootFilesystem | bool | `true` | | +| securityContext.runAsGroup | int | `3000` | | +| securityContext.runAsNonRoot | bool | `true` | | +| securityContext.runAsUser | int | `10000` | | +| serverPort | int | `8888` | configuration of the spring boot server | +| service.port | int | `8888` | | +| 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 | +| serviceAccount.annotations | object | `{}` | | +| serviceAccount.create | bool | `true` | | +| serviceAccount.name | string | `""` | | +| tolerations | list | `[]` | | + +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) diff --git a/backend/charts/digital-product-pass-backend/templates/NOTES.txt b/backend/charts/digital-product-pass-backend/templates/NOTES.txt new file mode 100644 index 000000000..8b4cbc0c3 --- /dev/null +++ b/backend/charts/digital-product-pass-backend/templates/NOTES.txt @@ -0,0 +1,44 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "digital-product-pass.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "digital-product-pass.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "digital-product-pass.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "digital-product-pass.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/backend/charts/digital-product-pass-backend/templates/_helpers.tpl b/backend/charts/digital-product-pass-backend/templates/_helpers.tpl new file mode 100644 index 000000000..8394da30e --- /dev/null +++ b/backend/charts/digital-product-pass-backend/templates/_helpers.tpl @@ -0,0 +1,84 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +#################################################################################e governing permissions and + +{{/* +Expand the name of the chart. +*/}} +{{- define "chart.name" -}} +{{- default .Chart.Name .Values.name | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "chart.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.name }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "chart.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "chart.labels" -}} +helm.sh/chart: {{ include "chart.chart" . }} +{{ include "chart.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "chart.selectorLabels" -}} +app.kubernetes.io/name: {{ include "chart.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "chart.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "chart.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/backend/charts/digital-product-pass-backend/templates/configmap.yaml b/backend/charts/digital-product-pass-backend/templates/configmap.yaml new file mode 100644 index 000000000..02b71db8f --- /dev/null +++ b/backend/charts/digital-product-pass-backend/templates/configmap.yaml @@ -0,0 +1,148 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +apiVersion: v1 +kind: ConfigMap +metadata: + name: backend-config + namespace: {{ .Values.namespace }} +data: + application.yaml: |- + spring: + name: "Digital Product Passport Consumer Backend" + main: + allow-bean-definition-overriding: true + devtools: + add-properties: false + jackson: + serialization: + indent_output: true + logging: + level: + # -- general logging level + root: {{ tpl (.Values.logging.level.root | default "INFO") . | quote }} + # -- logging for the util components + utils: {{ tpl (.Values.logging.level.utils | default "INFO") . | quote }} + + configuration: + # -- max retries for the backend services + maxRetries: {{ .Values.maxRetries }} + # -- keycloak configuration + keycloak: + realm: {{ .Values.oauth.realm }} + resource: {{ .Values.oauth.appId }} + tokenUri: "https://{{ tpl (.Values.oauth.hostname | default "http://localhost") . }}/auth/realms/{{ .Values.oauth.realm }}/protocol/openid-connect/token" + userInfoUri: "https://{{ tpl (.Values.oauth.hostname | default "http://localhost") . }}/auth/realms/{{ .Values.oauth.realm }}/protocol/openid-connect/userinfo" + # -- edc consumer connection configuration + edc: + endpoint: "https://{{ .Values.edc.hostname }}" + management: {{ .Values.edc.apis.management }} + catalog: {{ .Values.edc.apis.catalog }} + negotiation: {{ .Values.edc.apis.negotiation }} + transfer: {{ .Values.edc.apis.transfer }} + receiverEndpoint: "https://{{ .Values.hostname }}/endpoint" + delay: {{ .Values.edc.delay }} # -- Negotiation status Delay in milliseconds in between async requests [<= 500] + # -- security configuration + security: + # -- authorization configuration about bpn and role checks + authorization: + bpnAuth: {{ .Values.oauth.bpnCheck.enabled }} + roleAuth: {{ .Values.oauth.roleCheck.enabled }} + # -- checkups done in the startup + startUpChecks: + bpnCheck: {{ .Values.securityCheck.bpn }} + edcCheck: {{ .Values.securityCheck.edc }} + # -- irs configuration + irs: + enabled: {{ .Values.irs.enabled }} # -- Enable search for children in the requests + endpoint: "https://{{ .Values.irs.hostname }}" # -- IRS endpoint + paths: + job: "/irs/jobs" # -- API path for calling in the IRS endpoints and staring/getting jobs + tree: + fileName: "treeDataModel" # -- Tree dataModel filename created in the processId directory + indent: true # -- Indent tree file + callbackUrl: "https://{{ .Values.hostname }}/api/irs" # -- Backend call back base url for the irs controller + # -- digital twin registry configuration + dtr: + # -- asset type to search for the registry in the edc + assetType: 'data.core.digitalTwinRegistry' + # -- submodel endpoint interface to search + endpointInterface: 'SUBMODEL-3.0' + # -- dsp endpoint key inside submodel body + dspEndpointKey: 'dspEndpoint' + # -- decentral digital twin apis + decentralApis: + search: {{ .Values.digitalTwinRegistry.endpoints.search }} + digitalTwin: {{ .Values.digitalTwinRegistry.endpoints.digitalTwin }} + subModel: {{ .Values.digitalTwinRegistry.endpoints.subModel }} + # -- timeouts for the digital twin registry async negotiation + timeouts: + search: {{ .Values.digitalTwinRegistry.timeouts.search }} + negotiation: {{ .Values.digitalTwinRegistry.timeouts.negotiation }} + transfer: {{ .Values.digitalTwinRegistry.timeouts.transfer }} + digitalTwin: {{ .Values.digitalTwinRegistry.timeouts.digitalTwin }} + # -- temporary storage of dDTRs for optimization + temporaryStorage: {{ .Values.digitalTwinRegistry.temporaryStorage.enabled }} + # -- discovery configuration + discovery: + # -- discovery finder configuration + endpoint: "https://{{ tpl (.Values.discovery.hostname | default "") . }}/api/v1.0/administration/connectors/discovery/search" + # -- bpn discovery configuration + bpn: + key: {{ tpl (.Values.discovery.bpnDiscovery.key | default "manufacturerPartId") . | quote }} + searchPath: {{ tpl (.Values.discovery.bpnDiscovery.path | default "") . | quote }} + # -- edc discovery configuration + edc: + key: {{ tpl (.Values.discovery.edcDiscovery.key | default "bpn") . | quote }} + # -- process configuration + process: + # -- directory for storing the contract negotiation files + dir: "process" + # -- indent the process negotiation files + indent: true + # -- unique sha512 hash key used for the passport encryption + signKey: {{ tpl (.Values.process.encryptionKey | default "") . | quote }} + # -- passport data transfer configuration + passport: + # -- configure the data transfer + dataTransfer: + # -- encrypt the passport when he arrives from the edc data plane + encrypt: true + # -- the indent from the passport + indent: true + # -- directory to store the passport when is not linked to a process + dir: "data/transfer" + # -- passport versions and aspects allowed + aspects: {{- toYaml .Values.passport.aspects | nindent 10 }} + # -- configuration of the spring boot server + server: + # -- configuration of backend errors + error: + include-message: ALWAYS + include-binding-errors: ALWAYS + include-stacktrace: ON_PARAM + include-exception: false + # -- listening port for the backend + port: {{ .Values.serverPort }} + # -- maximum allowed connections + tomcat: + max-connections: 10000 diff --git a/backend/charts/digital-product-pass-backend/templates/deployment.yaml b/backend/charts/digital-product-pass-backend/templates/deployment.yaml new file mode 100644 index 000000000..52e47715c --- /dev/null +++ b/backend/charts/digital-product-pass-backend/templates/deployment.yaml @@ -0,0 +1,128 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Values.name }} + labels: + {{- include "chart.labels" . | nindent 4 }} + namespace: {{ .Values.namespace }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "chart.selectorLabels" . | nindent 6 }} + component: backend + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "chart.selectorLabels" . | nindent 8 }} + component: backend + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "chart.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Values.name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + env: + - name: "appId" + valueFrom: + secretKeyRef: + key: appId + name: avp-consumer-backend-oauth + - name: "client.id" + valueFrom: + secretKeyRef: + key: clientId + name: consumer-backend-oauth + - name: "client.secret" + valueFrom: + secretKeyRef: + key: clientSecret + name: consumer-backend-oauth + - name: "edc.apiKey" + valueFrom: + secretKeyRef: + key: xApiKey + name: consumer-edc + - name: "edc.participantId" + valueFrom: + secretKeyRef: + key: participantId + name: consumer-edc + volumeMounts: + - name: backend-config + mountPath: /app/config + - name: pvc-backend + mountPath: /app/data/process + subPath: data/process + - name: pvc-backend + mountPath: /app/log + subPath: log + ports: + - name: http + containerPort: 8888 + protocol: TCP + livenessProbe: + httpGet: + path: /health + port: http + readinessProbe: + httpGet: + path: /health + port: http + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + volumes: + - name: backend-config + configMap: + name: backend-config + - name: pvc-backend + persistentVolumeClaim: + claimName: pvc-data diff --git a/backend/charts/digital-product-pass-backend/templates/ingress.yaml b/backend/charts/digital-product-pass-backend/templates/ingress.yaml new file mode 100644 index 000000000..b02155bbb --- /dev/null +++ b/backend/charts/digital-product-pass-backend/templates/ingress.yaml @@ -0,0 +1,87 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +{{- if .Values.ingress.enabled -}} +{{- $fullName := .Values.name -}} +{{- $svcPort := .Values.service.port -}} +{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} + {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} + {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} + {{- end }} +{{- end }} + +# {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +# apiVersion: networking.k8s.io/v1 +# {{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +# apiVersion: networking.k8s.io/v1beta1 +# {{- else -}} +# apiVersion: extensions/v1beta1 +# {{- end }} + +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ $fullName }} + namespace: {{ .Values.namespace }} + labels: + {{- include "chart.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} diff --git a/backend/charts/digital-product-pass-backend/templates/pvc-data.yaml b/backend/charts/digital-product-pass-backend/templates/pvc-data.yaml new file mode 100644 index 000000000..b023691ae --- /dev/null +++ b/backend/charts/digital-product-pass-backend/templates/pvc-data.yaml @@ -0,0 +1,36 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: pvc-data + labels: + {{- include "chart.labels" . | nindent 4 }} + namespace: {{ .Values.namespace }} +spec: + storageClassName: default + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 1Gi diff --git a/backend/charts/digital-product-pass-backend/templates/secret.yaml b/backend/charts/digital-product-pass-backend/templates/secret.yaml new file mode 100644 index 000000000..c0a302ec2 --- /dev/null +++ b/backend/charts/digital-product-pass-backend/templates/secret.yaml @@ -0,0 +1,47 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +apiVersion: v1 +kind: Secret +metadata: + name: consumer-backend-oauth + labels: + {{- include "chart.labels" . | nindent 4 }} + namespace: {{ .Values.namespace }} +type: Opaque +stringData: + appId: {{ .Values.oauth.appId }} + clientId: {{ .Values.oauth.techUser.clientId }} + clientSecret: {{ .Values.oauth.techUser.clientSecret }} +--- + +apiVersion: v1 +kind: Secret +metadata: + name: consumer-edc + labels: + {{- include "chart.labels" . | nindent 4 }} + namespace: {{ .Values.namespace }} +type: Opaque +stringData: + xApiKey: {{ .Values.edc.xApiKey }} + participantId: {{ .Values.edc.participantId }} diff --git a/backend/charts/digital-product-pass-backend/templates/service.yaml b/backend/charts/digital-product-pass-backend/templates/service.yaml new file mode 100644 index 000000000..0a094be7b --- /dev/null +++ b/backend/charts/digital-product-pass-backend/templates/service.yaml @@ -0,0 +1,46 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +apiVersion: v1 +kind: Secret +metadata: + name: avp-consumer-backend-cx-registry-auth + labels: + {{- include "chart.labels" . | nindent 4 }} + namespace: {{ .Values.namespace }} +type: Opaque +stringData: + clientId: {{ .Values.oauth.techUser.clientId }} + clientSecret: {{ .Values.oauth.techUser.clientSecret }} +--- + +apiVersion: v1 +kind: Secret +metadata: + name: avp-consumer-backend-edc-oauth + labels: + {{- include "chart.labels" . | nindent 4 }} + namespace: {{ .Values.namespace }} +type: Opaque +stringData: + xApiKey: {{ .Values.edc.xApiKey }} + participantId: {{ .Values.edc.participantId }} diff --git a/backend/charts/digital-product-pass-backend/templates/serviceaccount.yaml b/backend/charts/digital-product-pass-backend/templates/serviceaccount.yaml new file mode 100644 index 000000000..26a57fa86 --- /dev/null +++ b/backend/charts/digital-product-pass-backend/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "chart.serviceAccountName" . }} + labels: + {{- include "chart.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/backend/charts/digital-product-pass-backend/templates/tests/test-connection.yaml b/backend/charts/digital-product-pass-backend/templates/tests/test-connection.yaml new file mode 100644 index 000000000..4cb2c6e1a --- /dev/null +++ b/backend/charts/digital-product-pass-backend/templates/tests/test-connection.yaml @@ -0,0 +1,38 @@ + ################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +apiVersion: v1 +kind: Pod +metadata: + name: dpp-test-connection + labels: + {{- include "chart.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: backend + image: busybox + command: ['/bin/sh','-c'] + args: ["i=0; wget '{{ .Values.name }}:{{ .Values.service.port }}'/health -O /dev/null; while [ $i -ne 5 ]; do wget '{{ .Values.name }}:{{ .Values.service.port }}'/health -O /dev/null; sleep 6; i=$(($i+1)); done"] + restartPolicy: Never + diff --git a/backend/charts/digital-product-pass-backend/values-dev.yaml b/backend/charts/digital-product-pass-backend/values-dev.yaml new file mode 100644 index 000000000..376d92afd --- /dev/null +++ b/backend/charts/digital-product-pass-backend/values-dev.yaml @@ -0,0 +1,74 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +ingress: + enabled: true + # className: "nginx" + annotations: + ingressClassName: nginx + # kubernetes.io/tls-acme: "true" + nginx.ingress.kubernetes.io/force-ssl-redirect: "true" + nginx.ingress.kubernetes.io/ssl-passthrough: "false" + nginx.ingress.kubernetes.io/backend-protocol: "HTTP" + hosts: + - host: &hostname "dpp-backend.dev.demo.catena-x.net" + paths: + - path: / + pathType: Prefix + tls: + - secretName: tls-secret + hosts: + - *hostname + +edc: + xApiKey: + participantId: + endpoint: "materialpass.dev.demo.catena-x.net/consumer" + +hostname: *hostname + +securityCheck: + bpn: true + edc: true + +irs: + enabled: true + hostname: "materialpass-irs.dev.demo.catena-x.net" + +process: + encryptionKey: "" + +discovery: + hostname: "semantics.dev.demo.catena-x.net/discoveryfinder" + +oauth: + hostname: "centralidp.int.demo.catena-x.net" + techUser: + clientId: + clientSecret: + realm: + appId: + bpnCheck: + enabled: true + bpn: *bpn + roleCheck: + enabled: false diff --git a/backend/charts/digital-product-pass-backend/values-int.yaml b/backend/charts/digital-product-pass-backend/values-int.yaml new file mode 100644 index 000000000..cdc681664 --- /dev/null +++ b/backend/charts/digital-product-pass-backend/values-int.yaml @@ -0,0 +1,72 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +ingress: + enabled: true + # className: "nginx" + annotations: + ingressClassName: nginx + # kubernetes.io/tls-acme: "true" + nginx.ingress.kubernetes.io/force-ssl-redirect: "true" + nginx.ingress.kubernetes.io/ssl-passthrough: "false" + nginx.ingress.kubernetes.io/backend-protocol: "HTTP" + hosts: + - host: &hostname "dpp-backend.int.demo.catena-x.net" + paths: + - path: / + pathType: Prefix + tls: + - secretName: tls-secret + hosts: + - *hostname +edc: + xApiKey: + participantId: + endpoint: "materialpass.int.demo.catena-x.net/consumer" + +hostname: *hostname +securityCheck: + bpn: true + edc: true + +irs: + enabled: true + hostname: "materialpass-irs.int.demo.catena-x.net" + +process: + encryptionKey: "" + +discovery: + hostname: "semantics.int.demo.catena-x.net/discoveryfinder" + +oauth: + hostname: "centralidp.int.demo.catena-x.net" + techUser: + clientId: + clientSecret: + realm: + appId: + bpnCheck: + enabled: true + bpn: *bpn + roleCheck: + enabled: false diff --git a/backend/charts/digital-product-pass-backend/values.yaml b/backend/charts/digital-product-pass-backend/values.yaml new file mode 100644 index 000000000..799c025b5 --- /dev/null +++ b/backend/charts/digital-product-pass-backend/values.yaml @@ -0,0 +1,200 @@ +################################################################################# +# Catena-X - Product Passport Consumer Application +# +# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +# either express or implied. See the +# License for the specific language govern in permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +################################################################################# + +# Default values for dpp-frontend. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +name: "dpp-backend" +replicaCount: 1 +namespace: "" + +image: + repository: docker.io/tractusx/digital-product-pass-backend + pullPolicy: Always +# -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) +imagePullSecrets: [] + +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 + port: 8888 + + +# -- ingress declaration to expose the dpp-backend service +ingress: + enabled: false + hosts: + - host: &hostname "localhost" + paths: + - path: / + pathType: Prefix + +# -- in this section we configure the values that are inserted as secrets in the backend +edc: + # -- the secret for assesing the edc management API + xApiKey: "" + # -- BPN Number + participantId: "" + # -- edc consumer connection configuration + endpoint: "" + apis: + management: '/management/v2' + catalog: '/catalog/request' + negotiation: '/contractnegotiations' + transfer: '/transferprocesses' + delay: 100 # -- Negotiation status Delay in milliseconds in between async requests [<= 500] + +# -- backend hostname (without protocol prefix [DEFAULT HTTPS] for security ) +hostname: *hostname +# -- configuration of the spring boot server +serverPort: 8888 + +logging: + level: + # -- general logging level + root: INFO + # -- logging for the util components + utils: INFO + +# -- Provide your custom configuration here (this overrides the DPP backend spring application.yaml) +# -- max retries for the backend services +maxRetries: 5 + + # -- security configuration +securityCheck: + bpn: false + edc: false + +# -- irs configuration +irs: + enabled: false + hostname: "" + +# -- digital twin registry configuration +process: + # -- unique sha512 hash key used for the passport encryption + encryptionKey: "" + +# -- passport data transfer configuration +passport: + # -- passport versions and aspects allowed + aspects: + - "urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport" + - "urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass" + - "urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass" + +digitalTwinRegistry: + endpoints: + search: "/lookup/shells" + digitalTwin: "/shell-descriptors" + subModel: "/submodel-descriptors" + # -- timeouts for the digital twin registry async negotiation + timeouts: + search: 10 + negotiation: 40 + transfer: 10 + digitalTwin: 20 + # -- temporary storage of dDTRs for optimization + temporaryStorage: + enabled: true + +# -- discovery configuration +discovery: + # -- discovery finder configuration + hostname: "" + # -- bpn discovery configuration + bpnDiscovery: + key: "manufacturerPartId" + path: "/api/v1.0/administration/connectors/bpnDiscovery/search" + # -- edc discovery configuration + edcDiscovery: + key: "bpn" + +# -- oauth configuration +oauth: + # -- url of the identity provider service + hostname: "" + # -- technical user keycloak central id credentials + # -- note: this credentials need to have access to the Discovery Finder, BPN Discovery and EDC Discovery + techUser: + clientId: "" + clientSecret: "" + realm: "" + appId: "" + onLoad: "login-required" + # -- configure here the bpn check for the application + bpnCheck: + enabled: false + # -- this bpn needs to be included in the user login information when the check is enabled + bpn: *bpn + # -- the role check checks if the user has access roles for the appId + roleCheck: + enabled: false + +podSecurityContext: + runAsUser: 10000 + fsGroup: 3000 + +securityContext: + readOnlyRootFilesystem: true + allowPrivilegeEscalation: false + runAsNonRoot: true + runAsUser: 10000 + runAsGroup: 3000 + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +# Following Catena-X Helm Best Practices @url: https://catenax-ng.github.io/docs/kubernetes-basics/helm +# @url: https://cloud.google.com/blog/products/containers-kubernetes/kubernetes-best-practices-resource-requests-and-limits +resources: + limits: + cpu: 500m + memory: 512Mi + requests: + cpu: 250m + memory: 512Mi + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +podAnnotations: {} + +# [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes +nodeSelector: {} + +# [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes +tolerations: [] + +# [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on +affinity: {} From 6778d50841972197ca90120ebb8fbf64f9388df9 Mon Sep 17 00:00:00 2001 From: Mathias Moser <71728767+matbmoser@users.noreply.github.com> Date: Fri, 22 Dec 2023 17:07:41 +0100 Subject: [PATCH 06/11] chore: updated to version v2.0.0 --- README.md | 8 ++++---- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 61059ea64..7d82ae748 100644 --- a/README.md +++ b/README.md @@ -35,9 +35,9 @@ In particular, the appliction is used to access the battery passport data provid ### Software Version #### Helm Chart Version -
1.3.1
+
2.0.0
#### Application Version -
v1.3.1
+
v2.0.0
## Application Preview @@ -56,7 +56,7 @@ To get started you can have a look into our documentation: | ---------------------------------------------------------------- |-------------------------------------------------------------------------------------------------------------------------------------------------------------| | [Arc42](./docs/arc42/Arc42.md) | Main Architecture Document (Arc42) of Digital Product Pass Application | | [Administration Guide](./docs/admin%20guide/Admin_Guide.md) | Administration Guide explaining the infrastructure and how to configure the application | -| [Backend Documentation](./consumer-backend/productpass/readme.md) | Backend documentation Product Passport App | +| [Backend Documentation](./backend/productpass/readme.md) | Backend documentation Product Passport App | | [Deployment in Hotel Budapest](./deployment/README.md) | Technical Guide - Deployment in ArgoCD Hotel Budapest (integration environment) | | [Docker Overview](./docker/README.md) | Overview on general docker commands | | [Keycloak Overview](./docker/local/Keycloak/README.md) | This guide describes how to setup a keycloak instance in local docker container and import existing realm.json file. | @@ -98,7 +98,7 @@ Eclipse Tractus-X product(s) installed within the image: - Project home: https://projects.eclipse.org/projects/automotive.tractusx - Dockerfiles: - Frontend: https://github.com/eclipse-tractusx/digital-product-pass/blob/main/Dockerfile - - Backend: https://github.com/eclipse-tractusx/digital-product-pass/blob/main/consumer-backend/productpass/Dockerfile + - Backend: https://github.com/eclipse-tractusx/digital-product-pass/blob/main/backend/productpass/Dockerfile - Project License: [Apache License, Version 2.0](https://raw.githubusercontent.com/eclipse-tractusx/digital-product-pass/main/LICENSE) diff --git a/package-lock.json b/package-lock.json index feb75ea98..e1772e6c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "digital-product-pass-frontend", - "version": "1.3.1", + "version": "2.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "digital-product-pass-frontend", - "version": "1.3.1", + "version": "2.0.0", "dependencies": { "@mdi/font": "5.9.55", "@popperjs/core": "^2.11.2", diff --git a/package.json b/package.json index 1ec81c1ca..abb41b450 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "digital-product-pass-frontend", - "version": "1.3.1", + "version": "2.0.0", "private": true, "scripts": { "serve": "vite --host localhost", From 65209d188cdb270fe326e33b577b0952c6d8d6f3 Mon Sep 17 00:00:00 2001 From: Mathias Moser <71728767+matbmoser@users.noreply.github.com> Date: Fri, 22 Dec 2023 17:09:57 +0100 Subject: [PATCH 07/11] BREAKING CHANGE: changed backend path from `consumer-backend` to `backend` for reference implementation --- .github/workflows/helm-test.yaml | 4 +- .../publish-dpp-backend-docker-image.yml | 8 +- .github/workflows/sonar-scan.yaml | 2 +- .github/workflows/trivy.yml | 6 +- .github/workflows/veracode-pipeline.yml | 2 +- .github/workflows/veracode-upload.yml | 2 +- INSTALL.md | 4 +- .../digital-product-pass-backend/README.md | 6 +- .../productpass/.gitattributes | 0 .../productpass/.gitignore | 0 .../.mvn/wrapper/maven-wrapper.properties | 0 .../productpass/Dockerfile | 0 .../productpass/deploy.sh | 0 .../productpass/docs/media/img.png | Bin .../productpass/docs/media/img2.png | Bin .../productpass/docs/media/img3.png | Bin .../productpass/docs/media/img4.png | Bin .../productpass/docs/tests/unitTest.md | 0 .../productpass/mvnw | 0 .../productpass/mvnw.cmd | 0 .../product-passport-consumer-backend.json | 0 .../productpass/pom.xml | 4 +- .../productpass/readme.md | 2 +- .../tractusx/productpass/Application.java | 0 .../productpass/config/AppConfig.java | 0 .../productpass/config/DiscoveryConfig.java | 0 .../productpass/config/DtrConfig.java | 0 .../productpass/config/IrsConfig.java | 0 .../productpass/config/PassportConfig.java | 0 .../productpass/config/ProcessConfig.java | 0 .../productpass/config/ThreadConfig.java | 0 .../productpass/config/VaultConfig.java | 0 .../productpass/config/WebConfig.java | 0 .../exceptions/ConfigException.java | 0 .../exceptions/ControllerException.java | 0 .../exceptions/DataModelException.java | 0 .../exceptions/ManagerException.java | 0 .../exceptions/ServiceException.java | 0 .../ServiceInitializationException.java | 0 .../http/controllers/AppController.java | 0 .../http/controllers/api/ApiController.java | 0 .../controllers/api/ContractController.java | 0 .../http/controllers/api/IrsController.java | 0 .../http/controllers/auth/AuthController.java | 0 .../error/ErrorResponseController.java | 0 .../http/middleware/BaseInterceptor.java | 0 .../http/middleware/InterceptorConfig.java | 0 .../ServiceInitializationInterface.java | 0 .../productpass/listeners/AppListener.java | 0 .../managers/DtrSearchManager.java | 0 .../managers/ProcessDataModel.java | 0 .../productpass/managers/ProcessManager.java | 0 .../productpass/managers/TreeManager.java | 0 .../productpass/models/auth/Credential.java | 0 .../productpass/models/auth/JwtToken.java | 0 .../models/auth/UserCredential.java | 0 .../productpass/models/auth/UserInfo.java | 0 .../models/catenax/BpnDiscovery.java | 0 .../productpass/models/catenax/Discovery.java | 0 .../productpass/models/catenax/Dtr.java | 0 .../models/catenax/EdcDiscoveryEndpoint.java | 0 .../models/dtregistry/DigitalTwin.java | 0 .../models/dtregistry/EndPoint.java | 0 .../models/dtregistry/SubModel.java | 0 .../productpass/models/edc/AssetSearch.java | 0 .../models/edc/DataPlaneEndpoint.java | 0 .../tractusx/productpass/models/edc/Jwt.java | 0 .../productpass/models/http/Response.java | 0 .../models/http/requests/DiscoverySearch.java | 0 .../models/http/requests/Search.java | 0 .../models/http/requests/TokenRequest.java | 0 .../models/http/responses/IdResponse.java | 0 .../tractusx/productpass/models/irs/Job.java | 0 .../productpass/models/irs/JobHistory.java | 0 .../productpass/models/irs/JobRequest.java | 0 .../productpass/models/irs/JobResponse.java | 0 .../productpass/models/irs/Relationship.java | 0 .../productpass/models/manager/History.java | 0 .../productpass/models/manager/Node.java | 0 .../models/manager/NodeComponent.java | 0 .../productpass/models/manager/Process.java | 0 .../models/manager/SearchStatus.java | 0 .../productpass/models/manager/Status.java | 0 .../models/negotiation/Catalog.java | 0 .../models/negotiation/CatalogRequest.java | 0 .../models/negotiation/Constraint.java | 0 .../models/negotiation/DataService.java | 0 .../models/negotiation/Dataset.java | 0 .../models/negotiation/DidDocument.java | 0 .../models/negotiation/Distribution.java | 0 .../models/negotiation/EdcResponse.java | 0 .../models/negotiation/Negotiation.java | 0 .../negotiation/NegotiationRequest.java | 0 .../productpass/models/negotiation/Offer.java | 0 .../models/negotiation/Properties.java | 0 .../productpass/models/negotiation/Set.java | 0 .../models/negotiation/Transfer.java | 0 .../models/negotiation/TransferRequest.java | 0 .../models/passports/PassportResponse.java | 0 .../models/service/BaseService.java | 0 .../productpass/services/AasService.java | 0 .../services/AuthenticationService.java | 0 .../productpass/services/CatenaXService.java | 0 .../services/DataPlaneService.java | 0 .../services/DataTransferService.java | 0 .../productpass/services/IrsService.java | 0 .../productpass/services/VaultService.java | 0 .../src/main/java/utils/CatenaXUtil.java | 0 .../src/main/java/utils/CrypUtil.java | 0 .../src/main/java/utils/CsvUtil.java | 0 .../src/main/java/utils/DateTimeUtil.java | 0 .../src/main/java/utils/EdcUtil.java | 0 .../src/main/java/utils/FileUtil.java | 0 .../src/main/java/utils/HttpUtil.java | 0 .../src/main/java/utils/JsonUtil.java | 0 .../src/main/java/utils/LogUtil.java | 0 .../src/main/java/utils/NumericUtil.java | 0 .../src/main/java/utils/PassportUtil.java | 0 .../src/main/java/utils/ReflectionUtil.java | 0 .../src/main/java/utils/StringUtil.java | 0 .../src/main/java/utils/SystemUtil.java | 0 .../src/main/java/utils/ThreadUtil.java | 0 .../src/main/java/utils/YamlUtil.java | 0 .../java/utils/exceptions/UtilException.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback-spring.xml | 0 .../src/test/java/utils/CrypUtilTest.java | 0 .../src/test/java/utils/JsonUtilTest.java | 0 .../src/test/java/utils/LogUtilTest.java | 0 .../src/test/java/utils/SystemUtilTest.java | 0 .../src/test/java/utils/YamlUtilTest.java | 0 charts/digital-product-pass/Chart.yaml | 4 +- .../digital-product-pass/.helmignore | 26 --- .../digital-product-pass/Chart.yaml | 49 ----- .../helm-chart/digital-product-pass/LICENSE | 202 ------------------ .../helm-chart/digital-product-pass/README.md | 115 ---------- .../digital-product-pass/templates/NOTES.txt | 44 ---- .../templates/_helpers.tpl | 84 -------- .../templates/configmap.yaml | 144 ------------- .../templates/deployment.yaml | 123 ----------- .../templates/ingress.yaml | 87 -------- .../templates/pvc-data.yaml | 36 ---- .../templates/secret.yaml | 46 ---- .../templates/service.yaml | 46 ---- .../templates/serviceaccount.yaml | 12 -- .../templates/tests/test-connection.yaml | 38 ---- .../digital-product-pass/values-dev.yaml | 70 ------ .../digital-product-pass/values-int.yaml | 68 ------ .../digital-product-pass/values.yaml | 193 ----------------- docs/GETTING-STARTED.md | 2 +- docs/README.md | 2 +- docs/admin guide/Admin_Guide.md | 8 +- sonar-project.properties | 4 +- 153 files changed, 30 insertions(+), 1413 deletions(-) rename {consumer-backend => backend}/productpass/.gitattributes (100%) rename {consumer-backend => backend}/productpass/.gitignore (100%) rename {consumer-backend => backend}/productpass/.mvn/wrapper/maven-wrapper.properties (100%) rename {consumer-backend => backend}/productpass/Dockerfile (100%) rename {consumer-backend => backend}/productpass/deploy.sh (100%) rename {consumer-backend => backend}/productpass/docs/media/img.png (100%) rename {consumer-backend => backend}/productpass/docs/media/img2.png (100%) rename {consumer-backend => backend}/productpass/docs/media/img3.png (100%) rename {consumer-backend => backend}/productpass/docs/media/img4.png (100%) rename {consumer-backend => backend}/productpass/docs/tests/unitTest.md (100%) rename {consumer-backend => backend}/productpass/mvnw (100%) rename {consumer-backend => backend}/productpass/mvnw.cmd (100%) rename {consumer-backend => backend}/productpass/openapi/product-passport-consumer-backend.json (100%) rename {consumer-backend => backend}/productpass/pom.xml (98%) rename {consumer-backend => backend}/productpass/readme.md (99%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/Application.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/config/AppConfig.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/config/DiscoveryConfig.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/config/DtrConfig.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/config/IrsConfig.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/config/PassportConfig.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/config/ProcessConfig.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/config/ThreadConfig.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/config/VaultConfig.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/config/WebConfig.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ConfigException.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ControllerException.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/DataModelException.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ManagerException.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ServiceException.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ServiceInitializationException.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/AppController.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/ApiController.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/ContractController.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/IrsController.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/auth/AuthController.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/error/ErrorResponseController.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/http/middleware/BaseInterceptor.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/http/middleware/InterceptorConfig.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/interfaces/ServiceInitializationInterface.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/listeners/AppListener.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/DtrSearchManager.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessDataModel.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessManager.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/TreeManager.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/Credential.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/JwtToken.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/UserCredential.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/UserInfo.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/BpnDiscovery.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/Discovery.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/Dtr.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/EdcDiscoveryEndpoint.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/DigitalTwin.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/EndPoint.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/SubModel.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/AssetSearch.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/DataPlaneEndpoint.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/Jwt.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/Response.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/DiscoverySearch.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/Search.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/TokenRequest.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/responses/IdResponse.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/Job.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobHistory.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobRequest.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobResponse.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/Relationship.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/History.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Node.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/NodeComponent.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Process.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/SearchStatus.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Status.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Catalog.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/CatalogRequest.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Constraint.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/DataService.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Dataset.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/DidDocument.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Distribution.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/EdcResponse.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Negotiation.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/NegotiationRequest.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Offer.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Properties.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Set.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Transfer.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/TransferRequest.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/passports/PassportResponse.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/models/service/BaseService.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/services/AasService.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/services/AuthenticationService.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/services/CatenaXService.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataPlaneService.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataTransferService.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/services/IrsService.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/org/eclipse/tractusx/productpass/services/VaultService.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/utils/CatenaXUtil.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/utils/CrypUtil.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/utils/CsvUtil.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/utils/DateTimeUtil.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/utils/EdcUtil.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/utils/FileUtil.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/utils/HttpUtil.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/utils/JsonUtil.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/utils/LogUtil.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/utils/NumericUtil.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/utils/PassportUtil.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/utils/ReflectionUtil.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/utils/StringUtil.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/utils/SystemUtil.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/utils/ThreadUtil.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/utils/YamlUtil.java (100%) rename {consumer-backend => backend}/productpass/src/main/java/utils/exceptions/UtilException.java (100%) rename {consumer-backend => backend}/productpass/src/main/resources/application.yml (100%) rename {consumer-backend => backend}/productpass/src/main/resources/logback-spring.xml (100%) rename {consumer-backend => backend}/productpass/src/test/java/utils/CrypUtilTest.java (100%) rename {consumer-backend => backend}/productpass/src/test/java/utils/JsonUtilTest.java (100%) rename {consumer-backend => backend}/productpass/src/test/java/utils/LogUtilTest.java (100%) rename {consumer-backend => backend}/productpass/src/test/java/utils/SystemUtilTest.java (100%) rename {consumer-backend => backend}/productpass/src/test/java/utils/YamlUtilTest.java (100%) delete mode 100644 consumer-backend/helm-chart/digital-product-pass/.helmignore delete mode 100644 consumer-backend/helm-chart/digital-product-pass/Chart.yaml delete mode 100644 consumer-backend/helm-chart/digital-product-pass/LICENSE delete mode 100644 consumer-backend/helm-chart/digital-product-pass/README.md delete mode 100644 consumer-backend/helm-chart/digital-product-pass/templates/NOTES.txt delete mode 100644 consumer-backend/helm-chart/digital-product-pass/templates/_helpers.tpl delete mode 100644 consumer-backend/helm-chart/digital-product-pass/templates/configmap.yaml delete mode 100644 consumer-backend/helm-chart/digital-product-pass/templates/deployment.yaml delete mode 100644 consumer-backend/helm-chart/digital-product-pass/templates/ingress.yaml delete mode 100644 consumer-backend/helm-chart/digital-product-pass/templates/pvc-data.yaml delete mode 100644 consumer-backend/helm-chart/digital-product-pass/templates/secret.yaml delete mode 100644 consumer-backend/helm-chart/digital-product-pass/templates/service.yaml delete mode 100644 consumer-backend/helm-chart/digital-product-pass/templates/serviceaccount.yaml delete mode 100644 consumer-backend/helm-chart/digital-product-pass/templates/tests/test-connection.yaml delete mode 100644 consumer-backend/helm-chart/digital-product-pass/values-dev.yaml delete mode 100644 consumer-backend/helm-chart/digital-product-pass/values-int.yaml delete mode 100644 consumer-backend/helm-chart/digital-product-pass/values.yaml diff --git a/.github/workflows/helm-test.yaml b/.github/workflows/helm-test.yaml index c9b5192ac..09180cf04 100644 --- a/.github/workflows/helm-test.yaml +++ b/.github/workflows/helm-test.yaml @@ -85,14 +85,14 @@ jobs: # Build Java code with Maven - name: Build dpp backend with maven run: | - cd consumer-backend/productpass + cd backend/productpass mvn -B clean install - name: Build image for backend id: build-backend uses: docker/build-push-action@v3 with: - context: consumer-backend/productpass + context: backend/productpass push: true tags: ${{ env.REGISTRY }}/${{ env.BACKEND_IMAGE}}:${{ env.TAG }} diff --git a/.github/workflows/publish-dpp-backend-docker-image.yml b/.github/workflows/publish-dpp-backend-docker-image.yml index 04d260da6..1ac66d8c2 100644 --- a/.github/workflows/publish-dpp-backend-docker-image.yml +++ b/.github/workflows/publish-dpp-backend-docker-image.yml @@ -93,7 +93,7 @@ jobs: - name: Build dpp backend with maven for GHCR registry if: ${{ github.repository != 'eclipse-tractusx/digital-product-pass' }} run: | - cd consumer-backend/productpass + cd backend/productpass mvn -B clean install # Build and push Docker image with Buildx @@ -103,7 +103,7 @@ jobs: if: ${{ github.repository != 'eclipse-tractusx/digital-product-pass' }} uses: docker/build-push-action@v3 with: - context: consumer-backend/productpass + context: backend/productpass push: true tags: ${{ steps.meta-for-ghcr.outputs.tags }}, ${{ env.REGISTRY }}/${{ github.repository }}/${{ env.IMAGE_NAME }}:latest labels: ${{ steps.meta-for-ghcr.outputs.labels }} @@ -141,7 +141,7 @@ jobs: - name: Build dpp backend with maven for Docker Hub if: ${{ github.repository == 'eclipse-tractusx/digital-product-pass' }} run: | - cd consumer-backend/productpass + cd backend/productpass mvn -B clean install # Build and push Docker image with Buildx @@ -151,7 +151,7 @@ jobs: if: ${{ github.repository == 'eclipse-tractusx/digital-product-pass' }} uses: docker/build-push-action@v3 with: - context: consumer-backend/productpass + context: backend/productpass push: true tags: ${{ steps.meta-for-dockerhub.outputs.tags }}, ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}:latest labels: ${{ steps.meta-for-dockerhub.outputs.labels }} diff --git a/.github/workflows/sonar-scan.yaml b/.github/workflows/sonar-scan.yaml index f21eabcd6..4569fce5a 100644 --- a/.github/workflows/sonar-scan.yaml +++ b/.github/workflows/sonar-scan.yaml @@ -83,7 +83,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | - cd consumer-backend/productpass + cd backend/productpass mvn -B install org.sonarsource.scanner.maven:sonar-maven-plugin:sonar # cannot scan frontend component in one sonar cloud project where backend is also running, because frontend implemented in different technology diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index b4e2580cb..bb0d24849 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -150,14 +150,14 @@ jobs: # Build Java code with Maven - name: Build JAR run: | - cd consumer-backend/productpass + cd backend/productpass mvn -B clean install - name: Build backend image from Dockerfile - GHCR id: build-docker-backend-ghcr if: ${{ github.repository != 'eclipse-tractusx/digital-product-pass' }} run: | - cd consumer-backend/productpass + cd backend/productpass docker build -t ${{ env.REGISTRY }}/${{ github.repository }}/${{ env.BACKEND_IMAGE_NAME }}:latest . # Build action for docker hub registry @@ -165,7 +165,7 @@ jobs: id: build-docker-backend-dockerhub if: ${{ github.repository == 'eclipse-tractusx/digital-product-pass' }} run: | - cd consumer-backend/productpass + cd backend/productpass docker build -t ${{ env.IMAGE_NAMESPACE }}/${{ env.BACKEND_IMAGE_NAME }}:latest . - name: Run Trivy vulnerability scanner - GHCR diff --git a/.github/workflows/veracode-pipeline.yml b/.github/workflows/veracode-pipeline.yml index 2e51abb85..4c05b4c85 100644 --- a/.github/workflows/veracode-pipeline.yml +++ b/.github/workflows/veracode-pipeline.yml @@ -79,7 +79,7 @@ jobs: - name: build run: | - cd consumer-backend/productpass + cd backend/productpass mvn dependency:purge-local-repository clean verify - run: zip -r veracode-scan-target.zip ./ diff --git a/.github/workflows/veracode-upload.yml b/.github/workflows/veracode-upload.yml index 143f0108e..525972bf6 100644 --- a/.github/workflows/veracode-upload.yml +++ b/.github/workflows/veracode-upload.yml @@ -57,7 +57,7 @@ jobs: - name: build run: | - cd consumer-backend/productpass + cd backend/productpass mvn dependency:purge-local-repository clean verify - run: zip -r veracode-scan-target.zip ./ diff --git a/INSTALL.md b/INSTALL.md index 93de904cf..e05b23bd8 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -51,7 +51,7 @@ kubectl get pods -n product-material-pass --no-headers | awk '{if ($1 ~ "consum ``` **Example**: -![img4.png](./consumer-backend/productpass/docs/media/img4.png) +![img4.png](./backend/productpass/docs/media/img4.png) Copy the pod name with the prefix `consumer-backend` @@ -80,7 +80,7 @@ Use the following commands to install/compile the application: ### Compile Backend ```bash -cd consumer-backend/productpass +cd backend/productpass mvn clean install test ``` diff --git a/backend/charts/digital-product-pass-backend/README.md b/backend/charts/digital-product-pass-backend/README.md index d714ec62f..52ce53273 100644 --- a/backend/charts/digital-product-pass-backend/README.md +++ b/backend/charts/digital-product-pass-backend/README.md @@ -9,7 +9,7 @@ A Helm chart for Tractus-X Digital Product Pass Kubernetes ### Install ```bash -cd consumer-backend/helm-chart/digital-product-pass +cd backend/helm-chart/digital-product-pass helm install digital-product-pass -f ./values.yaml -f ./values-int.yaml ``` @@ -42,11 +42,11 @@ Open the web browser with the following url to check the health status: localhost:8888/health ``` -**Homepage:** +**Homepage:** ## Source Code -* +* ## Values diff --git a/consumer-backend/productpass/.gitattributes b/backend/productpass/.gitattributes similarity index 100% rename from consumer-backend/productpass/.gitattributes rename to backend/productpass/.gitattributes diff --git a/consumer-backend/productpass/.gitignore b/backend/productpass/.gitignore similarity index 100% rename from consumer-backend/productpass/.gitignore rename to backend/productpass/.gitignore diff --git a/consumer-backend/productpass/.mvn/wrapper/maven-wrapper.properties b/backend/productpass/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from consumer-backend/productpass/.mvn/wrapper/maven-wrapper.properties rename to backend/productpass/.mvn/wrapper/maven-wrapper.properties diff --git a/consumer-backend/productpass/Dockerfile b/backend/productpass/Dockerfile similarity index 100% rename from consumer-backend/productpass/Dockerfile rename to backend/productpass/Dockerfile diff --git a/consumer-backend/productpass/deploy.sh b/backend/productpass/deploy.sh similarity index 100% rename from consumer-backend/productpass/deploy.sh rename to backend/productpass/deploy.sh diff --git a/consumer-backend/productpass/docs/media/img.png b/backend/productpass/docs/media/img.png similarity index 100% rename from consumer-backend/productpass/docs/media/img.png rename to backend/productpass/docs/media/img.png diff --git a/consumer-backend/productpass/docs/media/img2.png b/backend/productpass/docs/media/img2.png similarity index 100% rename from consumer-backend/productpass/docs/media/img2.png rename to backend/productpass/docs/media/img2.png diff --git a/consumer-backend/productpass/docs/media/img3.png b/backend/productpass/docs/media/img3.png similarity index 100% rename from consumer-backend/productpass/docs/media/img3.png rename to backend/productpass/docs/media/img3.png diff --git a/consumer-backend/productpass/docs/media/img4.png b/backend/productpass/docs/media/img4.png similarity index 100% rename from consumer-backend/productpass/docs/media/img4.png rename to backend/productpass/docs/media/img4.png diff --git a/consumer-backend/productpass/docs/tests/unitTest.md b/backend/productpass/docs/tests/unitTest.md similarity index 100% rename from consumer-backend/productpass/docs/tests/unitTest.md rename to backend/productpass/docs/tests/unitTest.md diff --git a/consumer-backend/productpass/mvnw b/backend/productpass/mvnw similarity index 100% rename from consumer-backend/productpass/mvnw rename to backend/productpass/mvnw diff --git a/consumer-backend/productpass/mvnw.cmd b/backend/productpass/mvnw.cmd similarity index 100% rename from consumer-backend/productpass/mvnw.cmd rename to backend/productpass/mvnw.cmd diff --git a/consumer-backend/productpass/openapi/product-passport-consumer-backend.json b/backend/productpass/openapi/product-passport-consumer-backend.json similarity index 100% rename from consumer-backend/productpass/openapi/product-passport-consumer-backend.json rename to backend/productpass/openapi/product-passport-consumer-backend.json diff --git a/consumer-backend/productpass/pom.xml b/backend/productpass/pom.xml similarity index 98% rename from consumer-backend/productpass/pom.xml rename to backend/productpass/pom.xml index aa01c11a0..8c70863db 100644 --- a/consumer-backend/productpass/pom.xml +++ b/backend/productpass/pom.xml @@ -33,10 +33,10 @@ org.eclipse.tractusx productpass - 1.3.1 + 2.0.0 jar Catena-X Digital Product Passport Backend - Product Passport Consumer Backend System for Product Passport Consumer Frontend Application + Digital Product Passport Consumer Backend Reference Implementation System for Product Passport Consumer Frontend Application 19 diff --git a/consumer-backend/productpass/readme.md b/backend/productpass/readme.md similarity index 99% rename from consumer-backend/productpass/readme.md rename to backend/productpass/readme.md index 408c3be81..95f84c34f 100644 --- a/consumer-backend/productpass/readme.md +++ b/backend/productpass/readme.md @@ -23,7 +23,7 @@

  Digital Product Pass Backend

-

Version: v1.3.1

+

Version: v2.0.0


diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/Application.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/Application.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/Application.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/Application.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/AppConfig.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/AppConfig.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/AppConfig.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/AppConfig.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/DiscoveryConfig.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/DiscoveryConfig.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/DiscoveryConfig.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/DiscoveryConfig.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/DtrConfig.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/DtrConfig.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/DtrConfig.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/DtrConfig.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/IrsConfig.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/IrsConfig.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/IrsConfig.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/IrsConfig.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/PassportConfig.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/PassportConfig.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/PassportConfig.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/PassportConfig.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/ProcessConfig.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/ProcessConfig.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/ProcessConfig.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/ProcessConfig.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/ThreadConfig.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/ThreadConfig.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/ThreadConfig.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/ThreadConfig.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/VaultConfig.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/VaultConfig.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/VaultConfig.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/VaultConfig.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/WebConfig.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/WebConfig.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/WebConfig.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/WebConfig.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ConfigException.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ConfigException.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ConfigException.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ConfigException.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ControllerException.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ControllerException.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ControllerException.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ControllerException.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/DataModelException.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/DataModelException.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/DataModelException.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/DataModelException.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ManagerException.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ManagerException.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ManagerException.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ManagerException.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ServiceException.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ServiceException.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ServiceException.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ServiceException.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ServiceInitializationException.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ServiceInitializationException.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ServiceInitializationException.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ServiceInitializationException.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/AppController.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/AppController.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/AppController.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/AppController.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/ApiController.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/ApiController.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/ApiController.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/ApiController.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/ContractController.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/ContractController.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/ContractController.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/ContractController.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/IrsController.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/IrsController.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/IrsController.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/IrsController.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/auth/AuthController.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/auth/AuthController.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/auth/AuthController.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/auth/AuthController.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/error/ErrorResponseController.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/error/ErrorResponseController.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/error/ErrorResponseController.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/error/ErrorResponseController.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/middleware/BaseInterceptor.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/middleware/BaseInterceptor.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/middleware/BaseInterceptor.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/middleware/BaseInterceptor.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/middleware/InterceptorConfig.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/middleware/InterceptorConfig.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/middleware/InterceptorConfig.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/middleware/InterceptorConfig.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/interfaces/ServiceInitializationInterface.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/interfaces/ServiceInitializationInterface.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/interfaces/ServiceInitializationInterface.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/interfaces/ServiceInitializationInterface.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/listeners/AppListener.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/listeners/AppListener.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/listeners/AppListener.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/listeners/AppListener.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/DtrSearchManager.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/DtrSearchManager.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/DtrSearchManager.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/DtrSearchManager.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessDataModel.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessDataModel.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessDataModel.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessDataModel.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessManager.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessManager.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessManager.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessManager.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/TreeManager.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/TreeManager.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/TreeManager.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/TreeManager.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/Credential.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/Credential.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/Credential.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/Credential.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/JwtToken.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/JwtToken.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/JwtToken.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/JwtToken.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/UserCredential.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/UserCredential.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/UserCredential.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/UserCredential.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/UserInfo.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/UserInfo.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/UserInfo.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/UserInfo.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/BpnDiscovery.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/BpnDiscovery.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/BpnDiscovery.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/BpnDiscovery.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/Discovery.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/Discovery.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/Discovery.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/Discovery.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/Dtr.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/Dtr.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/Dtr.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/Dtr.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/EdcDiscoveryEndpoint.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/EdcDiscoveryEndpoint.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/EdcDiscoveryEndpoint.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/EdcDiscoveryEndpoint.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/DigitalTwin.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/DigitalTwin.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/DigitalTwin.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/DigitalTwin.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/EndPoint.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/EndPoint.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/EndPoint.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/EndPoint.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/SubModel.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/SubModel.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/SubModel.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/SubModel.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/AssetSearch.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/AssetSearch.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/AssetSearch.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/AssetSearch.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/DataPlaneEndpoint.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/DataPlaneEndpoint.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/DataPlaneEndpoint.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/DataPlaneEndpoint.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/Jwt.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/Jwt.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/Jwt.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/Jwt.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/Response.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/Response.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/Response.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/Response.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/DiscoverySearch.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/DiscoverySearch.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/DiscoverySearch.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/DiscoverySearch.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/Search.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/Search.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/Search.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/Search.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/TokenRequest.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/TokenRequest.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/TokenRequest.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/TokenRequest.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/responses/IdResponse.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/responses/IdResponse.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/responses/IdResponse.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/responses/IdResponse.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/Job.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/Job.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/Job.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/Job.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobHistory.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobHistory.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobHistory.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobHistory.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobRequest.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobRequest.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobRequest.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobRequest.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobResponse.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobResponse.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobResponse.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobResponse.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/Relationship.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/Relationship.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/Relationship.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/Relationship.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/History.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/History.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/History.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/History.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Node.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Node.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Node.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Node.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/NodeComponent.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/NodeComponent.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/NodeComponent.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/NodeComponent.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Process.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Process.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Process.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Process.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/SearchStatus.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/SearchStatus.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/SearchStatus.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/SearchStatus.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Status.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Status.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Status.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Status.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Catalog.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Catalog.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Catalog.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Catalog.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/CatalogRequest.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/CatalogRequest.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/CatalogRequest.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/CatalogRequest.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Constraint.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Constraint.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Constraint.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Constraint.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/DataService.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/DataService.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/DataService.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/DataService.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Dataset.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Dataset.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Dataset.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Dataset.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/DidDocument.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/DidDocument.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/DidDocument.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/DidDocument.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Distribution.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Distribution.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Distribution.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Distribution.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/EdcResponse.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/EdcResponse.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/EdcResponse.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/EdcResponse.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Negotiation.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Negotiation.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Negotiation.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Negotiation.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/NegotiationRequest.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/NegotiationRequest.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/NegotiationRequest.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/NegotiationRequest.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Offer.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Offer.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Offer.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Offer.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Properties.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Properties.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Properties.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Properties.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Set.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Set.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Set.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Set.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Transfer.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Transfer.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Transfer.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Transfer.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/TransferRequest.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/TransferRequest.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/TransferRequest.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/TransferRequest.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/passports/PassportResponse.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/passports/PassportResponse.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/passports/PassportResponse.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/passports/PassportResponse.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/service/BaseService.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/service/BaseService.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/service/BaseService.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/service/BaseService.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/AasService.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/AasService.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/AasService.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/AasService.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/AuthenticationService.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/AuthenticationService.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/AuthenticationService.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/AuthenticationService.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/CatenaXService.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/CatenaXService.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/CatenaXService.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/CatenaXService.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataPlaneService.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataPlaneService.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataPlaneService.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataPlaneService.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataTransferService.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataTransferService.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataTransferService.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataTransferService.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/IrsService.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/IrsService.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/IrsService.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/IrsService.java diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/VaultService.java b/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/VaultService.java similarity index 100% rename from consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/VaultService.java rename to backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/VaultService.java diff --git a/consumer-backend/productpass/src/main/java/utils/CatenaXUtil.java b/backend/productpass/src/main/java/utils/CatenaXUtil.java similarity index 100% rename from consumer-backend/productpass/src/main/java/utils/CatenaXUtil.java rename to backend/productpass/src/main/java/utils/CatenaXUtil.java diff --git a/consumer-backend/productpass/src/main/java/utils/CrypUtil.java b/backend/productpass/src/main/java/utils/CrypUtil.java similarity index 100% rename from consumer-backend/productpass/src/main/java/utils/CrypUtil.java rename to backend/productpass/src/main/java/utils/CrypUtil.java diff --git a/consumer-backend/productpass/src/main/java/utils/CsvUtil.java b/backend/productpass/src/main/java/utils/CsvUtil.java similarity index 100% rename from consumer-backend/productpass/src/main/java/utils/CsvUtil.java rename to backend/productpass/src/main/java/utils/CsvUtil.java diff --git a/consumer-backend/productpass/src/main/java/utils/DateTimeUtil.java b/backend/productpass/src/main/java/utils/DateTimeUtil.java similarity index 100% rename from consumer-backend/productpass/src/main/java/utils/DateTimeUtil.java rename to backend/productpass/src/main/java/utils/DateTimeUtil.java diff --git a/consumer-backend/productpass/src/main/java/utils/EdcUtil.java b/backend/productpass/src/main/java/utils/EdcUtil.java similarity index 100% rename from consumer-backend/productpass/src/main/java/utils/EdcUtil.java rename to backend/productpass/src/main/java/utils/EdcUtil.java diff --git a/consumer-backend/productpass/src/main/java/utils/FileUtil.java b/backend/productpass/src/main/java/utils/FileUtil.java similarity index 100% rename from consumer-backend/productpass/src/main/java/utils/FileUtil.java rename to backend/productpass/src/main/java/utils/FileUtil.java diff --git a/consumer-backend/productpass/src/main/java/utils/HttpUtil.java b/backend/productpass/src/main/java/utils/HttpUtil.java similarity index 100% rename from consumer-backend/productpass/src/main/java/utils/HttpUtil.java rename to backend/productpass/src/main/java/utils/HttpUtil.java diff --git a/consumer-backend/productpass/src/main/java/utils/JsonUtil.java b/backend/productpass/src/main/java/utils/JsonUtil.java similarity index 100% rename from consumer-backend/productpass/src/main/java/utils/JsonUtil.java rename to backend/productpass/src/main/java/utils/JsonUtil.java diff --git a/consumer-backend/productpass/src/main/java/utils/LogUtil.java b/backend/productpass/src/main/java/utils/LogUtil.java similarity index 100% rename from consumer-backend/productpass/src/main/java/utils/LogUtil.java rename to backend/productpass/src/main/java/utils/LogUtil.java diff --git a/consumer-backend/productpass/src/main/java/utils/NumericUtil.java b/backend/productpass/src/main/java/utils/NumericUtil.java similarity index 100% rename from consumer-backend/productpass/src/main/java/utils/NumericUtil.java rename to backend/productpass/src/main/java/utils/NumericUtil.java diff --git a/consumer-backend/productpass/src/main/java/utils/PassportUtil.java b/backend/productpass/src/main/java/utils/PassportUtil.java similarity index 100% rename from consumer-backend/productpass/src/main/java/utils/PassportUtil.java rename to backend/productpass/src/main/java/utils/PassportUtil.java diff --git a/consumer-backend/productpass/src/main/java/utils/ReflectionUtil.java b/backend/productpass/src/main/java/utils/ReflectionUtil.java similarity index 100% rename from consumer-backend/productpass/src/main/java/utils/ReflectionUtil.java rename to backend/productpass/src/main/java/utils/ReflectionUtil.java diff --git a/consumer-backend/productpass/src/main/java/utils/StringUtil.java b/backend/productpass/src/main/java/utils/StringUtil.java similarity index 100% rename from consumer-backend/productpass/src/main/java/utils/StringUtil.java rename to backend/productpass/src/main/java/utils/StringUtil.java diff --git a/consumer-backend/productpass/src/main/java/utils/SystemUtil.java b/backend/productpass/src/main/java/utils/SystemUtil.java similarity index 100% rename from consumer-backend/productpass/src/main/java/utils/SystemUtil.java rename to backend/productpass/src/main/java/utils/SystemUtil.java diff --git a/consumer-backend/productpass/src/main/java/utils/ThreadUtil.java b/backend/productpass/src/main/java/utils/ThreadUtil.java similarity index 100% rename from consumer-backend/productpass/src/main/java/utils/ThreadUtil.java rename to backend/productpass/src/main/java/utils/ThreadUtil.java diff --git a/consumer-backend/productpass/src/main/java/utils/YamlUtil.java b/backend/productpass/src/main/java/utils/YamlUtil.java similarity index 100% rename from consumer-backend/productpass/src/main/java/utils/YamlUtil.java rename to backend/productpass/src/main/java/utils/YamlUtil.java diff --git a/consumer-backend/productpass/src/main/java/utils/exceptions/UtilException.java b/backend/productpass/src/main/java/utils/exceptions/UtilException.java similarity index 100% rename from consumer-backend/productpass/src/main/java/utils/exceptions/UtilException.java rename to backend/productpass/src/main/java/utils/exceptions/UtilException.java diff --git a/consumer-backend/productpass/src/main/resources/application.yml b/backend/productpass/src/main/resources/application.yml similarity index 100% rename from consumer-backend/productpass/src/main/resources/application.yml rename to backend/productpass/src/main/resources/application.yml diff --git a/consumer-backend/productpass/src/main/resources/logback-spring.xml b/backend/productpass/src/main/resources/logback-spring.xml similarity index 100% rename from consumer-backend/productpass/src/main/resources/logback-spring.xml rename to backend/productpass/src/main/resources/logback-spring.xml diff --git a/consumer-backend/productpass/src/test/java/utils/CrypUtilTest.java b/backend/productpass/src/test/java/utils/CrypUtilTest.java similarity index 100% rename from consumer-backend/productpass/src/test/java/utils/CrypUtilTest.java rename to backend/productpass/src/test/java/utils/CrypUtilTest.java diff --git a/consumer-backend/productpass/src/test/java/utils/JsonUtilTest.java b/backend/productpass/src/test/java/utils/JsonUtilTest.java similarity index 100% rename from consumer-backend/productpass/src/test/java/utils/JsonUtilTest.java rename to backend/productpass/src/test/java/utils/JsonUtilTest.java diff --git a/consumer-backend/productpass/src/test/java/utils/LogUtilTest.java b/backend/productpass/src/test/java/utils/LogUtilTest.java similarity index 100% rename from consumer-backend/productpass/src/test/java/utils/LogUtilTest.java rename to backend/productpass/src/test/java/utils/LogUtilTest.java diff --git a/consumer-backend/productpass/src/test/java/utils/SystemUtilTest.java b/backend/productpass/src/test/java/utils/SystemUtilTest.java similarity index 100% rename from consumer-backend/productpass/src/test/java/utils/SystemUtilTest.java rename to backend/productpass/src/test/java/utils/SystemUtilTest.java diff --git a/consumer-backend/productpass/src/test/java/utils/YamlUtilTest.java b/backend/productpass/src/test/java/utils/YamlUtilTest.java similarity index 100% rename from consumer-backend/productpass/src/test/java/utils/YamlUtilTest.java rename to backend/productpass/src/test/java/utils/YamlUtilTest.java diff --git a/charts/digital-product-pass/Chart.yaml b/charts/digital-product-pass/Chart.yaml index 36015a71c..f01d8601f 100644 --- a/charts/digital-product-pass/Chart.yaml +++ b/charts/digital-product-pass/Chart.yaml @@ -40,10 +40,10 @@ type: application # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.4.0 +version: 2.0.0 # 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: "1.4.0" +appVersion: "2.0.0" diff --git a/consumer-backend/helm-chart/digital-product-pass/.helmignore b/consumer-backend/helm-chart/digital-product-pass/.helmignore deleted file mode 100644 index 876f60bc4..000000000 --- a/consumer-backend/helm-chart/digital-product-pass/.helmignore +++ /dev/null @@ -1,26 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ -# Accept only values.yaml -values?*.yaml -values?*.yml diff --git a/consumer-backend/helm-chart/digital-product-pass/Chart.yaml b/consumer-backend/helm-chart/digital-product-pass/Chart.yaml deleted file mode 100644 index 36015a71c..000000000 --- a/consumer-backend/helm-chart/digital-product-pass/Chart.yaml +++ /dev/null @@ -1,49 +0,0 @@ -################################################################################# -# Catena-X - Product Passport Consumer Application -# -# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the -# License for the specific language govern in permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -################################################################################# ---- -apiVersion: v2 -name: digital-product-pass -description: A Helm chart for Tractus-X Digital Product Pass Kubernetes -home: https://github.com/eclipse-tractusx/digital-product-pass/tree/main/charts/digital-product-pass -sources: - - https://github.com/eclipse-tractusx/digital-product-pass/tree/main/charts/digital-product-pass -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -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: 1.4.0 - -# 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: "1.4.0" diff --git a/consumer-backend/helm-chart/digital-product-pass/LICENSE b/consumer-backend/helm-chart/digital-product-pass/LICENSE deleted file mode 100644 index c1e5cadd4..000000000 --- a/consumer-backend/helm-chart/digital-product-pass/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/consumer-backend/helm-chart/digital-product-pass/README.md b/consumer-backend/helm-chart/digital-product-pass/README.md deleted file mode 100644 index d714ec62f..000000000 --- a/consumer-backend/helm-chart/digital-product-pass/README.md +++ /dev/null @@ -1,115 +0,0 @@ -# Digital-product-pass Backend - -![Version: 1.4.0](https://img.shields.io/badge/Version-1.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.0](https://img.shields.io/badge/AppVersion-1.4.0-informational?style=flat-square) - -A Helm chart for Tractus-X Digital Product Pass Kubernetes - -## TL;DR - -### Install - -```bash -cd consumer-backend/helm-chart/digital-product-pass -helm install digital-product-pass -f ./values.yaml -f ./values-int.yaml -``` - -> **NOTE**: This command will deploy the backend application. - -### Exposing ports - -Once the application is running, the certain ports need to be exposed to access the backend outside the Kubernetes cluster. - -### Get pod name -Search for the application name: - -```bash -kubectl get pods --no-headers | awk '{if ($1 ~ "dpp-backend-*") print $1}' -``` -Copy the pod name with the prefix `dpp-backend-*` - -### Port forwarding - -```bash -kubectl port-forward dpp-backend-* 8888:8888 -``` - -> **NOTE**: The default port set is `8888` however it can be changed in the configuration. - -### Check if the application is running - -Open the web browser with the following url to check the health status: -``` -localhost:8888/health -``` - -**Homepage:** - -## Source Code - -* - -## Values - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| affinity | object | `{}` | | -| autoscaling.enabled | bool | `false` | | -| autoscaling.maxReplicas | int | `100` | | -| autoscaling.minReplicas | int | `1` | | -| autoscaling.targetCPUUtilizationPercentage | int | `80` | | -| digitalTwinRegistry.endpoints.digitalTwin | string | `"/shell-descriptors"` | | -| digitalTwinRegistry.endpoints.search | string | `"/lookup/shells"` | | -| digitalTwinRegistry.endpoints.subModel | string | `"/submodel-descriptors"` | | -| digitalTwinRegistry.temporaryStorage | object | `{"enabled":true}` | temporary storage of dDTRs for optimization | -| digitalTwinRegistry.timeouts | object | `{"digitalTwin":20,"negotiation":40,"search":10,"transfer":10}` | timeouts for the digital twin registry async negotiation | -| discovery | object | `{"bpnDiscovery":{"key":"manufacturerPartId","path":"/api/v1.0/administration/connectors/bpnDiscovery/search"},"edcDiscovery":{"key":"bpn"},"hostname":""}` | discovery configuration | -| discovery.bpnDiscovery | object | `{"key":"manufacturerPartId","path":"/api/v1.0/administration/connectors/bpnDiscovery/search"}` | bpn discovery configuration | -| discovery.edcDiscovery | object | `{"key":"bpn"}` | edc discovery configuration | -| discovery.hostname | string | `""` | discovery finder configuration | -| edc | object | `{"apis":{"catalog":"/catalog/request","management":"/management/v2","negotiation":"/contractnegotiations","transfer":"/transferprocesses"},"delay":100,"endpoint":"","participantId":"","xApiKey":""}` | in this section we configure the values that are inserted as secrets in the backend | -| edc.endpoint | string | `""` | edc consumer connection configuration | -| edc.participantId | string | `""` | BPN Number | -| edc.xApiKey | string | `""` | the secret for assesing the edc management API | -| hostname | string | `"localhost"` | backend hostname (without protocol prefix [DEFAULT HTTPS] for security ) | -| image.pullPolicy | string | `"Always"` | | -| image.repository | string | `"docker.io/tractusx/digital-product-pass-backend"` | | -| imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) | -| ingress | object | `{"enabled":false,"hosts":[{"host":"localhost","paths":[{"path":"/","pathType":"Prefix"}]}]}` | ingress declaration to expose the dpp-backend service | -| irs | object | `{"enabled":false,"hostname":""}` | irs configuration | -| logging.level.root | string | `"INFO"` | general logging level | -| logging.level.utils | string | `"INFO"` | logging for the util components | -| maxRetries | int | `5` | max retries for the backend services | -| name | string | `"dpp-backend"` | | -| namespace | string | `""` | | -| nodeSelector | object | `{}` | | -| oauth | object | `{"appId":"","hostname":"","onLoad":"login-required","realm":"","techUser":{"clientId":"","clientSecret":""}}` | oauth configuration | -| oauth.hostname | string | `""` | url of the identity provider service | -| oauth.techUser | object | `{"clientId":"","clientSecret":""}` | note: this credentials need to have access to the Discovery Finder, BPN Discovery and EDC Discovery | -| passport | object | `{"aspects":["urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport","urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass","urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass"]}` | passport data transfer configuration | -| passport.aspects | list | `["urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport","urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass","urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass"]` | passport versions and aspects allowed | -| podAnnotations | object | `{}` | | -| podSecurityContext.fsGroup | int | `3000` | | -| podSecurityContext.runAsUser | int | `10000` | | -| process | object | `{"encryptionKey":""}` | digital twin registry configuration | -| process.encryptionKey | string | `""` | unique sha512 hash key used for the passport encryption | -| replicaCount | int | `1` | | -| resources.limits.cpu | string | `"500m"` | | -| resources.limits.memory | string | `"512Mi"` | | -| resources.requests.cpu | string | `"250m"` | | -| resources.requests.memory | string | `"512Mi"` | | -| securityCheck | object | `{"bpn":false,"edc":false,"enabled":false}` | security configuration | -| securityContext.allowPrivilegeEscalation | bool | `false` | | -| securityContext.readOnlyRootFilesystem | bool | `true` | | -| securityContext.runAsGroup | int | `3000` | | -| securityContext.runAsNonRoot | bool | `true` | | -| securityContext.runAsUser | int | `10000` | | -| serverPort | int | `8888` | configuration of the spring boot server | -| service.port | int | `8888` | | -| 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 | -| serviceAccount.annotations | object | `{}` | | -| serviceAccount.create | bool | `true` | | -| serviceAccount.name | string | `""` | | -| tolerations | list | `[]` | | - ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) diff --git a/consumer-backend/helm-chart/digital-product-pass/templates/NOTES.txt b/consumer-backend/helm-chart/digital-product-pass/templates/NOTES.txt deleted file mode 100644 index 8b4cbc0c3..000000000 --- a/consumer-backend/helm-chart/digital-product-pass/templates/NOTES.txt +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################# -# Catena-X - Product Passport Consumer Application -# -# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the -# License for the specific language govern in permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -################################################################################# - -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "digital-product-pass.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "digital-product-pass.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "digital-product-pass.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "digital-product-pass.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT -{{- end }} diff --git a/consumer-backend/helm-chart/digital-product-pass/templates/_helpers.tpl b/consumer-backend/helm-chart/digital-product-pass/templates/_helpers.tpl deleted file mode 100644 index 8394da30e..000000000 --- a/consumer-backend/helm-chart/digital-product-pass/templates/_helpers.tpl +++ /dev/null @@ -1,84 +0,0 @@ -################################################################################# -# Catena-X - Product Passport Consumer Application -# -# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the -# License for the specific language govern in permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -#################################################################################e governing permissions and - -{{/* -Expand the name of the chart. -*/}} -{{- define "chart.name" -}} -{{- default .Chart.Name .Values.name | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "chart.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.name }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "chart.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "chart.labels" -}} -helm.sh/chart: {{ include "chart.chart" . }} -{{ include "chart.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "chart.selectorLabels" -}} -app.kubernetes.io/name: {{ include "chart.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "chart.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "chart.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/consumer-backend/helm-chart/digital-product-pass/templates/configmap.yaml b/consumer-backend/helm-chart/digital-product-pass/templates/configmap.yaml deleted file mode 100644 index 1617aa8d5..000000000 --- a/consumer-backend/helm-chart/digital-product-pass/templates/configmap.yaml +++ /dev/null @@ -1,144 +0,0 @@ -################################################################################# -# Catena-X - Product Passport Consumer Application -# -# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the -# License for the specific language govern in permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -################################################################################# - -apiVersion: v1 -kind: ConfigMap -metadata: - name: backend-config - namespace: {{ .Values.namespace }} -data: - application.yaml: |- - spring: - name: "Digital Product Passport Consumer Backend" - main: - allow-bean-definition-overriding: true - devtools: - add-properties: false - jackson: - serialization: - indent_output: true - logging: - level: - # -- general logging level - root: {{ tpl (.Values.logging.level.root | default "INFO") . | quote }} - # -- logging for the util components - utils: {{ tpl (.Values.logging.level.utils | default "INFO") . | quote }} - - configuration: - # -- max retries for the backend services - maxRetries: {{ .Values.maxRetries }} - # -- keycloak configuration - keycloak: - realm: {{ .Values.oauth.realm }} - resource: {{ .Values.oauth.appId }} - tokenUri: "https://{{ tpl (.Values.oauth.hostname | default "http://localhost") . }}/auth/realms/{{ .Values.oauth.realm }}/protocol/openid-connect/token" - userInfoUri: "https://{{ tpl (.Values.oauth.hostname | default "http://localhost") . }}/auth/realms/{{ .Values.oauth.realm }}/protocol/openid-connect/userinfo" - # -- edc consumer connection configuration - edc: - endpoint: "https://{{ .Values.edc.endpoint }}" - management: {{ .Values.edc.apis.management }} - catalog: {{ .Values.edc.apis.catalog }} - negotiation: {{ .Values.edc.apis.negotiation }} - transfer: {{ .Values.edc.apis.transfer }} - receiverEndpoint: "https://{{ .Values.hostname }}/endpoint" - delay: {{ .Values.edc.delay }} # -- Negotiation status Delay in milliseconds in between async requests [<= 500] - # -- security configuration - security: - check: - enabled: {{ .Values.securityCheck.enabled }} - bpn: {{ .Values.securityCheck.bpn }} - edc: {{ .Values.securityCheck.edc }} - # -- irs configuration - irs: - enabled: {{ .Values.irs.enabled }} # -- Enable search for children in the requests - endpoint: "https://{{ .Values.irs.hostname }}" # -- IRS endpoint - paths: - job: "/irs/jobs" # -- API path for calling in the IRS endpoints and staring/getting jobs - tree: - fileName: "treeDataModel" # -- Tree dataModel filename created in the processId directory - indent: true # -- Indent tree file - callbackUrl: "https://{{ .Values.hostname }}/api/irs" # -- Backend call back base url for the irs controller - # -- digital twin registry configuration - dtr: - # -- asset type to search for the registry in the edc - assetType: 'data.core.digitalTwinRegistry' - # -- submodel endpoint interface to search - endpointInterface: 'SUBMODEL-3.0' - # -- dsp endpoint key inside submodel body - dspEndpointKey: 'dspEndpoint' - # -- decentral digital twin apis - decentralApis: - search: {{ .Values.digitalTwinRegistry.endpoints.search }} - digitalTwin: {{ .Values.digitalTwinRegistry.endpoints.digitalTwin }} - subModel: {{ .Values.digitalTwinRegistry.endpoints.subModel }} - # -- timeouts for the digital twin registry async negotiation - timeouts: - search: {{ .Values.digitalTwinRegistry.timeouts.search }} - negotiation: {{ .Values.digitalTwinRegistry.timeouts.negotiation }} - transfer: {{ .Values.digitalTwinRegistry.timeouts.transfer }} - digitalTwin: {{ .Values.digitalTwinRegistry.timeouts.digitalTwin }} - # -- temporary storage of dDTRs for optimization - temporaryStorage: {{ .Values.digitalTwinRegistry.temporaryStorage.enabled }} - # -- discovery configuration - discovery: - # -- discovery finder configuration - endpoint: "https://{{ tpl (.Values.discovery.hostname | default "") . }}/api/v1.0/administration/connectors/discovery/search" - # -- bpn discovery configuration - bpn: - key: {{ tpl (.Values.discovery.bpnDiscovery.key | default "manufacturerPartId") . | quote }} - searchPath: {{ tpl (.Values.discovery.bpnDiscovery.path | default "") . | quote }} - # -- edc discovery configuration - edc: - key: {{ tpl (.Values.discovery.edcDiscovery.key | default "bpn") . | quote }} - # -- process configuration - process: - # -- directory for storing the contract negotiation files - dir: "process" - # -- indent the process negotiation files - indent: true - # -- unique sha512 hash key used for the passport encryption - signKey: {{ tpl (.Values.process.encryptionKey | default "") . | quote }} - # -- passport data transfer configuration - passport: - # -- configure the data transfer - dataTransfer: - # -- encrypt the passport when he arrives from the edc data plane - encrypt: true - # -- the indent from the passport - indent: true - # -- directory to store the passport when is not linked to a process - dir: "data/transfer" - # -- passport versions and aspects allowed - aspects: {{- toYaml .Values.passport.aspects | nindent 10 }} - # -- configuration of the spring boot server - server: - # -- configuration of backend errors - error: - include-message: ALWAYS - include-binding-errors: ALWAYS - include-stacktrace: ON_PARAM - include-exception: false - # -- listening port for the backend - port: {{ .Values.serverPort }} - # -- maximum allowed connections - tomcat: - max-connections: 10000 diff --git a/consumer-backend/helm-chart/digital-product-pass/templates/deployment.yaml b/consumer-backend/helm-chart/digital-product-pass/templates/deployment.yaml deleted file mode 100644 index 878639bd1..000000000 --- a/consumer-backend/helm-chart/digital-product-pass/templates/deployment.yaml +++ /dev/null @@ -1,123 +0,0 @@ -################################################################################# -# Catena-X - Product Passport Consumer Application -# -# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the -# License for the specific language govern in permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -################################################################################# - -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ .Values.name }} - labels: - {{- include "chart.labels" . | nindent 4 }} - namespace: {{ .Values.namespace }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "chart.selectorLabels" . | nindent 6 }} - component: backend - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "chart.selectorLabels" . | nindent 8 }} - component: backend - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "chart.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Values.name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - env: - - name: "client.id" - valueFrom: - secretKeyRef: - key: clientId - name: consumer-backend-oauth - - name: "client.secret" - valueFrom: - secretKeyRef: - key: clientSecret - name: consumer-backend-oauth - - name: "edc.apiKey" - valueFrom: - secretKeyRef: - key: xApiKey - name: consumer-edc - - name: "edc.participantId" - valueFrom: - secretKeyRef: - key: participantId - name: consumer-edc - volumeMounts: - - name: backend-config - mountPath: /app/config - - name: pvc-backend - mountPath: /app/data/process - subPath: data/process - - name: pvc-backend - mountPath: /app/log - subPath: log - ports: - - name: http - containerPort: 8888 - protocol: TCP - livenessProbe: - httpGet: - path: /health - port: http - readinessProbe: - httpGet: - path: /health - port: http - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} - volumes: - - name: backend-config - configMap: - name: backend-config - - name: pvc-backend - persistentVolumeClaim: - claimName: pvc-data diff --git a/consumer-backend/helm-chart/digital-product-pass/templates/ingress.yaml b/consumer-backend/helm-chart/digital-product-pass/templates/ingress.yaml deleted file mode 100644 index b02155bbb..000000000 --- a/consumer-backend/helm-chart/digital-product-pass/templates/ingress.yaml +++ /dev/null @@ -1,87 +0,0 @@ -################################################################################# -# Catena-X - Product Passport Consumer Application -# -# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the -# License for the specific language govern in permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -################################################################################# - -{{- if .Values.ingress.enabled -}} -{{- $fullName := .Values.name -}} -{{- $svcPort := .Values.service.port -}} -{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} - -# {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -# apiVersion: networking.k8s.io/v1 -# {{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -# apiVersion: networking.k8s.io/v1beta1 -# {{- else -}} -# apiVersion: extensions/v1beta1 -# {{- end }} - -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: {{ $fullName }} - namespace: {{ .Values.namespace }} - labels: - {{- include "chart.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/consumer-backend/helm-chart/digital-product-pass/templates/pvc-data.yaml b/consumer-backend/helm-chart/digital-product-pass/templates/pvc-data.yaml deleted file mode 100644 index b023691ae..000000000 --- a/consumer-backend/helm-chart/digital-product-pass/templates/pvc-data.yaml +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################# -# Catena-X - Product Passport Consumer Application -# -# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the -# License for the specific language govern in permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -################################################################################# - -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: pvc-data - labels: - {{- include "chart.labels" . | nindent 4 }} - namespace: {{ .Values.namespace }} -spec: - storageClassName: default - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 1Gi diff --git a/consumer-backend/helm-chart/digital-product-pass/templates/secret.yaml b/consumer-backend/helm-chart/digital-product-pass/templates/secret.yaml deleted file mode 100644 index c6ef854fa..000000000 --- a/consumer-backend/helm-chart/digital-product-pass/templates/secret.yaml +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################# -# Catena-X - Product Passport Consumer Application -# -# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the -# License for the specific language govern in permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -################################################################################# - -apiVersion: v1 -kind: Secret -metadata: - name: consumer-backend-oauth - labels: - {{- include "chart.labels" . | nindent 4 }} - namespace: {{ .Values.namespace }} -type: Opaque -stringData: - clientId: {{ .Values.oauth.techUser.clientId }} - clientSecret: {{ .Values.oauth.techUser.clientSecret }} ---- - -apiVersion: v1 -kind: Secret -metadata: - name: consumer-edc - labels: - {{- include "chart.labels" . | nindent 4 }} - namespace: {{ .Values.namespace }} -type: Opaque -stringData: - xApiKey: {{ .Values.edc.xApiKey }} - participantId: {{ .Values.edc.participantId }} diff --git a/consumer-backend/helm-chart/digital-product-pass/templates/service.yaml b/consumer-backend/helm-chart/digital-product-pass/templates/service.yaml deleted file mode 100644 index 0a094be7b..000000000 --- a/consumer-backend/helm-chart/digital-product-pass/templates/service.yaml +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################# -# Catena-X - Product Passport Consumer Application -# -# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the -# License for the specific language govern in permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -################################################################################# - -apiVersion: v1 -kind: Secret -metadata: - name: avp-consumer-backend-cx-registry-auth - labels: - {{- include "chart.labels" . | nindent 4 }} - namespace: {{ .Values.namespace }} -type: Opaque -stringData: - clientId: {{ .Values.oauth.techUser.clientId }} - clientSecret: {{ .Values.oauth.techUser.clientSecret }} ---- - -apiVersion: v1 -kind: Secret -metadata: - name: avp-consumer-backend-edc-oauth - labels: - {{- include "chart.labels" . | nindent 4 }} - namespace: {{ .Values.namespace }} -type: Opaque -stringData: - xApiKey: {{ .Values.edc.xApiKey }} - participantId: {{ .Values.edc.participantId }} diff --git a/consumer-backend/helm-chart/digital-product-pass/templates/serviceaccount.yaml b/consumer-backend/helm-chart/digital-product-pass/templates/serviceaccount.yaml deleted file mode 100644 index 26a57fa86..000000000 --- a/consumer-backend/helm-chart/digital-product-pass/templates/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "chart.serviceAccountName" . }} - labels: - {{- include "chart.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/consumer-backend/helm-chart/digital-product-pass/templates/tests/test-connection.yaml b/consumer-backend/helm-chart/digital-product-pass/templates/tests/test-connection.yaml deleted file mode 100644 index 4cb2c6e1a..000000000 --- a/consumer-backend/helm-chart/digital-product-pass/templates/tests/test-connection.yaml +++ /dev/null @@ -1,38 +0,0 @@ - ################################################################################# -# Catena-X - Product Passport Consumer Application -# -# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the -# License for the specific language govern in permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -################################################################################# - -apiVersion: v1 -kind: Pod -metadata: - name: dpp-test-connection - labels: - {{- include "chart.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: backend - image: busybox - command: ['/bin/sh','-c'] - args: ["i=0; wget '{{ .Values.name }}:{{ .Values.service.port }}'/health -O /dev/null; while [ $i -ne 5 ]; do wget '{{ .Values.name }}:{{ .Values.service.port }}'/health -O /dev/null; sleep 6; i=$(($i+1)); done"] - restartPolicy: Never - diff --git a/consumer-backend/helm-chart/digital-product-pass/values-dev.yaml b/consumer-backend/helm-chart/digital-product-pass/values-dev.yaml deleted file mode 100644 index 25e4ee2be..000000000 --- a/consumer-backend/helm-chart/digital-product-pass/values-dev.yaml +++ /dev/null @@ -1,70 +0,0 @@ -################################################################################# -# Catena-X - Product Passport Consumer Application -# -# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the -# License for the specific language govern in permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -################################################################################# - -ingress: - enabled: true - # className: "nginx" - annotations: - ingressClassName: nginx - # kubernetes.io/tls-acme: "true" - nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - nginx.ingress.kubernetes.io/ssl-passthrough: "false" - nginx.ingress.kubernetes.io/backend-protocol: "HTTP" - hosts: - - host: &hostname "materialpass.dev.demo.catena-x.net" - paths: - - path: / - pathType: Prefix - tls: - - secretName: tls-secret - hosts: - - *hostname - -edc: - xApiKey: - participantId: - endpoint: "materialpass.dev.demo.catena-x.net/consumer" - -hostname: *hostname - -securityCheck: - enabled: true - bpn: true - edc: true - -irs: - enabled: true - hostname: "materialpass-irs.dev.demo.catena-x.net" - -process: - encryptionKey: "" - -discovery: - hostname: "semantics.dev.demo.catena-x.net/discoveryfinder" - -oauth: - hostname: "centralidp.dev.demo.catena-x.net" - techUser: - clientId: - clientSecret: - realm: - appId: diff --git a/consumer-backend/helm-chart/digital-product-pass/values-int.yaml b/consumer-backend/helm-chart/digital-product-pass/values-int.yaml deleted file mode 100644 index 2b044ad98..000000000 --- a/consumer-backend/helm-chart/digital-product-pass/values-int.yaml +++ /dev/null @@ -1,68 +0,0 @@ -################################################################################# -# Catena-X - Product Passport Consumer Application -# -# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the -# License for the specific language govern in permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -################################################################################# - -ingress: - enabled: true - # className: "nginx" - annotations: - ingressClassName: nginx - # kubernetes.io/tls-acme: "true" - nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - nginx.ingress.kubernetes.io/ssl-passthrough: "false" - nginx.ingress.kubernetes.io/backend-protocol: "HTTP" - hosts: - - host: &hostname "materialpass.int.demo.catena-x.net" - paths: - - path: / - pathType: Prefix - tls: - - secretName: tls-secret - hosts: - - *hostname -edc: - xApiKey: - participantId: - endpoint: "materialpass.int.demo.catena-x.net/consumer" - -hostname: *hostname -securityCheck: - enabled: true - bpn: true - edc: true - -irs: - enabled: true - hostname: "materialpass-irs.int.demo.catena-x.net" - -process: - encryptionKey: "" - -discovery: - hostname: "semantics.int.demo.catena-x.net/discoveryfinder" - -oauth: - hostname: "centralidp.int.demo.catena-x.net" - techUser: - clientId: - clientSecret: - realm: - appId: diff --git a/consumer-backend/helm-chart/digital-product-pass/values.yaml b/consumer-backend/helm-chart/digital-product-pass/values.yaml deleted file mode 100644 index ebfa01b5d..000000000 --- a/consumer-backend/helm-chart/digital-product-pass/values.yaml +++ /dev/null @@ -1,193 +0,0 @@ -################################################################################# -# Catena-X - Product Passport Consumer Application -# -# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the -# License for the specific language govern in permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -################################################################################# - -# Default values for dpp-frontend. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -name: "dpp-backend" -replicaCount: 1 -namespace: "" - -image: - repository: docker.io/tractusx/digital-product-pass-backend - pullPolicy: Always -# -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) -imagePullSecrets: [] - -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 - port: 8888 - - -# -- ingress declaration to expose the dpp-backend service -ingress: - enabled: false - hosts: - - host: &hostname "localhost" - paths: - - path: / - pathType: Prefix - -# -- in this section we configure the values that are inserted as secrets in the backend -edc: - # -- the secret for assesing the edc management API - xApiKey: "" - # -- BPN Number - participantId: "" - # -- edc consumer connection configuration - endpoint: "" - apis: - management: '/management/v2' - catalog: '/catalog/request' - negotiation: '/contractnegotiations' - transfer: '/transferprocesses' - delay: 100 # -- Negotiation status Delay in milliseconds in between async requests [<= 500] - -# -- backend hostname (without protocol prefix [DEFAULT HTTPS] for security ) -hostname: *hostname -# -- configuration of the spring boot server -serverPort: 8888 - -logging: - level: - # -- general logging level - root: INFO - # -- logging for the util components - utils: INFO - -# -- Provide your custom configuration here (this overrides the DPP backend spring application.yaml) -# -- max retries for the backend services -maxRetries: 5 - - # -- security configuration -securityCheck: - enabled: false - bpn: false - edc: false - -# -- irs configuration -irs: - enabled: false - hostname: "" - -# -- digital twin registry configuration -process: - # -- unique sha512 hash key used for the passport encryption - encryptionKey: "" - -# -- passport data transfer configuration -passport: - # -- passport versions and aspects allowed - aspects: - - "urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport" - - "urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass" - - "urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass" - -digitalTwinRegistry: - endpoints: - search: "/lookup/shells" - digitalTwin: "/shell-descriptors" - subModel: "/submodel-descriptors" - # -- timeouts for the digital twin registry async negotiation - timeouts: - search: 10 - negotiation: 40 - transfer: 10 - digitalTwin: 20 - # -- temporary storage of dDTRs for optimization - temporaryStorage: - enabled: true - -# -- discovery configuration -discovery: - # -- discovery finder configuration - hostname: "" - # -- bpn discovery configuration - bpnDiscovery: - key: "manufacturerPartId" - path: "/api/v1.0/administration/connectors/bpnDiscovery/search" - # -- edc discovery configuration - edcDiscovery: - key: "bpn" - -# -- oauth configuration -oauth: - # -- url of the identity provider service - hostname: "" - # -- technical user keycloak central id credentials - # -- note: this credentials need to have access to the Discovery Finder, BPN Discovery and EDC Discovery - techUser: - clientId: "" - clientSecret: "" - realm: "" - appId: "" - onLoad: "login-required" - -podSecurityContext: - runAsUser: 10000 - fsGroup: 3000 - -securityContext: - readOnlyRootFilesystem: true - allowPrivilegeEscalation: false - runAsNonRoot: true - runAsUser: 10000 - runAsGroup: 3000 - -serviceAccount: - # Specifies whether a service account should be created - create: true - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -# Following Catena-X Helm Best Practices @url: https://catenax-ng.github.io/docs/kubernetes-basics/helm -# @url: https://cloud.google.com/blog/products/containers-kubernetes/kubernetes-best-practices-resource-requests-and-limits -resources: - limits: - cpu: 500m - memory: 512Mi - requests: - cpu: 250m - memory: 512Mi - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -podAnnotations: {} - -# [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes -nodeSelector: {} - -# [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes -tolerations: [] - -# [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on -affinity: {} diff --git a/docs/GETTING-STARTED.md b/docs/GETTING-STARTED.md index c16fc938c..06a9c7cd1 100644 --- a/docs/GETTING-STARTED.md +++ b/docs/GETTING-STARTED.md @@ -192,7 +192,7 @@ Link to the Integration (INT) environment: [https://materialpass.int.demo.catena - Reference docs: - [INSTALL.md](../INSTALL.md) - - [Productpass backend](../consumer-backend/productpass/readme.md) + - [Productpass backend](../backend/productpass/readme.md) Link to the Integration (INT) environment: [https://materialpass.int.demo.catena-x.net](https://materialpass.int.demo.catena-x.net/) diff --git a/docs/README.md b/docs/README.md index 6beca72c4..f054a21f9 100644 --- a/docs/README.md +++ b/docs/README.md @@ -124,7 +124,7 @@ You can find the backend documentation at the following location: | Name | Description | | ---------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------- | -| [Backend Documentation](./consumer-backend/productpass/readme.md) | Backend documentation Product Passport App +| [Backend Documentation](./backend/productpass/readme.md) | Backend documentation Product Passport App ## Infrastructure Documentation diff --git a/docs/admin guide/Admin_Guide.md b/docs/admin guide/Admin_Guide.md index 65e0711d7..cff34ede3 100644 --- a/docs/admin guide/Admin_Guide.md +++ b/docs/admin guide/Admin_Guide.md @@ -122,7 +122,7 @@ All the information about the backend services is described in this documentatio | Name | Location | Link | | ---- | -------- | ---- | -| Consumer Backend Guide | GitHub | [https://github.com/eclipse-tractusx/digital-product-pass/tree/main/consumer-backend/productpass/readme.md](https://github.com/eclipse-tractusx/digital-product-pass/tree/main/consumer-backend/productpass/readme.md) | +| Consumer Backend Guide | GitHub | [https://github.com/eclipse-tractusx/digital-product-pass/tree/main/backend/productpass/readme.md](https://github.com/eclipse-tractusx/digital-product-pass/tree/main/backend/productpass/readme.md) | | Open API - Swagger | GitHub | [https://materialpass.int.demo.catena-x.net/swagger-ui/index.html](https://materialpass.int.demo.catena-x.net/swagger-ui/index.html) | ### Backend Application Configuration @@ -130,7 +130,7 @@ The configurations of log levels and other variables can be set in the following | Name | Location | Link | |-----------------------------------| -------- |----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Backend Application Configuration | GitHub | [https://github.com/eclipse-tractusx/digital-product-pass/blob/main/consumer-backend/productpass/src/main/resources/application.yml](https://github.com/eclipse-tractusx/digital-product-pass/blob/main/consumer-backend/productpass/src/main/resources/application.yml) | +| Backend Application Configuration | GitHub | [https://github.com/eclipse-tractusx/digital-product-pass/blob/main/backend/productpass/src/main/resources/application.yml](https://github.com/eclipse-tractusx/digital-product-pass/blob/main/backend/productpass/src/main/resources/application.yml) | ### Spring Boot Configuration @@ -138,7 +138,7 @@ The Consumer Backend is running over a Spring Boot server, therefore a applicati | Name | Location | Link | | ---- | -------- | ---- | -| Spring Boot Server Configuration | GitHub | [https://github.com/eclipse-tractusx/digital-product-pass/blob/main/consumer-backend/productpass/src/main/resources/application.yml](https://github.com/eclipse-tractusx/digital-product-pass/blob/main/consumer-backend/productpass/src/main/resources/application.yml) | +| Spring Boot Server Configuration | GitHub | [https://github.com/eclipse-tractusx/digital-product-pass/blob/main/backend/productpass/src/main/resources/application.yml](https://github.com/eclipse-tractusx/digital-product-pass/blob/main/backend/productpass/src/main/resources/application.yml) | All the application utilizes these variables to configure the utilities (tools) and other controllers/services. @@ -149,7 +149,7 @@ In order to manage the logs from the application a XML file was set, it contains | Name | Location | Link | | ---- | -------- | ---- | -| Spring Boot Logging Configuration | GitHub | [https://github.com/eclipse-tractusx/digital-product-pass/blob/main/consumer-backend/productpass/src/main/resources/logback-spring.xml](https://github.com/eclipse-tractusx/digital-product-pass/blob/main/consumer-backend/productpass/src/main/resources/logback-spring.xml) | +| Spring Boot Logging Configuration | GitHub | [https://github.com/eclipse-tractusx/digital-product-pass/blob/main/backend/productpass/src/main/resources/logback-spring.xml](https://github.com/eclipse-tractusx/digital-product-pass/blob/main/backend/productpass/src/main/resources/logback-spring.xml) | ## Postman Collection diff --git a/sonar-project.properties b/sonar-project.properties index f546ec30f..e7a882a6c 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -25,6 +25,6 @@ sonar.organization=catenax-ng sonar.javascript.lcov.reportPaths= ./coverage/lcov.info sonar.coverage.exclusions=src/**/index.js sonar.java.binaries=**/target/classes -sonar.exclusions=consumer-backend/materialpass/target/** -#sonar.exclusions=consumer-backend/** +sonar.exclusions=backend/materialpass/target/** +#sonar.exclusions=backend/** sonar.sourceEncoding=UTF-8 From e2008f33b670522caa545529495d59bf56d8d140 Mon Sep 17 00:00:00 2001 From: Mathias Brunkow Moser Date: Fri, 22 Dec 2023 17:25:49 +0100 Subject: [PATCH 08/11] chore: updated changelog with new structure --- CHANGELOG.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cc638b06..39d176d86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,52 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [released] +## [v2.0.0] - 22-12-2023 + +## Added + +- Added components to display a Transmission Pass in frontend +- Added MOCK file with the transmission pass in frontend +- Added permission listener & reloader in frontend +- Added camera toggle component in frontend +- Added Decentral Digital Twin Registry configuration payloads +- Added IRS configuration guide +- New Data Retrieval Guide added with detailed information how to retrieve data in Catena-X like the DPP. +- Added new structure of files for the Arc42 +- Added new Authentication & Authorization chapter in the Arc42 +- Added detailed description next to the API diagrams at the Arc42 +- Added IRS Integration documentation at the Arc42 +- Added diagrams in xml form for further edition +- Added Check of BPN Number in Frontend (With Trigger in Configuration) +- Added Check of BPN Number in Backend (With Trigger in Configuration) +- Added Check for appId Roles in Frontend (With Trigger in Configuration) +- Added Check for appId Roles in Backend (With Trigger in Configuration) +- Added new security checks in the backend and frontend +- Added new non authorized view in the frontend +- Added script to retrieve any type of aspect data using the dpp backend component +- Added [README.md](./deployment/infrastructure/README.md) on how to execute the script with certain parameters + +## Updated + +- Refactor frontend code to be compliant with transmission pass 2.0.0. +- Refactor Responsiveness of frontend +- Updated URL check in frontend +- Corrected the payloads ids and the configurations +- Updated the Install.md file with a section to install the prerequisites and configure values.yaml files +- Updated the file structure from the Arc42 +- Updated data retrieval api diagrams with better quality +- Updated context diagram with a new easy context +- Updated Arc42 Descriptions in the Technical Integration chapter +- Updated data uploading script by adding physical dimensions aspect +- Refactored helm chart values configuration. +- Refactored backend values chart configuration +- Update the IRS version to 4.2.0 +- Adapted the springboot configuration structure +- Update the default policies +- [BREAKING CHANGES]: Updated the path from the backend from `/consumer-backend` to just `/dpp-backend` to declare the to standalone application + + ## [released] ## [v1.4.0] - 14-12-2023 From 5108bc1e724a5c404d51fc083f358ecf1c27614b Mon Sep 17 00:00:00 2001 From: Mathias Moser <71728767+matbmoser@users.noreply.github.com> Date: Fri, 22 Dec 2023 17:43:36 +0100 Subject: [PATCH 09/11] [BREAKING CHANGE]: changed the backend path to `dpp-backend/digitalproductpass` and also the namespace to the correct one: org.eclipse.tractusx.digitalproductpass --- .github/workflows/helm-test.yaml | 4 +- .../publish-dpp-backend-docker-image.yml | 8 +-- .github/workflows/sonar-scan.yaml | 2 +- .github/workflows/trivy.yml | 6 +-- .github/workflows/veracode-pipeline.yml | 2 +- .github/workflows/veracode-upload.yml | 2 +- INSTALL.md | 6 +-- README.md | 4 +- docs/GETTING-STARTED.md | 2 +- docs/README.md | 2 +- docs/admin guide/Admin_Guide.md | 10 ++-- .../DataRetrievalGuide.md | 2 +- .../User Manual Product Viewer App.md | 2 +- .../digital-product-pass-backend/.helmignore | 0 .../digital-product-pass-backend/Chart.yaml | 0 .../digital-product-pass-backend/LICENSE | 0 .../digital-product-pass-backend/README.md | 0 .../templates/NOTES.txt | 0 .../templates/_helpers.tpl | 0 .../templates/configmap.yaml | 0 .../templates/deployment.yaml | 0 .../templates/ingress.yaml | 0 .../templates/pvc-data.yaml | 0 .../templates/secret.yaml | 0 .../templates/service.yaml | 0 .../templates/serviceaccount.yaml | 0 .../templates/tests/test-connection.yaml | 0 .../values-dev.yaml | 0 .../values-int.yaml | 0 .../digital-product-pass-backend/values.yaml | 0 .../digitalproductpass}/.gitattributes | 0 .../digitalproductpass}/.gitignore | 0 .../.mvn/wrapper/maven-wrapper.properties | 0 .../digitalproductpass}/Dockerfile | 4 +- .../digitalproductpass}/deploy.sh | 0 .../digitalproductpass}/docs/media/img.png | Bin .../digitalproductpass}/docs/media/img2.png | Bin .../digitalproductpass}/docs/media/img3.png | Bin .../digitalproductpass}/docs/media/img4.png | Bin .../docs/tests/unitTest.md | 0 .../digitalproductpass}/mvnw | 0 .../digitalproductpass}/mvnw.cmd | 0 .../product-passport-consumer-backend.json | 0 .../digitalproductpass}/pom.xml | 2 +- .../digitalproductpass}/readme.md | 0 .../digitalproductpass}/Application.java | 4 +- .../digitalproductpass}/config/AppConfig.java | 2 +- .../config/DiscoveryConfig.java | 2 +- .../digitalproductpass}/config/DtrConfig.java | 2 +- .../digitalproductpass}/config/IrsConfig.java | 2 +- .../config/PassportConfig.java | 2 +- .../config/ProcessConfig.java | 2 +- .../config/SecurityConfig.java | 2 +- .../config/ThreadConfig.java | 2 +- .../config/VaultConfig.java | 2 +- .../digitalproductpass}/config/WebConfig.java | 2 +- .../exceptions/ConfigException.java | 2 +- .../exceptions/ControllerException.java | 2 +- .../exceptions/DataModelException.java | 2 +- .../exceptions/ManagerException.java | 2 +- .../exceptions/ServiceException.java | 2 +- .../ServiceInitializationException.java | 2 +- .../http/controllers/AppController.java | 46 +++++++++--------- .../http/controllers/api/ApiController.java | 26 +++++----- .../controllers/api/ContractController.java | 46 +++++++++--------- .../http/controllers/api/IrsController.java | 28 +++++------ .../http/controllers/auth/AuthController.java | 10 ++-- .../error/ErrorResponseController.java | 4 +- .../http/middleware/BaseInterceptor.java | 2 +- .../http/middleware/InterceptorConfig.java | 2 +- .../ServiceInitializationInterface.java | 4 +- .../listeners/AppListener.java | 20 ++++---- .../managers/DtrSearchManager.java | 24 ++++----- .../managers/ProcessDataModel.java | 6 +-- .../managers/ProcessManager.java | 30 ++++++------ .../managers/TreeManager.java | 30 ++++++------ .../models/auth/Credential.java | 2 +- .../models/auth/JwtToken.java | 2 +- .../models/auth/UserCredential.java | 2 +- .../models/auth/UserInfo.java | 2 +- .../models/catenax/BpnDiscovery.java | 2 +- .../models/catenax/Discovery.java | 2 +- .../models/catenax/Dtr.java | 2 +- .../models/catenax/EdcDiscoveryEndpoint.java | 2 +- .../models/dtregistry/DigitalTwin.java | 2 +- .../models/dtregistry/EndPoint.java | 2 +- .../models/dtregistry/SubModel.java | 2 +- .../models/edc/AssetSearch.java | 2 +- .../models/edc/DataPlaneEndpoint.java | 4 +- .../digitalproductpass}/models/edc/Jwt.java | 2 +- .../models/http/Response.java | 2 +- .../models/http/requests/DiscoverySearch.java | 2 +- .../models/http/requests/Search.java | 2 +- .../models/http/requests/TokenRequest.java | 2 +- .../models/http/responses/IdResponse.java | 4 +- .../digitalproductpass}/models/irs/Job.java | 2 +- .../models/irs/JobHistory.java | 2 +- .../models/irs/JobRequest.java | 2 +- .../models/irs/JobResponse.java | 4 +- .../models/irs/Relationship.java | 2 +- .../models/manager/History.java | 2 +- .../models/manager/Node.java | 6 +-- .../models/manager/NodeComponent.java | 2 +- .../models/manager/Process.java | 2 +- .../models/manager/SearchStatus.java | 8 +-- .../models/manager/Status.java | 4 +- .../models/negotiation/Catalog.java | 2 +- .../models/negotiation/CatalogRequest.java | 2 +- .../models/negotiation/Constraint.java | 2 +- .../models/negotiation/DataService.java | 2 +- .../models/negotiation/Dataset.java | 2 +- .../models/negotiation/DidDocument.java | 2 +- .../models/negotiation/Distribution.java | 2 +- .../models/negotiation/EdcResponse.java | 2 +- .../models/negotiation/Negotiation.java | 2 +- .../negotiation/NegotiationRequest.java | 2 +- .../models/negotiation/Offer.java | 2 +- .../models/negotiation/Properties.java | 2 +- .../models/negotiation/Set.java | 2 +- .../models/negotiation/Transfer.java | 2 +- .../models/negotiation/TransferRequest.java | 2 +- .../models/passports/PassportResponse.java | 2 +- .../models/service/BaseService.java | 6 +-- .../services/AasService.java | 36 +++++++------- .../services/AuthenticationService.java | 16 +++--- .../services/CatenaXService.java | 24 ++++----- .../services/DataPlaneService.java | 10 ++-- .../services/DataTransferService.java | 30 ++++++------ .../services/IrsService.java | 20 ++++---- .../services/VaultService.java | 10 ++-- .../src/main/java/utils/CatenaXUtil.java | 2 +- .../src/main/java/utils/CrypUtil.java | 0 .../src/main/java/utils/CsvUtil.java | 0 .../src/main/java/utils/DateTimeUtil.java | 0 .../src/main/java/utils/EdcUtil.java | 2 +- .../src/main/java/utils/FileUtil.java | 0 .../src/main/java/utils/HttpUtil.java | 4 +- .../src/main/java/utils/JsonUtil.java | 0 .../src/main/java/utils/LogUtil.java | 0 .../src/main/java/utils/NumericUtil.java | 0 .../src/main/java/utils/PassportUtil.java | 4 +- .../src/main/java/utils/ReflectionUtil.java | 0 .../src/main/java/utils/StringUtil.java | 0 .../src/main/java/utils/SystemUtil.java | 0 .../src/main/java/utils/ThreadUtil.java | 0 .../src/main/java/utils/YamlUtil.java | 0 .../java/utils/exceptions/UtilException.java | 0 .../src/main/resources/application.yml | 2 +- .../src/main/resources/logback-spring.xml | 0 .../src/test/java/utils/CrypUtilTest.java | 0 .../src/test/java/utils/JsonUtilTest.java | 0 .../src/test/java/utils/LogUtilTest.java | 0 .../src/test/java/utils/SystemUtilTest.java | 0 .../src/test/java/utils/YamlUtilTest.java | 0 {backend => dpp-backend}/scripts/README.md | 0 {backend => dpp-backend}/scripts/get-data.sh | 0 .../scripts/getPassport.py | 0 .../scripts/utilities/authentication.py | 0 .../scripts/utilities/constants.py | 0 .../scripts/utilities/httpUtils.py | 0 .../scripts/utilities/operators.py | 0 sonar-project.properties | 4 +- 162 files changed, 326 insertions(+), 326 deletions(-) rename {backend => dpp-backend}/charts/digital-product-pass-backend/.helmignore (100%) rename {backend => dpp-backend}/charts/digital-product-pass-backend/Chart.yaml (100%) rename {backend => dpp-backend}/charts/digital-product-pass-backend/LICENSE (100%) rename {backend => dpp-backend}/charts/digital-product-pass-backend/README.md (100%) rename {backend => dpp-backend}/charts/digital-product-pass-backend/templates/NOTES.txt (100%) rename {backend => dpp-backend}/charts/digital-product-pass-backend/templates/_helpers.tpl (100%) rename {backend => dpp-backend}/charts/digital-product-pass-backend/templates/configmap.yaml (100%) rename {backend => dpp-backend}/charts/digital-product-pass-backend/templates/deployment.yaml (100%) rename {backend => dpp-backend}/charts/digital-product-pass-backend/templates/ingress.yaml (100%) rename {backend => dpp-backend}/charts/digital-product-pass-backend/templates/pvc-data.yaml (100%) rename {backend => dpp-backend}/charts/digital-product-pass-backend/templates/secret.yaml (100%) rename {backend => dpp-backend}/charts/digital-product-pass-backend/templates/service.yaml (100%) rename {backend => dpp-backend}/charts/digital-product-pass-backend/templates/serviceaccount.yaml (100%) rename {backend => dpp-backend}/charts/digital-product-pass-backend/templates/tests/test-connection.yaml (100%) rename {backend => dpp-backend}/charts/digital-product-pass-backend/values-dev.yaml (100%) rename {backend => dpp-backend}/charts/digital-product-pass-backend/values-int.yaml (100%) rename {backend => dpp-backend}/charts/digital-product-pass-backend/values.yaml (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/.gitattributes (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/.gitignore (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/.mvn/wrapper/maven-wrapper.properties (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/Dockerfile (92%) rename {backend/productpass => dpp-backend/digitalproductpass}/deploy.sh (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/docs/media/img.png (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/docs/media/img2.png (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/docs/media/img3.png (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/docs/media/img4.png (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/docs/tests/unitTest.md (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/mvnw (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/mvnw.cmd (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/openapi/product-passport-consumer-backend.json (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/pom.xml (99%) rename {backend/productpass => dpp-backend/digitalproductpass}/readme.md (100%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/Application.java (96%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/config/AppConfig.java (96%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/config/DiscoveryConfig.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/config/DtrConfig.java (99%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/config/IrsConfig.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/config/PassportConfig.java (97%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/config/ProcessConfig.java (97%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/config/SecurityConfig.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/config/ThreadConfig.java (97%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/config/VaultConfig.java (97%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/config/WebConfig.java (97%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/exceptions/ConfigException.java (97%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/exceptions/ControllerException.java (97%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/exceptions/DataModelException.java (97%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/exceptions/ManagerException.java (97%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/exceptions/ServiceException.java (97%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/exceptions/ServiceInitializationException.java (97%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/http/controllers/AppController.java (89%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/http/controllers/api/ApiController.java (90%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/http/controllers/api/ContractController.java (95%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/http/controllers/api/IrsController.java (93%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/http/controllers/auth/AuthController.java (95%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/http/controllers/error/ErrorResponseController.java (96%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/http/middleware/BaseInterceptor.java (97%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/http/middleware/InterceptorConfig.java (95%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/interfaces/ServiceInitializationInterface.java (90%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/listeners/AppListener.java (94%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/managers/DtrSearchManager.java (96%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/managers/ProcessDataModel.java (96%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/managers/ProcessManager.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/managers/TreeManager.java (95%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/auth/Credential.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/auth/JwtToken.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/auth/UserCredential.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/auth/UserInfo.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/catenax/BpnDiscovery.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/catenax/Discovery.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/catenax/Dtr.java (97%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/catenax/EdcDiscoveryEndpoint.java (97%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/dtregistry/DigitalTwin.java (99%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/dtregistry/EndPoint.java (99%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/dtregistry/SubModel.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/edc/AssetSearch.java (97%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/edc/DataPlaneEndpoint.java (96%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/edc/Jwt.java (96%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/http/Response.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/http/requests/DiscoverySearch.java (96%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/http/requests/Search.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/http/requests/TokenRequest.java (97%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/http/responses/IdResponse.java (94%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/irs/Job.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/irs/JobHistory.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/irs/JobRequest.java (99%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/irs/JobResponse.java (96%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/irs/Relationship.java (99%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/manager/History.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/manager/Node.java (96%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/manager/NodeComponent.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/manager/Process.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/manager/SearchStatus.java (92%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/manager/Status.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/negotiation/Catalog.java (97%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/negotiation/CatalogRequest.java (99%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/negotiation/Constraint.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/negotiation/DataService.java (96%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/negotiation/Dataset.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/negotiation/DidDocument.java (96%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/negotiation/Distribution.java (97%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/negotiation/EdcResponse.java (96%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/negotiation/Negotiation.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/negotiation/NegotiationRequest.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/negotiation/Offer.java (96%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/negotiation/Properties.java (95%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/negotiation/Set.java (97%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/negotiation/Transfer.java (99%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/negotiation/TransferRequest.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/passports/PassportResponse.java (96%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/models/service/BaseService.java (91%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/services/AasService.java (95%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/services/AuthenticationService.java (94%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/services/CatenaXService.java (96%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/services/DataPlaneService.java (94%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/services/DataTransferService.java (98%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/services/IrsService.java (93%) rename {backend/productpass/src/main/java/org/eclipse/tractusx/productpass => dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass}/services/VaultService.java (96%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/main/java/utils/CatenaXUtil.java (98%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/main/java/utils/CrypUtil.java (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/main/java/utils/CsvUtil.java (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/main/java/utils/DateTimeUtil.java (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/main/java/utils/EdcUtil.java (97%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/main/java/utils/FileUtil.java (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/main/java/utils/HttpUtil.java (99%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/main/java/utils/JsonUtil.java (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/main/java/utils/LogUtil.java (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/main/java/utils/NumericUtil.java (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/main/java/utils/PassportUtil.java (97%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/main/java/utils/ReflectionUtil.java (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/main/java/utils/StringUtil.java (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/main/java/utils/SystemUtil.java (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/main/java/utils/ThreadUtil.java (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/main/java/utils/YamlUtil.java (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/main/java/utils/exceptions/UtilException.java (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/main/resources/application.yml (98%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/main/resources/logback-spring.xml (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/test/java/utils/CrypUtilTest.java (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/test/java/utils/JsonUtilTest.java (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/test/java/utils/LogUtilTest.java (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/test/java/utils/SystemUtilTest.java (100%) rename {backend/productpass => dpp-backend/digitalproductpass}/src/test/java/utils/YamlUtilTest.java (100%) rename {backend => dpp-backend}/scripts/README.md (100%) rename {backend => dpp-backend}/scripts/get-data.sh (100%) rename {backend => dpp-backend}/scripts/getPassport.py (100%) rename {backend => dpp-backend}/scripts/utilities/authentication.py (100%) rename {backend => dpp-backend}/scripts/utilities/constants.py (100%) rename {backend => dpp-backend}/scripts/utilities/httpUtils.py (100%) rename {backend => dpp-backend}/scripts/utilities/operators.py (100%) diff --git a/.github/workflows/helm-test.yaml b/.github/workflows/helm-test.yaml index 09180cf04..18b85aecc 100644 --- a/.github/workflows/helm-test.yaml +++ b/.github/workflows/helm-test.yaml @@ -85,14 +85,14 @@ jobs: # Build Java code with Maven - name: Build dpp backend with maven run: | - cd backend/productpass + cd dpp-backend/digitalproductpass mvn -B clean install - name: Build image for backend id: build-backend uses: docker/build-push-action@v3 with: - context: backend/productpass + context: dpp-backend/digitalproductpass push: true tags: ${{ env.REGISTRY }}/${{ env.BACKEND_IMAGE}}:${{ env.TAG }} diff --git a/.github/workflows/publish-dpp-backend-docker-image.yml b/.github/workflows/publish-dpp-backend-docker-image.yml index 1ac66d8c2..30eaf7a41 100644 --- a/.github/workflows/publish-dpp-backend-docker-image.yml +++ b/.github/workflows/publish-dpp-backend-docker-image.yml @@ -93,7 +93,7 @@ jobs: - name: Build dpp backend with maven for GHCR registry if: ${{ github.repository != 'eclipse-tractusx/digital-product-pass' }} run: | - cd backend/productpass + cd dpp-backend/digitalproductpass mvn -B clean install # Build and push Docker image with Buildx @@ -103,7 +103,7 @@ jobs: if: ${{ github.repository != 'eclipse-tractusx/digital-product-pass' }} uses: docker/build-push-action@v3 with: - context: backend/productpass + context: dpp-backend/digitalproductpass push: true tags: ${{ steps.meta-for-ghcr.outputs.tags }}, ${{ env.REGISTRY }}/${{ github.repository }}/${{ env.IMAGE_NAME }}:latest labels: ${{ steps.meta-for-ghcr.outputs.labels }} @@ -141,7 +141,7 @@ jobs: - name: Build dpp backend with maven for Docker Hub if: ${{ github.repository == 'eclipse-tractusx/digital-product-pass' }} run: | - cd backend/productpass + cd dpp-backend/digitalproductpass mvn -B clean install # Build and push Docker image with Buildx @@ -151,7 +151,7 @@ jobs: if: ${{ github.repository == 'eclipse-tractusx/digital-product-pass' }} uses: docker/build-push-action@v3 with: - context: backend/productpass + context: dpp-backend/digitalproductpass push: true tags: ${{ steps.meta-for-dockerhub.outputs.tags }}, ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}:latest labels: ${{ steps.meta-for-dockerhub.outputs.labels }} diff --git a/.github/workflows/sonar-scan.yaml b/.github/workflows/sonar-scan.yaml index 4569fce5a..5d5bcb64a 100644 --- a/.github/workflows/sonar-scan.yaml +++ b/.github/workflows/sonar-scan.yaml @@ -83,7 +83,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | - cd backend/productpass + cd dpp-backend/digitalproductpass mvn -B install org.sonarsource.scanner.maven:sonar-maven-plugin:sonar # cannot scan frontend component in one sonar cloud project where backend is also running, because frontend implemented in different technology diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index bb0d24849..3eb748032 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -150,14 +150,14 @@ jobs: # Build Java code with Maven - name: Build JAR run: | - cd backend/productpass + cd dpp-backend/digitalproductpass mvn -B clean install - name: Build backend image from Dockerfile - GHCR id: build-docker-backend-ghcr if: ${{ github.repository != 'eclipse-tractusx/digital-product-pass' }} run: | - cd backend/productpass + cd dpp-backend/digitalproductpass docker build -t ${{ env.REGISTRY }}/${{ github.repository }}/${{ env.BACKEND_IMAGE_NAME }}:latest . # Build action for docker hub registry @@ -165,7 +165,7 @@ jobs: id: build-docker-backend-dockerhub if: ${{ github.repository == 'eclipse-tractusx/digital-product-pass' }} run: | - cd backend/productpass + cd dpp-backend/digitalproductpass docker build -t ${{ env.IMAGE_NAMESPACE }}/${{ env.BACKEND_IMAGE_NAME }}:latest . - name: Run Trivy vulnerability scanner - GHCR diff --git a/.github/workflows/veracode-pipeline.yml b/.github/workflows/veracode-pipeline.yml index 4c05b4c85..f5da6d93f 100644 --- a/.github/workflows/veracode-pipeline.yml +++ b/.github/workflows/veracode-pipeline.yml @@ -79,7 +79,7 @@ jobs: - name: build run: | - cd backend/productpass + cd dpp-backend/digitalproductpass mvn dependency:purge-local-repository clean verify - run: zip -r veracode-scan-target.zip ./ diff --git a/.github/workflows/veracode-upload.yml b/.github/workflows/veracode-upload.yml index 525972bf6..17982a132 100644 --- a/.github/workflows/veracode-upload.yml +++ b/.github/workflows/veracode-upload.yml @@ -57,7 +57,7 @@ jobs: - name: build run: | - cd backend/productpass + cd dpp-backend/digitalproductpass mvn dependency:purge-local-repository clean verify - run: zip -r veracode-scan-target.zip ./ diff --git a/INSTALL.md b/INSTALL.md index 068163291..bc8edb8b1 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -59,7 +59,7 @@ kubectl get pods -n product-material-pass --no-headers | awk '{if ($1 ~ "consum ``` **Example**: -![img4.png](./backend/productpass/docs/media/img4.png) +![img4.png](./dpp-backend/digitalproductpass/docs/media/img4.png) Copy the pod name with the prefix `consumer-backend` @@ -88,7 +88,7 @@ Use the following commands to install/compile the application: ### Compile Backend ```bash -cd backend/productpass +cd dpp-backend/digitalproductpass mvn clean install test ``` @@ -98,7 +98,7 @@ Substitute the `` variable with the current version of the Digital Prod ```bash -./target/productpass--SNAPSHOT.jar +./target/digitalproductpass--SNAPSHOT.jar ``` ### Configure the secrets diff --git a/README.md b/README.md index 63b5f58a6..7b89bd918 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ To get started you can have a look into our documentation: | [Arc42](./docs/arc42/Arc42.md) | Main Architecture Document (Arc42) of Digital Product Pass Application | | [Administration Guide](./docs/admin%20guide/Admin_Guide.md) | Administration Guide explaining the infrastructure and how to configure the application | | [Data Retrieval Guide](./docs/data%20retrieval%20guide/DataRetrievalGuide.md) | Guide on how to retrieve data from the Catena-X Network as the Digital Product Pass | -| [Backend Documentation](./backend/productpass/readme.md) | Backend documentation Product Passport App | +| [Backend Documentation](./dpp-backend/digitalproductpass/readme.md) | Backend documentation Product Passport App | | [Deployment in Hotel Budapest](./deployment/README.md) | Technical Guide - Deployment in ArgoCD Hotel Budapest (integration environment) | | [Docker Overview](./docker/README.md) | Overview on general docker commands | | [Keycloak Overview](./docker/local/Keycloak/README.md) | This guide describes how to setup a keycloak instance in local docker container and import existing realm.json file. | @@ -99,7 +99,7 @@ Eclipse Tractus-X product(s) installed within the image: - Project home: https://projects.eclipse.org/projects/automotive.tractusx - Dockerfiles: - Frontend: https://github.com/eclipse-tractusx/digital-product-pass/blob/main/Dockerfile - - Backend: https://github.com/eclipse-tractusx/digital-product-pass/blob/main/backend/productpass/Dockerfile + - Backend: https://github.com/eclipse-tractusx/digital-product-pass/blob/main/dpp-backend/digitalproductpass/Dockerfile - Project License: [Apache License, Version 2.0](https://raw.githubusercontent.com/eclipse-tractusx/digital-product-pass/main/LICENSE) diff --git a/docs/GETTING-STARTED.md b/docs/GETTING-STARTED.md index 06a9c7cd1..e2a1e0dfc 100644 --- a/docs/GETTING-STARTED.md +++ b/docs/GETTING-STARTED.md @@ -192,7 +192,7 @@ Link to the Integration (INT) environment: [https://materialpass.int.demo.catena - Reference docs: - [INSTALL.md](../INSTALL.md) - - [Productpass backend](../backend/productpass/readme.md) + - [Productpass backend](../backend/digitalproductpass/readme.md) Link to the Integration (INT) environment: [https://materialpass.int.demo.catena-x.net](https://materialpass.int.demo.catena-x.net/) diff --git a/docs/README.md b/docs/README.md index f054a21f9..9525b42e6 100644 --- a/docs/README.md +++ b/docs/README.md @@ -124,7 +124,7 @@ You can find the backend documentation at the following location: | Name | Description | | ---------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------- | -| [Backend Documentation](./backend/productpass/readme.md) | Backend documentation Product Passport App +| [Backend Documentation](./dpp-backend/digitalproductpass/readme.md) | Backend documentation Product Passport App ## Infrastructure Documentation diff --git a/docs/admin guide/Admin_Guide.md b/docs/admin guide/Admin_Guide.md index a73d34465..fdb500ff4 100644 --- a/docs/admin guide/Admin_Guide.md +++ b/docs/admin guide/Admin_Guide.md @@ -125,7 +125,7 @@ All the information about the backend services is described in this documentatio | Name | Location | Link | | ---- | -------- | ---- | -| Consumer Backend Guide | GitHub | [https://github.com/eclipse-tractusx/digital-product-pass/tree/main/backend/productpass/readme.md](https://github.com/eclipse-tractusx/digital-product-pass/tree/main/backend/productpass/readme.md) | +| Consumer Backend Guide | GitHub | [https://github.com/eclipse-tractusx/digital-product-pass/tree/main/dpp-backend/digitalproductpass/readme.md](https://github.com/eclipse-tractusx/digital-product-pass/tree/main/dpp-backend/digitalproductpass/readme.md) | | Open API - Swagger | GitHub | [https://materialpass.int.demo.catena-x.net/swagger-ui/index.html](https://materialpass.int.demo.catena-x.net/swagger-ui/index.html) | ### Backend Application Configuration @@ -133,7 +133,7 @@ The configurations of log levels and other variables can be set in the following | Name | Location | Link | |-----------------------------------| -------- |----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Backend Application Configuration | GitHub | [https://github.com/eclipse-tractusx/digital-product-pass/blob/main/backend/productpass/src/main/resources/application.yml](https://github.com/eclipse-tractusx/digital-product-pass/blob/main/backend/productpass/src/main/resources/application.yml) | +| Backend Application Configuration | GitHub | [https://github.com/eclipse-tractusx/digital-product-pass/blob/main/dpp-backend/digitalproductpass/src/main/resources/application.yml](https://github.com/eclipse-tractusx/digital-product-pass/blob/main/dpp-backend/digitalproductpass/src/main/resources/application.yml) | ### Spring Boot Configuration @@ -141,7 +141,7 @@ The Consumer Backend is running over a Spring Boot server, therefore a applicati | Name | Location | Link | | ---- | -------- | ---- | -| Spring Boot Server Configuration | GitHub | [https://github.com/eclipse-tractusx/digital-product-pass/blob/main/backend/productpass/src/main/resources/application.yml](https://github.com/eclipse-tractusx/digital-product-pass/blob/main/backend/productpass/src/main/resources/application.yml) | +| Spring Boot Server Configuration | GitHub | [https://github.com/eclipse-tractusx/digital-product-pass/blob/main/dpp-backend/digitalproductpass/src/main/resources/application.yml](https://github.com/eclipse-tractusx/digital-product-pass/blob/main/dpp-backend/digitalproductpass/src/main/resources/application.yml) | All the application utilizes these variables to configure the utilities (tools) and other controllers/services. @@ -152,7 +152,7 @@ In order to manage the logs from the application a XML file was set, it contains | Name | Location | Link | | ---- | -------- | ---- | -| Spring Boot Logging Configuration | GitHub | [https://github.com/eclipse-tractusx/digital-product-pass/blob/main/backend/productpass/src/main/resources/logback-spring.xml](https://github.com/eclipse-tractusx/digital-product-pass/blob/main/backend/productpass/src/main/resources/logback-spring.xml) | +| Spring Boot Logging Configuration | GitHub | [https://github.com/eclipse-tractusx/digital-product-pass/blob/main/dpp-backend/digitalproductpass/src/main/resources/logback-spring.xml](https://github.com/eclipse-tractusx/digital-product-pass/blob/main/dpp-backend/digitalproductpass/src/main/resources/logback-spring.xml) | ## Postman Collection @@ -198,7 +198,7 @@ When configurating you EDC provider you will be able to set some assets which re | AssetId | Combination of Digital Twin and Sub Model UUIDs | **Example value for asset**: urn:uuid:0ec8cf2b-f58e-3f13-b5ef-e7dd01d15b19
**Example value for registry**: digital-twin-registry | | AssetType | The type of the Asset | **Example value for asset**: Asset
**Example value for registry**: data.core.digitalTwinRegistry | | Description | Simple description of the asset | Battery Passport Test Data | -| DataProviderEndpointUrl | URL to the endpoint which stores and serves the data, basically a Database that retrieves plain text/json data for a certain API | **Example value for asset**: [https://materialpass.int.demo.catena-x.net/provider_backend/data/{{DigitalTwinSubmodelId}}](https://materialpass.int.demo.catena-x.net/provider_backend/data/{{DigitalTwinSubmodelId}})
**Example value for registry**: [https://materialpass.int.demo.catena-x.net/semantics/registry/api/v3.0](https://materialpass.int.demo.catena-x.net/semantics/registry/api/v3.0) | +| DataProviderEndpointUrl | URL to the endpoint which stores and serves the data, basically a Database that retrieves plain text/json data for a certain API | **Example value for asset**: [https://materialpass.int.demo.catena-x.net/provider_dpp-backend/data/{{DigitalTwinSubmodelId}}](https://materialpass.int.demo.catena-x.net/provider_dpp-backend/data/{{DigitalTwinSubmodelId}})
**Example value for registry**: [https://materialpass.int.demo.catena-x.net/semantics/registry/api/v3.0](https://materialpass.int.demo.catena-x.net/semantics/registry/api/v3.0) | | DigitalTwinId | Id from the Digital Twin | urn:uuid:de98db6e-8e05-5d8e-8ae8-9f702cf5c396 | | DigitalTwinSubmodelId | Sub Model Id registered in the Digital Twin Registry | urn:uuid:555c5513-5e52-2d7d-0904-fe90829252de | diff --git a/docs/data retrieval guide/DataRetrievalGuide.md b/docs/data retrieval guide/DataRetrievalGuide.md index ace2b1c73..fdb426436 100644 --- a/docs/data retrieval guide/DataRetrievalGuide.md +++ b/docs/data retrieval guide/DataRetrievalGuide.md @@ -60,7 +60,7 @@ Created: *25 August 2023* - [NOTICE](#notice) ## Introduction -The Catena-X Network Data Retrieval process can be really complex and challenging to understand. The `Digital Product Pass` application as consumer application is designed to retrieve information from the Catena-X Network in its native way. We as team proposed a solution for retrieving information in this decentralized network in a very efficient way. This solution is implemented in the [`Digital Product Pass Backend`](../../consumer-backend/productpass/readme.md) and can retrieve information in approximated `8-20s` using the algorithm and procedures documented in the [Arc42](../arc42/Arc42.md) documentation. +The Catena-X Network Data Retrieval process can be really complex and challenging to understand. The `Digital Product Pass` application as consumer application is designed to retrieve information from the Catena-X Network in its native way. We as team proposed a solution for retrieving information in this decentralized network in a very efficient way. This solution is implemented in the [`Digital Product Pass Backend`](../../consumer-dpp-backend/digitalproductpass/readme.md) and can retrieve information in approximated `8-20s` using the algorithm and procedures documented in the [Arc42](../arc42/Arc42.md) documentation. Therefore this guide is here to provide information about how to retrieve Data from the Catena-X Network like the `Digital Product Pass` application. Here we will describe the problem that many consumers application are facing then retrieving data in Catena-X and how we as the DPP Team propose our vision. diff --git a/docs/user manual/User Manual Product Viewer App.md b/docs/user manual/User Manual Product Viewer App.md index cb1fa9308..b7ea09038 100644 --- a/docs/user manual/User Manual Product Viewer App.md +++ b/docs/user manual/User Manual Product Viewer App.md @@ -83,7 +83,7 @@ If questions arise, you can access the Catena-X Helpdesk through clicking on "He After requesting data via one of the [product search functions](#search-for-a-product-passport), the information will be displayed on the screen. An exemplary product passport of a battery can be seen below. It provides an overview on the battery's history, technical specifications and data exchange information:

-![Product Pass](./ProductPassport.png) +![Product Pass](./digitalproductpassport.png)

Hereby, the information is devided into the following sections: diff --git a/backend/charts/digital-product-pass-backend/.helmignore b/dpp-backend/charts/digital-product-pass-backend/.helmignore similarity index 100% rename from backend/charts/digital-product-pass-backend/.helmignore rename to dpp-backend/charts/digital-product-pass-backend/.helmignore diff --git a/backend/charts/digital-product-pass-backend/Chart.yaml b/dpp-backend/charts/digital-product-pass-backend/Chart.yaml similarity index 100% rename from backend/charts/digital-product-pass-backend/Chart.yaml rename to dpp-backend/charts/digital-product-pass-backend/Chart.yaml diff --git a/backend/charts/digital-product-pass-backend/LICENSE b/dpp-backend/charts/digital-product-pass-backend/LICENSE similarity index 100% rename from backend/charts/digital-product-pass-backend/LICENSE rename to dpp-backend/charts/digital-product-pass-backend/LICENSE diff --git a/backend/charts/digital-product-pass-backend/README.md b/dpp-backend/charts/digital-product-pass-backend/README.md similarity index 100% rename from backend/charts/digital-product-pass-backend/README.md rename to dpp-backend/charts/digital-product-pass-backend/README.md diff --git a/backend/charts/digital-product-pass-backend/templates/NOTES.txt b/dpp-backend/charts/digital-product-pass-backend/templates/NOTES.txt similarity index 100% rename from backend/charts/digital-product-pass-backend/templates/NOTES.txt rename to dpp-backend/charts/digital-product-pass-backend/templates/NOTES.txt diff --git a/backend/charts/digital-product-pass-backend/templates/_helpers.tpl b/dpp-backend/charts/digital-product-pass-backend/templates/_helpers.tpl similarity index 100% rename from backend/charts/digital-product-pass-backend/templates/_helpers.tpl rename to dpp-backend/charts/digital-product-pass-backend/templates/_helpers.tpl diff --git a/backend/charts/digital-product-pass-backend/templates/configmap.yaml b/dpp-backend/charts/digital-product-pass-backend/templates/configmap.yaml similarity index 100% rename from backend/charts/digital-product-pass-backend/templates/configmap.yaml rename to dpp-backend/charts/digital-product-pass-backend/templates/configmap.yaml diff --git a/backend/charts/digital-product-pass-backend/templates/deployment.yaml b/dpp-backend/charts/digital-product-pass-backend/templates/deployment.yaml similarity index 100% rename from backend/charts/digital-product-pass-backend/templates/deployment.yaml rename to dpp-backend/charts/digital-product-pass-backend/templates/deployment.yaml diff --git a/backend/charts/digital-product-pass-backend/templates/ingress.yaml b/dpp-backend/charts/digital-product-pass-backend/templates/ingress.yaml similarity index 100% rename from backend/charts/digital-product-pass-backend/templates/ingress.yaml rename to dpp-backend/charts/digital-product-pass-backend/templates/ingress.yaml diff --git a/backend/charts/digital-product-pass-backend/templates/pvc-data.yaml b/dpp-backend/charts/digital-product-pass-backend/templates/pvc-data.yaml similarity index 100% rename from backend/charts/digital-product-pass-backend/templates/pvc-data.yaml rename to dpp-backend/charts/digital-product-pass-backend/templates/pvc-data.yaml diff --git a/backend/charts/digital-product-pass-backend/templates/secret.yaml b/dpp-backend/charts/digital-product-pass-backend/templates/secret.yaml similarity index 100% rename from backend/charts/digital-product-pass-backend/templates/secret.yaml rename to dpp-backend/charts/digital-product-pass-backend/templates/secret.yaml diff --git a/backend/charts/digital-product-pass-backend/templates/service.yaml b/dpp-backend/charts/digital-product-pass-backend/templates/service.yaml similarity index 100% rename from backend/charts/digital-product-pass-backend/templates/service.yaml rename to dpp-backend/charts/digital-product-pass-backend/templates/service.yaml diff --git a/backend/charts/digital-product-pass-backend/templates/serviceaccount.yaml b/dpp-backend/charts/digital-product-pass-backend/templates/serviceaccount.yaml similarity index 100% rename from backend/charts/digital-product-pass-backend/templates/serviceaccount.yaml rename to dpp-backend/charts/digital-product-pass-backend/templates/serviceaccount.yaml diff --git a/backend/charts/digital-product-pass-backend/templates/tests/test-connection.yaml b/dpp-backend/charts/digital-product-pass-backend/templates/tests/test-connection.yaml similarity index 100% rename from backend/charts/digital-product-pass-backend/templates/tests/test-connection.yaml rename to dpp-backend/charts/digital-product-pass-backend/templates/tests/test-connection.yaml diff --git a/backend/charts/digital-product-pass-backend/values-dev.yaml b/dpp-backend/charts/digital-product-pass-backend/values-dev.yaml similarity index 100% rename from backend/charts/digital-product-pass-backend/values-dev.yaml rename to dpp-backend/charts/digital-product-pass-backend/values-dev.yaml diff --git a/backend/charts/digital-product-pass-backend/values-int.yaml b/dpp-backend/charts/digital-product-pass-backend/values-int.yaml similarity index 100% rename from backend/charts/digital-product-pass-backend/values-int.yaml rename to dpp-backend/charts/digital-product-pass-backend/values-int.yaml diff --git a/backend/charts/digital-product-pass-backend/values.yaml b/dpp-backend/charts/digital-product-pass-backend/values.yaml similarity index 100% rename from backend/charts/digital-product-pass-backend/values.yaml rename to dpp-backend/charts/digital-product-pass-backend/values.yaml diff --git a/backend/productpass/.gitattributes b/dpp-backend/digitalproductpass/.gitattributes similarity index 100% rename from backend/productpass/.gitattributes rename to dpp-backend/digitalproductpass/.gitattributes diff --git a/backend/productpass/.gitignore b/dpp-backend/digitalproductpass/.gitignore similarity index 100% rename from backend/productpass/.gitignore rename to dpp-backend/digitalproductpass/.gitignore diff --git a/backend/productpass/.mvn/wrapper/maven-wrapper.properties b/dpp-backend/digitalproductpass/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from backend/productpass/.mvn/wrapper/maven-wrapper.properties rename to dpp-backend/digitalproductpass/.mvn/wrapper/maven-wrapper.properties diff --git a/backend/productpass/Dockerfile b/dpp-backend/digitalproductpass/Dockerfile similarity index 92% rename from backend/productpass/Dockerfile rename to dpp-backend/digitalproductpass/Dockerfile index c4e5a420f..655c2bfaf 100644 --- a/backend/productpass/Dockerfile +++ b/dpp-backend/digitalproductpass/Dockerfile @@ -33,7 +33,7 @@ VOLUME data log RUN mkdir -p ./log RUN mkdir -p ./data -COPY ./target/productpass*.jar productpass.jar +COPY ./target/digitalproductpass*.jar productpass.jar #HEALTHCHECK --interval=60s --timeout=4s CMD curl -f http://localhost:8080/health || exit 1 HEALTHCHECK NONE @@ -44,4 +44,4 @@ RUN chown -R 10000:3000 /app && chmod -R 775 /app/ USER 10000:3000 EXPOSE 8080 -ENTRYPOINT ["java", "-jar", "./productpass.jar"] +ENTRYPOINT ["java", "-jar", "./digitalproductpass.jar"] diff --git a/backend/productpass/deploy.sh b/dpp-backend/digitalproductpass/deploy.sh similarity index 100% rename from backend/productpass/deploy.sh rename to dpp-backend/digitalproductpass/deploy.sh diff --git a/backend/productpass/docs/media/img.png b/dpp-backend/digitalproductpass/docs/media/img.png similarity index 100% rename from backend/productpass/docs/media/img.png rename to dpp-backend/digitalproductpass/docs/media/img.png diff --git a/backend/productpass/docs/media/img2.png b/dpp-backend/digitalproductpass/docs/media/img2.png similarity index 100% rename from backend/productpass/docs/media/img2.png rename to dpp-backend/digitalproductpass/docs/media/img2.png diff --git a/backend/productpass/docs/media/img3.png b/dpp-backend/digitalproductpass/docs/media/img3.png similarity index 100% rename from backend/productpass/docs/media/img3.png rename to dpp-backend/digitalproductpass/docs/media/img3.png diff --git a/backend/productpass/docs/media/img4.png b/dpp-backend/digitalproductpass/docs/media/img4.png similarity index 100% rename from backend/productpass/docs/media/img4.png rename to dpp-backend/digitalproductpass/docs/media/img4.png diff --git a/backend/productpass/docs/tests/unitTest.md b/dpp-backend/digitalproductpass/docs/tests/unitTest.md similarity index 100% rename from backend/productpass/docs/tests/unitTest.md rename to dpp-backend/digitalproductpass/docs/tests/unitTest.md diff --git a/backend/productpass/mvnw b/dpp-backend/digitalproductpass/mvnw similarity index 100% rename from backend/productpass/mvnw rename to dpp-backend/digitalproductpass/mvnw diff --git a/backend/productpass/mvnw.cmd b/dpp-backend/digitalproductpass/mvnw.cmd similarity index 100% rename from backend/productpass/mvnw.cmd rename to dpp-backend/digitalproductpass/mvnw.cmd diff --git a/backend/productpass/openapi/product-passport-consumer-backend.json b/dpp-backend/digitalproductpass/openapi/product-passport-consumer-backend.json similarity index 100% rename from backend/productpass/openapi/product-passport-consumer-backend.json rename to dpp-backend/digitalproductpass/openapi/product-passport-consumer-backend.json diff --git a/backend/productpass/pom.xml b/dpp-backend/digitalproductpass/pom.xml similarity index 99% rename from backend/productpass/pom.xml rename to dpp-backend/digitalproductpass/pom.xml index 8c70863db..93227ccbd 100644 --- a/backend/productpass/pom.xml +++ b/dpp-backend/digitalproductpass/pom.xml @@ -32,7 +32,7 @@ org.eclipse.tractusx - productpass + digitalproductpass 2.0.0 jar Catena-X Digital Product Passport Backend diff --git a/backend/productpass/readme.md b/dpp-backend/digitalproductpass/readme.md similarity index 100% rename from backend/productpass/readme.md rename to dpp-backend/digitalproductpass/readme.md diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/Application.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/Application.java similarity index 96% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/Application.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/Application.java index 74fc21483..8ba1a5ac0 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/Application.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/Application.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass; +package org.eclipse.tractusx.digitalproductpass; import io.swagger.v3.oas.annotations.enums.SecuritySchemeIn; import io.swagger.v3.oas.annotations.enums.SecuritySchemeType; @@ -44,7 +44,7 @@ * This class is the main class of the Application, where the main method is to start it with Spring boot. **/ @SpringBootApplication(scanBasePackages={ - "utils", "org.eclipse.tractusx.productpass"}) + "utils", "org.eclipse.tractusx.digitalproductpass"}) @EnableAsync @SecurityScheme( description = "Access token generated in the Product Passport Consumer Frontend, against the Catena-X IAM Service", diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/AppConfig.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/AppConfig.java similarity index 96% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/AppConfig.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/AppConfig.java index 6a914847a..da427a596 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/AppConfig.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/AppConfig.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.config; +package org.eclipse.tractusx.digitalproductpass.config; import org.springframework.context.annotation.Bean; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/DiscoveryConfig.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/DiscoveryConfig.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/DiscoveryConfig.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/DiscoveryConfig.java index b6b2bd6c7..08e45501c 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/DiscoveryConfig.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/DiscoveryConfig.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.config; +package org.eclipse.tractusx.digitalproductpass.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/DtrConfig.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/DtrConfig.java similarity index 99% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/DtrConfig.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/DtrConfig.java index 26ab220cb..d6d6bf6b0 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/DtrConfig.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/DtrConfig.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.config; +package org.eclipse.tractusx.digitalproductpass.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/IrsConfig.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/IrsConfig.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/IrsConfig.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/IrsConfig.java index cc0780782..20f234394 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/IrsConfig.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/IrsConfig.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.config; +package org.eclipse.tractusx.digitalproductpass.config; import com.sun.source.tree.Tree; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/PassportConfig.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/PassportConfig.java similarity index 97% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/PassportConfig.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/PassportConfig.java index f5d9e5770..eb1fb1553 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/PassportConfig.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/PassportConfig.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.config; +package org.eclipse.tractusx.digitalproductpass.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/ProcessConfig.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/ProcessConfig.java similarity index 97% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/ProcessConfig.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/ProcessConfig.java index e00df7b85..bae8d19ac 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/ProcessConfig.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/ProcessConfig.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.config; +package org.eclipse.tractusx.digitalproductpass.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/SecurityConfig.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/SecurityConfig.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/SecurityConfig.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/SecurityConfig.java index a23b38baf..39fc52842 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/SecurityConfig.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/SecurityConfig.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.config; +package org.eclipse.tractusx.digitalproductpass.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/ThreadConfig.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/ThreadConfig.java similarity index 97% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/ThreadConfig.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/ThreadConfig.java index 9400763d5..189afe215 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/ThreadConfig.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/ThreadConfig.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.config; +package org.eclipse.tractusx.digitalproductpass.config; import org.springframework.context.annotation.Bean; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/VaultConfig.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/VaultConfig.java similarity index 97% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/VaultConfig.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/VaultConfig.java index 42761d99f..0ede51d1f 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/VaultConfig.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/VaultConfig.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.config; +package org.eclipse.tractusx.digitalproductpass.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/WebConfig.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/WebConfig.java similarity index 97% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/WebConfig.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/WebConfig.java index a759722d7..ef7e461a3 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/config/WebConfig.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/config/WebConfig.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.config; +package org.eclipse.tractusx.digitalproductpass.config; import org.springframework.context.annotation.Configuration; import org.springframework.http.converter.ByteArrayHttpMessageConverter; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ConfigException.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/exceptions/ConfigException.java similarity index 97% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ConfigException.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/exceptions/ConfigException.java index 0854bda31..b03d6d5bc 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ConfigException.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/exceptions/ConfigException.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.exceptions; +package org.eclipse.tractusx.digitalproductpass.exceptions; import utils.LogUtil; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ControllerException.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/exceptions/ControllerException.java similarity index 97% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ControllerException.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/exceptions/ControllerException.java index a05ccfc47..662bf76e2 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ControllerException.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/exceptions/ControllerException.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.exceptions; +package org.eclipse.tractusx.digitalproductpass.exceptions; import utils.LogUtil; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/DataModelException.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/exceptions/DataModelException.java similarity index 97% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/DataModelException.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/exceptions/DataModelException.java index 93b1aff17..ece170d9a 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/DataModelException.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/exceptions/DataModelException.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.exceptions; +package org.eclipse.tractusx.digitalproductpass.exceptions; import utils.LogUtil; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ManagerException.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/exceptions/ManagerException.java similarity index 97% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ManagerException.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/exceptions/ManagerException.java index 0de3ea0ff..44b750dc1 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ManagerException.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/exceptions/ManagerException.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.exceptions; +package org.eclipse.tractusx.digitalproductpass.exceptions; import utils.LogUtil; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ServiceException.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/exceptions/ServiceException.java similarity index 97% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ServiceException.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/exceptions/ServiceException.java index ea57d9df6..f15965393 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ServiceException.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/exceptions/ServiceException.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.exceptions; +package org.eclipse.tractusx.digitalproductpass.exceptions; import utils.LogUtil; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ServiceInitializationException.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/exceptions/ServiceInitializationException.java similarity index 97% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ServiceInitializationException.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/exceptions/ServiceInitializationException.java index 88b5e2695..f6ba46139 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/exceptions/ServiceInitializationException.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/exceptions/ServiceInitializationException.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.exceptions; +package org.eclipse.tractusx.digitalproductpass.exceptions; import utils.LogUtil; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/AppController.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/controllers/AppController.java similarity index 89% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/AppController.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/controllers/AppController.java index 673aa613e..32f1df926 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/AppController.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/controllers/AppController.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.http.controllers; +package org.eclipse.tractusx.digitalproductpass.http.controllers; import com.fasterxml.jackson.databind.JsonNode; import io.swagger.v3.oas.annotations.Hidden; @@ -32,28 +32,28 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.eclipse.tractusx.productpass.config.DtrConfig; -import org.eclipse.tractusx.productpass.config.IrsConfig; -import org.eclipse.tractusx.productpass.config.PassportConfig; -import org.eclipse.tractusx.productpass.config.ProcessConfig; -import org.eclipse.tractusx.productpass.exceptions.ControllerException; -import org.eclipse.tractusx.productpass.managers.ProcessManager; -import org.eclipse.tractusx.productpass.managers.TreeManager; -import org.eclipse.tractusx.productpass.models.catenax.Dtr; -import org.eclipse.tractusx.productpass.models.dtregistry.DigitalTwin; -import org.eclipse.tractusx.productpass.models.dtregistry.EndPoint; -import org.eclipse.tractusx.productpass.models.dtregistry.SubModel; -import org.eclipse.tractusx.productpass.models.edc.DataPlaneEndpoint; -import org.eclipse.tractusx.productpass.models.edc.Jwt; -import org.eclipse.tractusx.productpass.models.http.Response; -import org.eclipse.tractusx.productpass.models.http.requests.Search; -import org.eclipse.tractusx.productpass.models.manager.History; -import org.eclipse.tractusx.productpass.models.manager.Node; -import org.eclipse.tractusx.productpass.models.manager.SearchStatus; -import org.eclipse.tractusx.productpass.models.manager.Status; -import org.eclipse.tractusx.productpass.services.AasService; -import org.eclipse.tractusx.productpass.services.DataPlaneService; -import org.eclipse.tractusx.productpass.services.IrsService; +import org.eclipse.tractusx.digitalproductpass.config.DtrConfig; +import org.eclipse.tractusx.digitalproductpass.config.IrsConfig; +import org.eclipse.tractusx.digitalproductpass.config.PassportConfig; +import org.eclipse.tractusx.digitalproductpass.config.ProcessConfig; +import org.eclipse.tractusx.digitalproductpass.exceptions.ControllerException; +import org.eclipse.tractusx.digitalproductpass.managers.ProcessManager; +import org.eclipse.tractusx.digitalproductpass.managers.TreeManager; +import org.eclipse.tractusx.digitalproductpass.models.catenax.Dtr; +import org.eclipse.tractusx.digitalproductpass.models.dtregistry.DigitalTwin; +import org.eclipse.tractusx.digitalproductpass.models.dtregistry.EndPoint; +import org.eclipse.tractusx.digitalproductpass.models.dtregistry.SubModel; +import org.eclipse.tractusx.digitalproductpass.models.edc.DataPlaneEndpoint; +import org.eclipse.tractusx.digitalproductpass.models.edc.Jwt; +import org.eclipse.tractusx.digitalproductpass.models.http.Response; +import org.eclipse.tractusx.digitalproductpass.models.http.requests.Search; +import org.eclipse.tractusx.digitalproductpass.models.manager.History; +import org.eclipse.tractusx.digitalproductpass.models.manager.Node; +import org.eclipse.tractusx.digitalproductpass.models.manager.SearchStatus; +import org.eclipse.tractusx.digitalproductpass.models.manager.Status; +import org.eclipse.tractusx.digitalproductpass.services.AasService; +import org.eclipse.tractusx.digitalproductpass.services.DataPlaneService; +import org.eclipse.tractusx.digitalproductpass.services.IrsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.web.bind.annotation.*; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/ApiController.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/controllers/api/ApiController.java similarity index 90% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/ApiController.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/controllers/api/ApiController.java index f89c7298a..6e4dc89e5 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/ApiController.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/controllers/api/ApiController.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.http.controllers.api; +package org.eclipse.tractusx.digitalproductpass.http.controllers.api; import com.fasterxml.jackson.databind.JsonNode; import io.swagger.v3.oas.annotations.Hidden; @@ -34,18 +34,18 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; -import org.eclipse.tractusx.productpass.config.PassportConfig; -import org.eclipse.tractusx.productpass.managers.ProcessManager; -import org.eclipse.tractusx.productpass.models.http.Response; -import org.eclipse.tractusx.productpass.models.http.requests.TokenRequest; -import org.eclipse.tractusx.productpass.models.manager.History; -import org.eclipse.tractusx.productpass.models.manager.Process; -import org.eclipse.tractusx.productpass.models.manager.Status; -import org.eclipse.tractusx.productpass.models.negotiation.Dataset; -import org.eclipse.tractusx.productpass.models.passports.PassportResponse; -import org.eclipse.tractusx.productpass.services.AasService; -import org.eclipse.tractusx.productpass.services.AuthenticationService; -import org.eclipse.tractusx.productpass.services.DataTransferService; +import org.eclipse.tractusx.digitalproductpass.config.PassportConfig; +import org.eclipse.tractusx.digitalproductpass.managers.ProcessManager; +import org.eclipse.tractusx.digitalproductpass.models.http.Response; +import org.eclipse.tractusx.digitalproductpass.models.http.requests.TokenRequest; +import org.eclipse.tractusx.digitalproductpass.models.manager.History; +import org.eclipse.tractusx.digitalproductpass.models.manager.Process; +import org.eclipse.tractusx.digitalproductpass.models.manager.Status; +import org.eclipse.tractusx.digitalproductpass.models.negotiation.Dataset; +import org.eclipse.tractusx.digitalproductpass.models.passports.PassportResponse; +import org.eclipse.tractusx.digitalproductpass.services.AasService; +import org.eclipse.tractusx.digitalproductpass.services.AuthenticationService; +import org.eclipse.tractusx.digitalproductpass.services.DataTransferService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.web.bind.annotation.RequestBody; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/ContractController.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/controllers/api/ContractController.java similarity index 95% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/ContractController.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/controllers/api/ContractController.java index ad66e8036..5294d5edc 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/ContractController.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/controllers/api/ContractController.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.http.controllers.api; +package org.eclipse.tractusx.digitalproductpass.http.controllers.api; import com.fasterxml.jackson.core.type.TypeReference; import io.swagger.v3.oas.annotations.Operation; @@ -34,28 +34,28 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import org.apache.commons.logging.Log; -import org.eclipse.tractusx.productpass.config.DiscoveryConfig; -import org.eclipse.tractusx.productpass.config.DtrConfig; -import org.eclipse.tractusx.productpass.config.PassportConfig; -import org.eclipse.tractusx.productpass.config.ProcessConfig; -import org.eclipse.tractusx.productpass.exceptions.ControllerException; -import org.eclipse.tractusx.productpass.exceptions.ServiceException; -import org.eclipse.tractusx.productpass.managers.DtrSearchManager; -import org.eclipse.tractusx.productpass.managers.ProcessManager; -import org.eclipse.tractusx.productpass.models.catenax.BpnDiscovery; -import org.eclipse.tractusx.productpass.models.catenax.Dtr; -import org.eclipse.tractusx.productpass.models.catenax.EdcDiscoveryEndpoint; -import org.eclipse.tractusx.productpass.models.edc.AssetSearch; -import org.eclipse.tractusx.productpass.models.http.Response; -import org.eclipse.tractusx.productpass.models.http.requests.DiscoverySearch; -import org.eclipse.tractusx.productpass.models.http.requests.Search; -import org.eclipse.tractusx.productpass.models.http.requests.TokenRequest; -import org.eclipse.tractusx.productpass.models.manager.History; -import org.eclipse.tractusx.productpass.models.manager.Process; -import org.eclipse.tractusx.productpass.models.manager.SearchStatus; -import org.eclipse.tractusx.productpass.models.manager.Status; -import org.eclipse.tractusx.productpass.models.negotiation.Dataset; -import org.eclipse.tractusx.productpass.services.*; +import org.eclipse.tractusx.digitalproductpass.config.DiscoveryConfig; +import org.eclipse.tractusx.digitalproductpass.config.DtrConfig; +import org.eclipse.tractusx.digitalproductpass.config.PassportConfig; +import org.eclipse.tractusx.digitalproductpass.config.ProcessConfig; +import org.eclipse.tractusx.digitalproductpass.exceptions.ControllerException; +import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceException; +import org.eclipse.tractusx.digitalproductpass.managers.DtrSearchManager; +import org.eclipse.tractusx.digitalproductpass.managers.ProcessManager; +import org.eclipse.tractusx.digitalproductpass.models.catenax.BpnDiscovery; +import org.eclipse.tractusx.digitalproductpass.models.catenax.Dtr; +import org.eclipse.tractusx.digitalproductpass.models.catenax.EdcDiscoveryEndpoint; +import org.eclipse.tractusx.digitalproductpass.models.edc.AssetSearch; +import org.eclipse.tractusx.digitalproductpass.models.http.Response; +import org.eclipse.tractusx.digitalproductpass.models.http.requests.DiscoverySearch; +import org.eclipse.tractusx.digitalproductpass.models.http.requests.Search; +import org.eclipse.tractusx.digitalproductpass.models.http.requests.TokenRequest; +import org.eclipse.tractusx.digitalproductpass.models.manager.History; +import org.eclipse.tractusx.digitalproductpass.models.manager.Process; +import org.eclipse.tractusx.digitalproductpass.models.manager.SearchStatus; +import org.eclipse.tractusx.digitalproductpass.models.manager.Status; +import org.eclipse.tractusx.digitalproductpass.models.negotiation.Dataset; +import org.eclipse.tractusx.digitalproductpass.services.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.web.bind.annotation.*; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/IrsController.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/controllers/api/IrsController.java similarity index 93% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/IrsController.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/controllers/api/IrsController.java index 37bcac4a5..08ea00343 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/api/IrsController.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/controllers/api/IrsController.java @@ -23,26 +23,26 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.http.controllers.api; +package org.eclipse.tractusx.digitalproductpass.http.controllers.api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.eclipse.tractusx.productpass.config.IrsConfig; -import org.eclipse.tractusx.productpass.managers.ProcessManager; -import org.eclipse.tractusx.productpass.managers.TreeManager; -import org.eclipse.tractusx.productpass.models.http.Response; -import org.eclipse.tractusx.productpass.models.http.requests.Search; -import org.eclipse.tractusx.productpass.models.irs.Job; -import org.eclipse.tractusx.productpass.models.irs.JobHistory; -import org.eclipse.tractusx.productpass.models.irs.JobResponse; -import org.eclipse.tractusx.productpass.models.manager.Node; -import org.eclipse.tractusx.productpass.models.manager.SearchStatus; -import org.eclipse.tractusx.productpass.models.manager.Status; -import org.eclipse.tractusx.productpass.services.AuthenticationService; -import org.eclipse.tractusx.productpass.services.IrsService; +import org.eclipse.tractusx.digitalproductpass.config.IrsConfig; +import org.eclipse.tractusx.digitalproductpass.managers.ProcessManager; +import org.eclipse.tractusx.digitalproductpass.managers.TreeManager; +import org.eclipse.tractusx.digitalproductpass.models.http.Response; +import org.eclipse.tractusx.digitalproductpass.models.http.requests.Search; +import org.eclipse.tractusx.digitalproductpass.models.irs.Job; +import org.eclipse.tractusx.digitalproductpass.models.irs.JobHistory; +import org.eclipse.tractusx.digitalproductpass.models.irs.JobResponse; +import org.eclipse.tractusx.digitalproductpass.models.manager.Node; +import org.eclipse.tractusx.digitalproductpass.models.manager.SearchStatus; +import org.eclipse.tractusx.digitalproductpass.models.manager.Status; +import org.eclipse.tractusx.digitalproductpass.services.AuthenticationService; +import org.eclipse.tractusx.digitalproductpass.services.IrsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import utils.HttpUtil; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/auth/AuthController.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/controllers/auth/AuthController.java similarity index 95% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/auth/AuthController.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/controllers/auth/AuthController.java index 2b3a2b50b..fdaed8177 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/auth/AuthController.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/controllers/auth/AuthController.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.http.controllers.auth; +package org.eclipse.tractusx.digitalproductpass.http.controllers.auth; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; @@ -32,10 +32,10 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.eclipse.tractusx.productpass.models.auth.JwtToken; -import org.eclipse.tractusx.productpass.models.auth.UserInfo; -import org.eclipse.tractusx.productpass.models.http.Response; -import org.eclipse.tractusx.productpass.services.AuthenticationService; +import org.eclipse.tractusx.digitalproductpass.models.auth.JwtToken; +import org.eclipse.tractusx.digitalproductpass.models.auth.UserInfo; +import org.eclipse.tractusx.digitalproductpass.models.http.Response; +import org.eclipse.tractusx.digitalproductpass.services.AuthenticationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/error/ErrorResponseController.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/controllers/error/ErrorResponseController.java similarity index 96% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/error/ErrorResponseController.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/controllers/error/ErrorResponseController.java index bc185dab6..6eda62572 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/controllers/error/ErrorResponseController.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/controllers/error/ErrorResponseController.java @@ -21,12 +21,12 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.http.controllers.error; +package org.eclipse.tractusx.digitalproductpass.http.controllers.error; import io.swagger.v3.oas.annotations.Hidden; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.eclipse.tractusx.productpass.models.http.Response; +import org.eclipse.tractusx.digitalproductpass.models.http.Response; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.web.error.ErrorAttributeOptions; import org.springframework.boot.web.servlet.error.ErrorAttributes; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/middleware/BaseInterceptor.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/middleware/BaseInterceptor.java similarity index 97% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/middleware/BaseInterceptor.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/middleware/BaseInterceptor.java index 150b506a3..52c709958 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/middleware/BaseInterceptor.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/middleware/BaseInterceptor.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.http.middleware; +package org.eclipse.tractusx.digitalproductpass.http.middleware; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/middleware/InterceptorConfig.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/middleware/InterceptorConfig.java similarity index 95% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/middleware/InterceptorConfig.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/middleware/InterceptorConfig.java index 29456fd85..01cd06b26 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/http/middleware/InterceptorConfig.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/middleware/InterceptorConfig.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.http.middleware; +package org.eclipse.tractusx.digitalproductpass.http.middleware; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/interfaces/ServiceInitializationInterface.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/interfaces/ServiceInitializationInterface.java similarity index 90% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/interfaces/ServiceInitializationInterface.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/interfaces/ServiceInitializationInterface.java index 647599f6b..afc0069af 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/interfaces/ServiceInitializationInterface.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/interfaces/ServiceInitializationInterface.java @@ -21,9 +21,9 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.interfaces; +package org.eclipse.tractusx.digitalproductpass.interfaces; -import org.eclipse.tractusx.productpass.exceptions.ServiceInitializationException; +import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceInitializationException; import java.util.List; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/listeners/AppListener.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/listeners/AppListener.java similarity index 94% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/listeners/AppListener.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/listeners/AppListener.java index 146e30f27..6090f61c2 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/listeners/AppListener.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/listeners/AppListener.java @@ -21,17 +21,17 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.listeners; +package org.eclipse.tractusx.digitalproductpass.listeners; -import org.eclipse.tractusx.productpass.config.DtrConfig; -import org.eclipse.tractusx.productpass.config.SecurityConfig; -import org.eclipse.tractusx.productpass.models.auth.JwtToken; -import org.eclipse.tractusx.productpass.models.catenax.Discovery; -import org.eclipse.tractusx.productpass.models.edc.Jwt; -import org.eclipse.tractusx.productpass.services.AuthenticationService; -import org.eclipse.tractusx.productpass.services.CatenaXService; -import org.eclipse.tractusx.productpass.services.DataTransferService; -import org.eclipse.tractusx.productpass.services.VaultService; +import org.eclipse.tractusx.digitalproductpass.config.DtrConfig; +import org.eclipse.tractusx.digitalproductpass.config.SecurityConfig; +import org.eclipse.tractusx.digitalproductpass.models.auth.JwtToken; +import org.eclipse.tractusx.digitalproductpass.models.catenax.Discovery; +import org.eclipse.tractusx.digitalproductpass.models.edc.Jwt; +import org.eclipse.tractusx.digitalproductpass.services.AuthenticationService; +import org.eclipse.tractusx.digitalproductpass.services.CatenaXService; +import org.eclipse.tractusx.digitalproductpass.services.DataTransferService; +import org.eclipse.tractusx.digitalproductpass.services.VaultService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.boot.context.event.ApplicationStartedEvent; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/DtrSearchManager.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/managers/DtrSearchManager.java similarity index 96% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/DtrSearchManager.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/managers/DtrSearchManager.java index 999163b44..454cff907 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/DtrSearchManager.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/managers/DtrSearchManager.java @@ -23,21 +23,21 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.managers; +package org.eclipse.tractusx.digitalproductpass.managers; import com.fasterxml.jackson.core.type.TypeReference; import org.apache.commons.logging.Log; -import org.eclipse.tractusx.productpass.config.DtrConfig; -import org.eclipse.tractusx.productpass.exceptions.DataModelException; -import org.eclipse.tractusx.productpass.exceptions.ManagerException; -import org.eclipse.tractusx.productpass.models.catenax.Dtr; -import org.eclipse.tractusx.productpass.models.catenax.EdcDiscoveryEndpoint; -import org.eclipse.tractusx.productpass.models.http.responses.IdResponse; -import org.eclipse.tractusx.productpass.models.negotiation.Catalog; -import org.eclipse.tractusx.productpass.models.negotiation.Dataset; -import org.eclipse.tractusx.productpass.models.negotiation.Negotiation; -import org.eclipse.tractusx.productpass.models.negotiation.Offer; -import org.eclipse.tractusx.productpass.services.DataTransferService; +import org.eclipse.tractusx.digitalproductpass.config.DtrConfig; +import org.eclipse.tractusx.digitalproductpass.exceptions.DataModelException; +import org.eclipse.tractusx.digitalproductpass.exceptions.ManagerException; +import org.eclipse.tractusx.digitalproductpass.models.catenax.Dtr; +import org.eclipse.tractusx.digitalproductpass.models.catenax.EdcDiscoveryEndpoint; +import org.eclipse.tractusx.digitalproductpass.models.http.responses.IdResponse; +import org.eclipse.tractusx.digitalproductpass.models.negotiation.Catalog; +import org.eclipse.tractusx.digitalproductpass.models.negotiation.Dataset; +import org.eclipse.tractusx.digitalproductpass.models.negotiation.Negotiation; +import org.eclipse.tractusx.digitalproductpass.models.negotiation.Offer; +import org.eclipse.tractusx.digitalproductpass.services.DataTransferService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import utils.*; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessDataModel.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/managers/ProcessDataModel.java similarity index 96% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessDataModel.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/managers/ProcessDataModel.java index 7ed4ed750..10466562a 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessDataModel.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/managers/ProcessDataModel.java @@ -23,10 +23,10 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.managers; +package org.eclipse.tractusx.digitalproductpass.managers; -import org.eclipse.tractusx.productpass.exceptions.DataModelException; -import org.eclipse.tractusx.productpass.models.manager.Process; +import org.eclipse.tractusx.digitalproductpass.exceptions.DataModelException; +import org.eclipse.tractusx.digitalproductpass.models.manager.Process; import org.springframework.stereotype.Component; import utils.DateTimeUtil; import utils.ThreadUtil; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessManager.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/managers/ProcessManager.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessManager.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/managers/ProcessManager.java index 57fda6627..4fe977014 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessManager.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/managers/ProcessManager.java @@ -23,24 +23,24 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.managers; +package org.eclipse.tractusx.digitalproductpass.managers; import com.fasterxml.jackson.databind.JsonNode; import jakarta.servlet.http.HttpServletRequest; -import org.eclipse.tractusx.productpass.config.ProcessConfig; -import org.eclipse.tractusx.productpass.exceptions.ManagerException; -import org.eclipse.tractusx.productpass.models.catenax.Dtr; -import org.eclipse.tractusx.productpass.models.dtregistry.DigitalTwin; -import org.eclipse.tractusx.productpass.models.edc.DataPlaneEndpoint; -import org.eclipse.tractusx.productpass.models.edc.Jwt; -import org.eclipse.tractusx.productpass.models.http.requests.Search; -import org.eclipse.tractusx.productpass.models.http.responses.IdResponse; -import org.eclipse.tractusx.productpass.models.irs.JobHistory; -import org.eclipse.tractusx.productpass.models.manager.History; -import org.eclipse.tractusx.productpass.models.manager.Process; -import org.eclipse.tractusx.productpass.models.manager.SearchStatus; -import org.eclipse.tractusx.productpass.models.manager.Status; -import org.eclipse.tractusx.productpass.models.negotiation.*; +import org.eclipse.tractusx.digitalproductpass.config.ProcessConfig; +import org.eclipse.tractusx.digitalproductpass.exceptions.ManagerException; +import org.eclipse.tractusx.digitalproductpass.models.catenax.Dtr; +import org.eclipse.tractusx.digitalproductpass.models.dtregistry.DigitalTwin; +import org.eclipse.tractusx.digitalproductpass.models.edc.DataPlaneEndpoint; +import org.eclipse.tractusx.digitalproductpass.models.edc.Jwt; +import org.eclipse.tractusx.digitalproductpass.models.http.requests.Search; +import org.eclipse.tractusx.digitalproductpass.models.http.responses.IdResponse; +import org.eclipse.tractusx.digitalproductpass.models.irs.JobHistory; +import org.eclipse.tractusx.digitalproductpass.models.manager.History; +import org.eclipse.tractusx.digitalproductpass.models.manager.Process; +import org.eclipse.tractusx.digitalproductpass.models.manager.SearchStatus; +import org.eclipse.tractusx.digitalproductpass.models.manager.Status; +import org.eclipse.tractusx.digitalproductpass.models.negotiation.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.stereotype.Component; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/TreeManager.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/managers/TreeManager.java similarity index 95% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/TreeManager.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/managers/TreeManager.java index 71f972bb7..c8bbb7e36 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/TreeManager.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/managers/TreeManager.java @@ -23,23 +23,23 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.managers; +package org.eclipse.tractusx.digitalproductpass.managers; import com.fasterxml.jackson.core.type.TypeReference; -import org.eclipse.tractusx.productpass.config.IrsConfig; -import org.eclipse.tractusx.productpass.config.PassportConfig; -import org.eclipse.tractusx.productpass.exceptions.DataModelException; -import org.eclipse.tractusx.productpass.exceptions.ManagerException; -import org.eclipse.tractusx.productpass.models.catenax.EdcDiscoveryEndpoint; -import org.eclipse.tractusx.productpass.models.dtregistry.DigitalTwin; -import org.eclipse.tractusx.productpass.models.irs.Job; -import org.eclipse.tractusx.productpass.models.irs.JobHistory; -import org.eclipse.tractusx.productpass.models.irs.JobResponse; -import org.eclipse.tractusx.productpass.models.irs.Relationship; -import org.eclipse.tractusx.productpass.models.manager.Node; -import org.eclipse.tractusx.productpass.models.manager.NodeComponent; -import org.eclipse.tractusx.productpass.models.manager.Status; -import org.eclipse.tractusx.productpass.models.negotiation.Negotiation; +import org.eclipse.tractusx.digitalproductpass.config.IrsConfig; +import org.eclipse.tractusx.digitalproductpass.config.PassportConfig; +import org.eclipse.tractusx.digitalproductpass.exceptions.DataModelException; +import org.eclipse.tractusx.digitalproductpass.exceptions.ManagerException; +import org.eclipse.tractusx.digitalproductpass.models.catenax.EdcDiscoveryEndpoint; +import org.eclipse.tractusx.digitalproductpass.models.dtregistry.DigitalTwin; +import org.eclipse.tractusx.digitalproductpass.models.irs.Job; +import org.eclipse.tractusx.digitalproductpass.models.irs.JobHistory; +import org.eclipse.tractusx.digitalproductpass.models.irs.JobResponse; +import org.eclipse.tractusx.digitalproductpass.models.irs.Relationship; +import org.eclipse.tractusx.digitalproductpass.models.manager.Node; +import org.eclipse.tractusx.digitalproductpass.models.manager.NodeComponent; +import org.eclipse.tractusx.digitalproductpass.models.manager.Status; +import org.eclipse.tractusx.digitalproductpass.models.negotiation.Negotiation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import utils.*; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/Credential.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/Credential.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/Credential.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/Credential.java index c8ae5105d..7ac4e84fe 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/Credential.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/Credential.java @@ -22,7 +22,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.auth; +package org.eclipse.tractusx.digitalproductpass.models.auth; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/JwtToken.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/JwtToken.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/JwtToken.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/JwtToken.java index 83a52db8e..0eaf0b05d 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/JwtToken.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/JwtToken.java @@ -22,7 +22,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.auth; +package org.eclipse.tractusx.digitalproductpass.models.auth; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/UserCredential.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/UserCredential.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/UserCredential.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/UserCredential.java index 0eb7ebbf5..01e4e0f7e 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/UserCredential.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/UserCredential.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.auth; +package org.eclipse.tractusx.digitalproductpass.models.auth; /** * This class consists exclusively to define attributes and methods related to the JSON Web Token (JWT) token used diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/UserInfo.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/UserInfo.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/UserInfo.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/UserInfo.java index 9b357da9b..4ad906b36 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/auth/UserInfo.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/auth/UserInfo.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.auth; +package org.eclipse.tractusx.digitalproductpass.models.auth; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/BpnDiscovery.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/catenax/BpnDiscovery.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/BpnDiscovery.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/catenax/BpnDiscovery.java index 5fdd59213..425ef852f 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/BpnDiscovery.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/catenax/BpnDiscovery.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.catenax; +package org.eclipse.tractusx.digitalproductpass.models.catenax; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/Discovery.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/catenax/Discovery.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/Discovery.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/catenax/Discovery.java index 0f9150dae..2792b0525 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/Discovery.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/catenax/Discovery.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.catenax; +package org.eclipse.tractusx.digitalproductpass.models.catenax; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/Dtr.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/catenax/Dtr.java similarity index 97% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/Dtr.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/catenax/Dtr.java index 80a3b7a6a..d602b261e 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/Dtr.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/catenax/Dtr.java @@ -24,7 +24,7 @@ ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.catenax; +package org.eclipse.tractusx.digitalproductpass.models.catenax; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/EdcDiscoveryEndpoint.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/catenax/EdcDiscoveryEndpoint.java similarity index 97% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/EdcDiscoveryEndpoint.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/catenax/EdcDiscoveryEndpoint.java index 07c4d0ef4..1521e83e4 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/catenax/EdcDiscoveryEndpoint.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/catenax/EdcDiscoveryEndpoint.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.catenax; +package org.eclipse.tractusx.digitalproductpass.models.catenax; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/DigitalTwin.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/dtregistry/DigitalTwin.java similarity index 99% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/DigitalTwin.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/dtregistry/DigitalTwin.java index 0b88d7004..86c9268ff 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/DigitalTwin.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/dtregistry/DigitalTwin.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.dtregistry; +package org.eclipse.tractusx.digitalproductpass.models.dtregistry; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/EndPoint.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/dtregistry/EndPoint.java similarity index 99% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/EndPoint.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/dtregistry/EndPoint.java index 4a0aa63b2..39ce727df 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/EndPoint.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/dtregistry/EndPoint.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.dtregistry; +package org.eclipse.tractusx.digitalproductpass.models.dtregistry; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/SubModel.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/dtregistry/SubModel.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/SubModel.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/dtregistry/SubModel.java index 348664ea8..846b63b4d 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/dtregistry/SubModel.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/dtregistry/SubModel.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.dtregistry; +package org.eclipse.tractusx.digitalproductpass.models.dtregistry; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/AssetSearch.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/edc/AssetSearch.java similarity index 97% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/AssetSearch.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/edc/AssetSearch.java index 2f60f7558..b20390293 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/AssetSearch.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/edc/AssetSearch.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.edc; +package org.eclipse.tractusx.digitalproductpass.models.edc; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/DataPlaneEndpoint.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/edc/DataPlaneEndpoint.java similarity index 96% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/DataPlaneEndpoint.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/edc/DataPlaneEndpoint.java index efcb6c7c0..7862a4959 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/DataPlaneEndpoint.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/edc/DataPlaneEndpoint.java @@ -23,11 +23,11 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.edc; +package org.eclipse.tractusx.digitalproductpass.models.edc; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import org.eclipse.tractusx.productpass.exceptions.ServiceException; +import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceException; /** * This class consists exclusively to define attributes related to the Asset search. diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/Jwt.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/edc/Jwt.java similarity index 96% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/Jwt.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/edc/Jwt.java index 500274666..518ea794b 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/edc/Jwt.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/edc/Jwt.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.edc; +package org.eclipse.tractusx.digitalproductpass.models.edc; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/Response.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/http/Response.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/Response.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/http/Response.java index 9c3221b43..1d1baa459 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/Response.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/http/Response.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.http; +package org.eclipse.tractusx.digitalproductpass.models.http; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/DiscoverySearch.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/http/requests/DiscoverySearch.java similarity index 96% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/DiscoverySearch.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/http/requests/DiscoverySearch.java index 587abe378..875948460 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/DiscoverySearch.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/http/requests/DiscoverySearch.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.http.requests; +package org.eclipse.tractusx.digitalproductpass.models.http.requests; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotNull; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/Search.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/http/requests/Search.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/Search.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/http/requests/Search.java index 726db22d7..3d49885a9 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/Search.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/http/requests/Search.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.http.requests; +package org.eclipse.tractusx.digitalproductpass.models.http.requests; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotNull; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/TokenRequest.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/http/requests/TokenRequest.java similarity index 97% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/TokenRequest.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/http/requests/TokenRequest.java index acb79b222..9147d9934 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/requests/TokenRequest.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/http/requests/TokenRequest.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.http.requests; +package org.eclipse.tractusx.digitalproductpass.models.http.requests; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotNull; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/responses/IdResponse.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/http/responses/IdResponse.java similarity index 94% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/responses/IdResponse.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/http/responses/IdResponse.java index d96a60932..e8751ebb7 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/http/responses/IdResponse.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/http/responses/IdResponse.java @@ -23,12 +23,12 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.http.responses; +package org.eclipse.tractusx.digitalproductpass.models.http.responses; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; -import org.eclipse.tractusx.productpass.models.negotiation.DidDocument; +import org.eclipse.tractusx.digitalproductpass.models.negotiation.DidDocument; /** * This class consists exclusively to define attributes related to the response of the requests made by the Application. diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/Job.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/irs/Job.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/Job.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/irs/Job.java index c6f136399..24e44b885 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/Job.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/irs/Job.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.irs; +package org.eclipse.tractusx.digitalproductpass.models.irs; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobHistory.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/irs/JobHistory.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobHistory.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/irs/JobHistory.java index 366ef7c37..99679bda8 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobHistory.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/irs/JobHistory.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.irs; +package org.eclipse.tractusx.digitalproductpass.models.irs; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobRequest.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/irs/JobRequest.java similarity index 99% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobRequest.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/irs/JobRequest.java index db4522f46..cfc378beb 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobRequest.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/irs/JobRequest.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.irs; +package org.eclipse.tractusx.digitalproductpass.models.irs; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobResponse.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/irs/JobResponse.java similarity index 96% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobResponse.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/irs/JobResponse.java index a4ea1d454..ea9bb4748 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/JobResponse.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/irs/JobResponse.java @@ -23,13 +23,13 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.irs; +package org.eclipse.tractusx.digitalproductpass.models.irs; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; -import org.eclipse.tractusx.productpass.models.dtregistry.DigitalTwin; +import org.eclipse.tractusx.digitalproductpass.models.dtregistry.DigitalTwin; import java.util.ArrayList; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/Relationship.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/irs/Relationship.java similarity index 99% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/Relationship.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/irs/Relationship.java index 446aee234..2a4eb5a1b 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/irs/Relationship.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/irs/Relationship.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.irs; +package org.eclipse.tractusx.digitalproductpass.models.irs; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/History.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/manager/History.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/History.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/manager/History.java index 93bfadc3b..374224095 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/History.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/manager/History.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.manager; +package org.eclipse.tractusx.digitalproductpass.models.manager; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Node.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/manager/Node.java similarity index 96% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Node.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/manager/Node.java index e4a4148e0..870e99bf0 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Node.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/manager/Node.java @@ -23,13 +23,13 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.manager; +package org.eclipse.tractusx.digitalproductpass.models.manager; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import org.eclipse.tractusx.productpass.models.dtregistry.DigitalTwin; -import org.eclipse.tractusx.productpass.models.irs.JobResponse; +import org.eclipse.tractusx.digitalproductpass.models.dtregistry.DigitalTwin; +import org.eclipse.tractusx.digitalproductpass.models.irs.JobResponse; import utils.CatenaXUtil; import java.util.List; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/NodeComponent.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/manager/NodeComponent.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/NodeComponent.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/manager/NodeComponent.java index 03eb47923..2380c277a 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/NodeComponent.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/manager/NodeComponent.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.manager; +package org.eclipse.tractusx.digitalproductpass.models.manager; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Process.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/manager/Process.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Process.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/manager/Process.java index f964fbf6d..e9ba3e64d 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Process.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/manager/Process.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.manager; +package org.eclipse.tractusx.digitalproductpass.models.manager; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/SearchStatus.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/manager/SearchStatus.java similarity index 92% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/SearchStatus.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/manager/SearchStatus.java index 4fb4bb09e..8450fd760 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/SearchStatus.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/manager/SearchStatus.java @@ -23,13 +23,13 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.manager; +package org.eclipse.tractusx.digitalproductpass.models.manager; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import org.eclipse.tractusx.productpass.exceptions.ServiceException; -import org.eclipse.tractusx.productpass.models.catenax.Dtr; -import org.eclipse.tractusx.productpass.models.http.requests.Search; +import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceException; +import org.eclipse.tractusx.digitalproductpass.models.catenax.Dtr; +import org.eclipse.tractusx.digitalproductpass.models.http.requests.Search; import utils.CrypUtil; import utils.DateTimeUtil; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Status.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/manager/Status.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Status.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/manager/Status.java index 49f45f25c..565398a34 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/manager/Status.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/manager/Status.java @@ -23,11 +23,11 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.manager; +package org.eclipse.tractusx.digitalproductpass.models.manager; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import org.eclipse.tractusx.productpass.models.irs.JobHistory; +import org.eclipse.tractusx.digitalproductpass.models.irs.JobHistory; import utils.DateTimeUtil; import java.util.HashMap; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Catalog.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Catalog.java similarity index 97% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Catalog.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Catalog.java index db3393523..e78f9aa41 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Catalog.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Catalog.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.negotiation; +package org.eclipse.tractusx.digitalproductpass.models.negotiation; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/CatalogRequest.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/CatalogRequest.java similarity index 99% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/CatalogRequest.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/CatalogRequest.java index c8dcd3f3c..4eb093fbf 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/CatalogRequest.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/CatalogRequest.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.negotiation; +package org.eclipse.tractusx.digitalproductpass.models.negotiation; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Constraint.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Constraint.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Constraint.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Constraint.java index 3524c0594..594b1cf4f 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Constraint.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Constraint.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.negotiation; +package org.eclipse.tractusx.digitalproductpass.models.negotiation; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/DataService.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/DataService.java similarity index 96% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/DataService.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/DataService.java index f3fd16605..f6eddacaa 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/DataService.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/DataService.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.negotiation; +package org.eclipse.tractusx.digitalproductpass.models.negotiation; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Dataset.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Dataset.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Dataset.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Dataset.java index 7cc58c6a0..8521192cb 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Dataset.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Dataset.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.negotiation; +package org.eclipse.tractusx.digitalproductpass.models.negotiation; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/DidDocument.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/DidDocument.java similarity index 96% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/DidDocument.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/DidDocument.java index 4bccc5a0d..32ab7ba6c 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/DidDocument.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/DidDocument.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.negotiation; +package org.eclipse.tractusx.digitalproductpass.models.negotiation; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Distribution.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Distribution.java similarity index 97% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Distribution.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Distribution.java index 77b2a0ec5..64d0122f6 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Distribution.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Distribution.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.negotiation; +package org.eclipse.tractusx.digitalproductpass.models.negotiation; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/EdcResponse.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/EdcResponse.java similarity index 96% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/EdcResponse.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/EdcResponse.java index 7871d03c5..1d56c5f16 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/EdcResponse.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/EdcResponse.java @@ -23,7 +23,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.negotiation; +package org.eclipse.tractusx.digitalproductpass.models.negotiation; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Negotiation.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Negotiation.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Negotiation.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Negotiation.java index 5ad193c8a..c44c7199f 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Negotiation.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Negotiation.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.negotiation; +package org.eclipse.tractusx.digitalproductpass.models.negotiation; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/NegotiationRequest.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/NegotiationRequest.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/NegotiationRequest.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/NegotiationRequest.java index 0b3a32de4..08f6a9342 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/NegotiationRequest.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/NegotiationRequest.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.negotiation; +package org.eclipse.tractusx.digitalproductpass.models.negotiation; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Offer.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Offer.java similarity index 96% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Offer.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Offer.java index bd7d5fc16..c9b1b2086 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Offer.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Offer.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.negotiation; +package org.eclipse.tractusx.digitalproductpass.models.negotiation; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Properties.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Properties.java similarity index 95% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Properties.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Properties.java index cd3b5db0d..b3478e875 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Properties.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Properties.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.negotiation; +package org.eclipse.tractusx.digitalproductpass.models.negotiation; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Set.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Set.java similarity index 97% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Set.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Set.java index 39431e422..fdfe56985 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Set.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Set.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.negotiation; +package org.eclipse.tractusx.digitalproductpass.models.negotiation; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Transfer.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Transfer.java similarity index 99% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Transfer.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Transfer.java index 6dcf3ad2d..b8cb89b64 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/Transfer.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/Transfer.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.negotiation; +package org.eclipse.tractusx.digitalproductpass.models.negotiation; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/TransferRequest.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/TransferRequest.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/TransferRequest.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/TransferRequest.java index 539755004..0a4657957 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/TransferRequest.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/TransferRequest.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.negotiation; +package org.eclipse.tractusx.digitalproductpass.models.negotiation; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/passports/PassportResponse.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/passports/PassportResponse.java similarity index 96% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/passports/PassportResponse.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/passports/PassportResponse.java index 5808c08fc..92aa956cc 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/passports/PassportResponse.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/passports/PassportResponse.java @@ -21,7 +21,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.passports; +package org.eclipse.tractusx.digitalproductpass.models.passports; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/service/BaseService.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/service/BaseService.java similarity index 91% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/service/BaseService.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/service/BaseService.java index 6be8ec3f2..83f18ec0c 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/service/BaseService.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/models/service/BaseService.java @@ -21,10 +21,10 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.models.service; +package org.eclipse.tractusx.digitalproductpass.models.service; -import org.eclipse.tractusx.productpass.exceptions.ServiceInitializationException; -import org.eclipse.tractusx.productpass.interfaces.ServiceInitializationInterface; +import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceInitializationException; +import org.eclipse.tractusx.digitalproductpass.interfaces.ServiceInitializationInterface; import org.springframework.boot.autoconfigure.couchbase.CouchbaseProperties; import org.springframework.core.env.Environment; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/AasService.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/AasService.java similarity index 95% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/AasService.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/AasService.java index 1a1c5cbfb..9b8c915f7 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/AasService.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/AasService.java @@ -21,24 +21,24 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.services; - -import org.eclipse.tractusx.productpass.config.DtrConfig; -import org.eclipse.tractusx.productpass.config.PassportConfig; -import org.eclipse.tractusx.productpass.exceptions.ServiceException; -import org.eclipse.tractusx.productpass.exceptions.ServiceInitializationException; -import org.eclipse.tractusx.productpass.managers.DtrSearchManager; -import org.eclipse.tractusx.productpass.managers.ProcessManager; -import org.eclipse.tractusx.productpass.models.auth.JwtToken; -import org.eclipse.tractusx.productpass.models.catenax.Dtr; -import org.eclipse.tractusx.productpass.models.dtregistry.DigitalTwin; -import org.eclipse.tractusx.productpass.models.dtregistry.SubModel; -import org.eclipse.tractusx.productpass.models.edc.AssetSearch; -import org.eclipse.tractusx.productpass.models.edc.DataPlaneEndpoint; -import org.eclipse.tractusx.productpass.models.http.requests.Search; -import org.eclipse.tractusx.productpass.models.manager.SearchStatus; -import org.eclipse.tractusx.productpass.models.manager.Status; -import org.eclipse.tractusx.productpass.models.service.BaseService; +package org.eclipse.tractusx.digitalproductpass.services; + +import org.eclipse.tractusx.digitalproductpass.config.DtrConfig; +import org.eclipse.tractusx.digitalproductpass.config.PassportConfig; +import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceException; +import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceInitializationException; +import org.eclipse.tractusx.digitalproductpass.managers.DtrSearchManager; +import org.eclipse.tractusx.digitalproductpass.managers.ProcessManager; +import org.eclipse.tractusx.digitalproductpass.models.auth.JwtToken; +import org.eclipse.tractusx.digitalproductpass.models.catenax.Dtr; +import org.eclipse.tractusx.digitalproductpass.models.dtregistry.DigitalTwin; +import org.eclipse.tractusx.digitalproductpass.models.dtregistry.SubModel; +import org.eclipse.tractusx.digitalproductpass.models.edc.AssetSearch; +import org.eclipse.tractusx.digitalproductpass.models.edc.DataPlaneEndpoint; +import org.eclipse.tractusx.digitalproductpass.models.http.requests.Search; +import org.eclipse.tractusx.digitalproductpass.models.manager.SearchStatus; +import org.eclipse.tractusx.digitalproductpass.models.manager.Status; +import org.eclipse.tractusx.digitalproductpass.models.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.http.HttpHeaders; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/AuthenticationService.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/AuthenticationService.java similarity index 94% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/AuthenticationService.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/AuthenticationService.java index b7fe666bb..362c5d075 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/AuthenticationService.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/AuthenticationService.java @@ -21,17 +21,17 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.services; +package org.eclipse.tractusx.digitalproductpass.services; import com.fasterxml.jackson.databind.JsonNode; import jakarta.servlet.http.HttpServletRequest; -import org.eclipse.tractusx.productpass.config.SecurityConfig; -import org.eclipse.tractusx.productpass.exceptions.ServiceException; -import org.eclipse.tractusx.productpass.exceptions.ServiceInitializationException; -import org.eclipse.tractusx.productpass.models.auth.JwtToken; -import org.eclipse.tractusx.productpass.models.auth.UserInfo; -import org.eclipse.tractusx.productpass.models.edc.Jwt; -import org.eclipse.tractusx.productpass.models.service.BaseService; +import org.eclipse.tractusx.digitalproductpass.config.SecurityConfig; +import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceException; +import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceInitializationException; +import org.eclipse.tractusx.digitalproductpass.models.auth.JwtToken; +import org.eclipse.tractusx.digitalproductpass.models.auth.UserInfo; +import org.eclipse.tractusx.digitalproductpass.models.edc.Jwt; +import org.eclipse.tractusx.digitalproductpass.models.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.http.HttpHeaders; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/CatenaXService.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/CatenaXService.java similarity index 96% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/CatenaXService.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/CatenaXService.java index 2aef7e7c4..0f0dfbb1d 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/CatenaXService.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/CatenaXService.java @@ -23,23 +23,23 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.services; +package org.eclipse.tractusx.digitalproductpass.services; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import org.apache.juli.logging.Log; -import org.eclipse.tractusx.productpass.config.DiscoveryConfig; -import org.eclipse.tractusx.productpass.config.DtrConfig; -import org.eclipse.tractusx.productpass.exceptions.ControllerException; -import org.eclipse.tractusx.productpass.exceptions.ServiceException; -import org.eclipse.tractusx.productpass.exceptions.ServiceInitializationException; -import org.eclipse.tractusx.productpass.managers.DtrSearchManager; -import org.eclipse.tractusx.productpass.models.catenax.BpnDiscovery; -import org.eclipse.tractusx.productpass.models.catenax.Discovery; -import org.eclipse.tractusx.productpass.models.catenax.Dtr; -import org.eclipse.tractusx.productpass.models.catenax.EdcDiscoveryEndpoint; -import org.eclipse.tractusx.productpass.models.service.BaseService; +import org.eclipse.tractusx.digitalproductpass.config.DiscoveryConfig; +import org.eclipse.tractusx.digitalproductpass.config.DtrConfig; +import org.eclipse.tractusx.digitalproductpass.exceptions.ControllerException; +import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceException; +import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceInitializationException; +import org.eclipse.tractusx.digitalproductpass.managers.DtrSearchManager; +import org.eclipse.tractusx.digitalproductpass.models.catenax.BpnDiscovery; +import org.eclipse.tractusx.digitalproductpass.models.catenax.Discovery; +import org.eclipse.tractusx.digitalproductpass.models.catenax.Dtr; +import org.eclipse.tractusx.digitalproductpass.models.catenax.EdcDiscoveryEndpoint; +import org.eclipse.tractusx.digitalproductpass.models.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.http.HttpHeaders; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataPlaneService.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/DataPlaneService.java similarity index 94% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataPlaneService.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/DataPlaneService.java index 2a3f43219..eea3a3cef 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataPlaneService.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/DataPlaneService.java @@ -21,13 +21,13 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.services; +package org.eclipse.tractusx.digitalproductpass.services; import com.fasterxml.jackson.databind.JsonNode; -import org.eclipse.tractusx.productpass.exceptions.ServiceException; -import org.eclipse.tractusx.productpass.exceptions.ServiceInitializationException; -import org.eclipse.tractusx.productpass.models.edc.DataPlaneEndpoint; -import org.eclipse.tractusx.productpass.models.service.BaseService; +import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceException; +import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceInitializationException; +import org.eclipse.tractusx.digitalproductpass.models.edc.DataPlaneEndpoint; +import org.eclipse.tractusx.digitalproductpass.models.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseEntity; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataTransferService.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/DataTransferService.java similarity index 98% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataTransferService.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/DataTransferService.java index b0c7c70b5..c7a438631 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataTransferService.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/DataTransferService.java @@ -21,23 +21,23 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.services; +package org.eclipse.tractusx.digitalproductpass.services; import com.fasterxml.jackson.databind.JsonNode; -import org.eclipse.tractusx.productpass.config.DtrConfig; -import org.eclipse.tractusx.productpass.exceptions.ControllerException; -import org.eclipse.tractusx.productpass.exceptions.ServiceException; -import org.eclipse.tractusx.productpass.exceptions.ServiceInitializationException; -import org.eclipse.tractusx.productpass.managers.ProcessDataModel; -import org.eclipse.tractusx.productpass.managers.ProcessManager; -import org.eclipse.tractusx.productpass.models.catenax.Dtr; -import org.eclipse.tractusx.productpass.models.http.requests.Search; -import org.eclipse.tractusx.productpass.models.http.responses.IdResponse; -import org.eclipse.tractusx.productpass.models.manager.History; -import org.eclipse.tractusx.productpass.models.manager.Status; -import org.eclipse.tractusx.productpass.models.negotiation.*; -import org.eclipse.tractusx.productpass.models.negotiation.Set; -import org.eclipse.tractusx.productpass.models.service.BaseService; +import org.eclipse.tractusx.digitalproductpass.config.DtrConfig; +import org.eclipse.tractusx.digitalproductpass.exceptions.ControllerException; +import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceException; +import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceInitializationException; +import org.eclipse.tractusx.digitalproductpass.managers.ProcessDataModel; +import org.eclipse.tractusx.digitalproductpass.managers.ProcessManager; +import org.eclipse.tractusx.digitalproductpass.models.catenax.Dtr; +import org.eclipse.tractusx.digitalproductpass.models.http.requests.Search; +import org.eclipse.tractusx.digitalproductpass.models.http.responses.IdResponse; +import org.eclipse.tractusx.digitalproductpass.models.manager.History; +import org.eclipse.tractusx.digitalproductpass.models.manager.Status; +import org.eclipse.tractusx.digitalproductpass.models.negotiation.*; +import org.eclipse.tractusx.digitalproductpass.models.negotiation.Set; +import org.eclipse.tractusx.digitalproductpass.models.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.http.HttpHeaders; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/IrsService.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/IrsService.java similarity index 93% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/IrsService.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/IrsService.java index b8d06e710..8c50f8140 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/IrsService.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/IrsService.java @@ -21,18 +21,18 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.services; +package org.eclipse.tractusx.digitalproductpass.services; import com.fasterxml.jackson.databind.JsonNode; -import org.eclipse.tractusx.productpass.config.IrsConfig; -import org.eclipse.tractusx.productpass.exceptions.ServiceException; -import org.eclipse.tractusx.productpass.exceptions.ServiceInitializationException; -import org.eclipse.tractusx.productpass.managers.ProcessManager; -import org.eclipse.tractusx.productpass.managers.TreeManager; -import org.eclipse.tractusx.productpass.models.irs.JobHistory; -import org.eclipse.tractusx.productpass.models.irs.JobRequest; -import org.eclipse.tractusx.productpass.models.irs.JobResponse; -import org.eclipse.tractusx.productpass.models.service.BaseService; +import org.eclipse.tractusx.digitalproductpass.config.IrsConfig; +import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceException; +import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceInitializationException; +import org.eclipse.tractusx.digitalproductpass.managers.ProcessManager; +import org.eclipse.tractusx.digitalproductpass.managers.TreeManager; +import org.eclipse.tractusx.digitalproductpass.models.irs.JobHistory; +import org.eclipse.tractusx.digitalproductpass.models.irs.JobRequest; +import org.eclipse.tractusx.digitalproductpass.models.irs.JobResponse; +import org.eclipse.tractusx.digitalproductpass.models.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.http.HttpHeaders; diff --git a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/VaultService.java b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/VaultService.java similarity index 96% rename from backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/VaultService.java rename to dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/VaultService.java index 985685f00..20abbbd0b 100644 --- a/backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/VaultService.java +++ b/dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/services/VaultService.java @@ -21,12 +21,12 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.productpass.services; +package org.eclipse.tractusx.digitalproductpass.services; -import org.eclipse.tractusx.productpass.config.VaultConfig; -import org.eclipse.tractusx.productpass.exceptions.ServiceException; -import org.eclipse.tractusx.productpass.exceptions.ServiceInitializationException; -import org.eclipse.tractusx.productpass.models.service.BaseService; +import org.eclipse.tractusx.digitalproductpass.config.VaultConfig; +import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceException; +import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceInitializationException; +import org.eclipse.tractusx.digitalproductpass.models.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import utils.*; diff --git a/backend/productpass/src/main/java/utils/CatenaXUtil.java b/dpp-backend/digitalproductpass/src/main/java/utils/CatenaXUtil.java similarity index 98% rename from backend/productpass/src/main/java/utils/CatenaXUtil.java rename to dpp-backend/digitalproductpass/src/main/java/utils/CatenaXUtil.java index c4f20d1e3..5a0b6b2c2 100644 --- a/backend/productpass/src/main/java/utils/CatenaXUtil.java +++ b/dpp-backend/digitalproductpass/src/main/java/utils/CatenaXUtil.java @@ -23,7 +23,7 @@ package utils; -import org.eclipse.tractusx.productpass.models.dtregistry.DigitalTwin; +import org.eclipse.tractusx.digitalproductpass.models.dtregistry.DigitalTwin; import org.springframework.core.env.Environment; import utils.exceptions.UtilException; diff --git a/backend/productpass/src/main/java/utils/CrypUtil.java b/dpp-backend/digitalproductpass/src/main/java/utils/CrypUtil.java similarity index 100% rename from backend/productpass/src/main/java/utils/CrypUtil.java rename to dpp-backend/digitalproductpass/src/main/java/utils/CrypUtil.java diff --git a/backend/productpass/src/main/java/utils/CsvUtil.java b/dpp-backend/digitalproductpass/src/main/java/utils/CsvUtil.java similarity index 100% rename from backend/productpass/src/main/java/utils/CsvUtil.java rename to dpp-backend/digitalproductpass/src/main/java/utils/CsvUtil.java diff --git a/backend/productpass/src/main/java/utils/DateTimeUtil.java b/dpp-backend/digitalproductpass/src/main/java/utils/DateTimeUtil.java similarity index 100% rename from backend/productpass/src/main/java/utils/DateTimeUtil.java rename to dpp-backend/digitalproductpass/src/main/java/utils/DateTimeUtil.java diff --git a/backend/productpass/src/main/java/utils/EdcUtil.java b/dpp-backend/digitalproductpass/src/main/java/utils/EdcUtil.java similarity index 97% rename from backend/productpass/src/main/java/utils/EdcUtil.java rename to dpp-backend/digitalproductpass/src/main/java/utils/EdcUtil.java index 2f383a714..7e1919c92 100644 --- a/backend/productpass/src/main/java/utils/EdcUtil.java +++ b/dpp-backend/digitalproductpass/src/main/java/utils/EdcUtil.java @@ -25,7 +25,7 @@ package utils; -import org.eclipse.tractusx.productpass.models.edc.DataPlaneEndpoint; +import org.eclipse.tractusx.digitalproductpass.models.edc.DataPlaneEndpoint; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import utils.exceptions.UtilException; diff --git a/backend/productpass/src/main/java/utils/FileUtil.java b/dpp-backend/digitalproductpass/src/main/java/utils/FileUtil.java similarity index 100% rename from backend/productpass/src/main/java/utils/FileUtil.java rename to dpp-backend/digitalproductpass/src/main/java/utils/FileUtil.java diff --git a/backend/productpass/src/main/java/utils/HttpUtil.java b/dpp-backend/digitalproductpass/src/main/java/utils/HttpUtil.java similarity index 99% rename from backend/productpass/src/main/java/utils/HttpUtil.java rename to dpp-backend/digitalproductpass/src/main/java/utils/HttpUtil.java index f5434fbe6..ae5d54e50 100644 --- a/backend/productpass/src/main/java/utils/HttpUtil.java +++ b/dpp-backend/digitalproductpass/src/main/java/utils/HttpUtil.java @@ -26,8 +26,8 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; -import org.eclipse.tractusx.productpass.models.edc.Jwt; -import org.eclipse.tractusx.productpass.models.http.Response; +import org.eclipse.tractusx.digitalproductpass.models.edc.Jwt; +import org.eclipse.tractusx.digitalproductpass.models.http.Response; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.http.HttpEntity; diff --git a/backend/productpass/src/main/java/utils/JsonUtil.java b/dpp-backend/digitalproductpass/src/main/java/utils/JsonUtil.java similarity index 100% rename from backend/productpass/src/main/java/utils/JsonUtil.java rename to dpp-backend/digitalproductpass/src/main/java/utils/JsonUtil.java diff --git a/backend/productpass/src/main/java/utils/LogUtil.java b/dpp-backend/digitalproductpass/src/main/java/utils/LogUtil.java similarity index 100% rename from backend/productpass/src/main/java/utils/LogUtil.java rename to dpp-backend/digitalproductpass/src/main/java/utils/LogUtil.java diff --git a/backend/productpass/src/main/java/utils/NumericUtil.java b/dpp-backend/digitalproductpass/src/main/java/utils/NumericUtil.java similarity index 100% rename from backend/productpass/src/main/java/utils/NumericUtil.java rename to dpp-backend/digitalproductpass/src/main/java/utils/NumericUtil.java diff --git a/backend/productpass/src/main/java/utils/PassportUtil.java b/dpp-backend/digitalproductpass/src/main/java/utils/PassportUtil.java similarity index 97% rename from backend/productpass/src/main/java/utils/PassportUtil.java rename to dpp-backend/digitalproductpass/src/main/java/utils/PassportUtil.java index d4806fc93..d2fb7a7f1 100644 --- a/backend/productpass/src/main/java/utils/PassportUtil.java +++ b/dpp-backend/digitalproductpass/src/main/java/utils/PassportUtil.java @@ -26,8 +26,8 @@ package utils; import com.fasterxml.jackson.databind.JsonNode; -import org.eclipse.tractusx.productpass.managers.ProcessManager; -import org.eclipse.tractusx.productpass.models.edc.DataPlaneEndpoint; +import org.eclipse.tractusx.digitalproductpass.managers.ProcessManager; +import org.eclipse.tractusx.digitalproductpass.models.edc.DataPlaneEndpoint; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.stereotype.Component; diff --git a/backend/productpass/src/main/java/utils/ReflectionUtil.java b/dpp-backend/digitalproductpass/src/main/java/utils/ReflectionUtil.java similarity index 100% rename from backend/productpass/src/main/java/utils/ReflectionUtil.java rename to dpp-backend/digitalproductpass/src/main/java/utils/ReflectionUtil.java diff --git a/backend/productpass/src/main/java/utils/StringUtil.java b/dpp-backend/digitalproductpass/src/main/java/utils/StringUtil.java similarity index 100% rename from backend/productpass/src/main/java/utils/StringUtil.java rename to dpp-backend/digitalproductpass/src/main/java/utils/StringUtil.java diff --git a/backend/productpass/src/main/java/utils/SystemUtil.java b/dpp-backend/digitalproductpass/src/main/java/utils/SystemUtil.java similarity index 100% rename from backend/productpass/src/main/java/utils/SystemUtil.java rename to dpp-backend/digitalproductpass/src/main/java/utils/SystemUtil.java diff --git a/backend/productpass/src/main/java/utils/ThreadUtil.java b/dpp-backend/digitalproductpass/src/main/java/utils/ThreadUtil.java similarity index 100% rename from backend/productpass/src/main/java/utils/ThreadUtil.java rename to dpp-backend/digitalproductpass/src/main/java/utils/ThreadUtil.java diff --git a/backend/productpass/src/main/java/utils/YamlUtil.java b/dpp-backend/digitalproductpass/src/main/java/utils/YamlUtil.java similarity index 100% rename from backend/productpass/src/main/java/utils/YamlUtil.java rename to dpp-backend/digitalproductpass/src/main/java/utils/YamlUtil.java diff --git a/backend/productpass/src/main/java/utils/exceptions/UtilException.java b/dpp-backend/digitalproductpass/src/main/java/utils/exceptions/UtilException.java similarity index 100% rename from backend/productpass/src/main/java/utils/exceptions/UtilException.java rename to dpp-backend/digitalproductpass/src/main/java/utils/exceptions/UtilException.java diff --git a/backend/productpass/src/main/resources/application.yml b/dpp-backend/digitalproductpass/src/main/resources/application.yml similarity index 98% rename from backend/productpass/src/main/resources/application.yml rename to dpp-backend/digitalproductpass/src/main/resources/application.yml index 7294a64c6..825973581 100644 --- a/backend/productpass/src/main/resources/application.yml +++ b/dpp-backend/digitalproductpass/src/main/resources/application.yml @@ -22,7 +22,7 @@ spring: - name: 'Catena-X Product Passport Consumer Backend' + name: 'Catena-X Digital Product Passport Consumer Backend' main: allow-bean-definition-overriding: true devtools: diff --git a/backend/productpass/src/main/resources/logback-spring.xml b/dpp-backend/digitalproductpass/src/main/resources/logback-spring.xml similarity index 100% rename from backend/productpass/src/main/resources/logback-spring.xml rename to dpp-backend/digitalproductpass/src/main/resources/logback-spring.xml diff --git a/backend/productpass/src/test/java/utils/CrypUtilTest.java b/dpp-backend/digitalproductpass/src/test/java/utils/CrypUtilTest.java similarity index 100% rename from backend/productpass/src/test/java/utils/CrypUtilTest.java rename to dpp-backend/digitalproductpass/src/test/java/utils/CrypUtilTest.java diff --git a/backend/productpass/src/test/java/utils/JsonUtilTest.java b/dpp-backend/digitalproductpass/src/test/java/utils/JsonUtilTest.java similarity index 100% rename from backend/productpass/src/test/java/utils/JsonUtilTest.java rename to dpp-backend/digitalproductpass/src/test/java/utils/JsonUtilTest.java diff --git a/backend/productpass/src/test/java/utils/LogUtilTest.java b/dpp-backend/digitalproductpass/src/test/java/utils/LogUtilTest.java similarity index 100% rename from backend/productpass/src/test/java/utils/LogUtilTest.java rename to dpp-backend/digitalproductpass/src/test/java/utils/LogUtilTest.java diff --git a/backend/productpass/src/test/java/utils/SystemUtilTest.java b/dpp-backend/digitalproductpass/src/test/java/utils/SystemUtilTest.java similarity index 100% rename from backend/productpass/src/test/java/utils/SystemUtilTest.java rename to dpp-backend/digitalproductpass/src/test/java/utils/SystemUtilTest.java diff --git a/backend/productpass/src/test/java/utils/YamlUtilTest.java b/dpp-backend/digitalproductpass/src/test/java/utils/YamlUtilTest.java similarity index 100% rename from backend/productpass/src/test/java/utils/YamlUtilTest.java rename to dpp-backend/digitalproductpass/src/test/java/utils/YamlUtilTest.java diff --git a/backend/scripts/README.md b/dpp-backend/scripts/README.md similarity index 100% rename from backend/scripts/README.md rename to dpp-backend/scripts/README.md diff --git a/backend/scripts/get-data.sh b/dpp-backend/scripts/get-data.sh similarity index 100% rename from backend/scripts/get-data.sh rename to dpp-backend/scripts/get-data.sh diff --git a/backend/scripts/getPassport.py b/dpp-backend/scripts/getPassport.py similarity index 100% rename from backend/scripts/getPassport.py rename to dpp-backend/scripts/getPassport.py diff --git a/backend/scripts/utilities/authentication.py b/dpp-backend/scripts/utilities/authentication.py similarity index 100% rename from backend/scripts/utilities/authentication.py rename to dpp-backend/scripts/utilities/authentication.py diff --git a/backend/scripts/utilities/constants.py b/dpp-backend/scripts/utilities/constants.py similarity index 100% rename from backend/scripts/utilities/constants.py rename to dpp-backend/scripts/utilities/constants.py diff --git a/backend/scripts/utilities/httpUtils.py b/dpp-backend/scripts/utilities/httpUtils.py similarity index 100% rename from backend/scripts/utilities/httpUtils.py rename to dpp-backend/scripts/utilities/httpUtils.py diff --git a/backend/scripts/utilities/operators.py b/dpp-backend/scripts/utilities/operators.py similarity index 100% rename from backend/scripts/utilities/operators.py rename to dpp-backend/scripts/utilities/operators.py diff --git a/sonar-project.properties b/sonar-project.properties index e7a882a6c..2dac3415e 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -25,6 +25,6 @@ sonar.organization=catenax-ng sonar.javascript.lcov.reportPaths= ./coverage/lcov.info sonar.coverage.exclusions=src/**/index.js sonar.java.binaries=**/target/classes -sonar.exclusions=backend/materialpass/target/** -#sonar.exclusions=backend/** +sonar.exclusions=dpp-backend/materialpass/target/** +#sonar.exclusions=dpp-backend/** sonar.sourceEncoding=UTF-8 From 5c0a69edde7349f933d3fc6ec9d38b41a94a8bd5 Mon Sep 17 00:00:00 2001 From: Mathias Brunkow Moser Date: Fri, 22 Dec 2023 17:58:57 +0100 Subject: [PATCH 10/11] fix: fixed helm charts in the backend standalone application2 --- .../digital-product-pass-backend/Chart.yaml | 4 ++-- .../digital-product-pass-backend/README.md | 20 ++++++++++--------- .../templates/NOTES.txt | 8 ++++---- .../values-dev.yaml | 2 +- .../values-int.yaml | 4 ++-- .../digital-product-pass-backend/values.yaml | 2 +- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dpp-backend/charts/digital-product-pass-backend/Chart.yaml b/dpp-backend/charts/digital-product-pass-backend/Chart.yaml index 36015a71c..f01d8601f 100644 --- a/dpp-backend/charts/digital-product-pass-backend/Chart.yaml +++ b/dpp-backend/charts/digital-product-pass-backend/Chart.yaml @@ -40,10 +40,10 @@ type: application # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.4.0 +version: 2.0.0 # 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: "1.4.0" +appVersion: "2.0.0" diff --git a/dpp-backend/charts/digital-product-pass-backend/README.md b/dpp-backend/charts/digital-product-pass-backend/README.md index 52ce53273..2791f71f1 100644 --- a/dpp-backend/charts/digital-product-pass-backend/README.md +++ b/dpp-backend/charts/digital-product-pass-backend/README.md @@ -1,16 +1,15 @@ -# Digital-product-pass Backend +# digital-product-pass -![Version: 1.4.0](https://img.shields.io/badge/Version-1.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.0](https://img.shields.io/badge/AppVersion-1.4.0-informational?style=flat-square) +![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square) A Helm chart for Tractus-X Digital Product Pass Kubernetes - ## TL;DR ### Install ```bash -cd backend/helm-chart/digital-product-pass -helm install digital-product-pass -f ./values.yaml -f ./values-int.yaml +cd backend/charts/digital-product-pass-backend +helm install digital-product-pass-backend -f ./values.yaml -f ./values-int.yaml ``` > **NOTE**: This command will deploy the backend application. @@ -42,11 +41,11 @@ Open the web browser with the following url to check the health status: localhost:8888/health ``` -**Homepage:** +**Homepage:** ## Source Code -* +* ## Values @@ -82,8 +81,11 @@ localhost:8888/health | name | string | `"dpp-backend"` | | | namespace | string | `""` | | | nodeSelector | object | `{}` | | -| oauth | object | `{"appId":"","hostname":"","onLoad":"login-required","realm":"","techUser":{"clientId":"","clientSecret":""}}` | oauth configuration | +| oauth | object | `{"appId":"","bpnCheck":{"bpn":"","enabled":false},"hostname":"","onLoad":"login-required","realm":"","roleCheck":{"enabled":false},"techUser":{"clientId":"","clientSecret":""}}` | oauth configuration | +| oauth.bpnCheck | object | `{"bpn":"","enabled":false}` | configure here the bpn check for the application | +| oauth.bpnCheck.bpn | string | `""` | this bpn needs to be included in the user login information when the check is enabled | | oauth.hostname | string | `""` | url of the identity provider service | +| oauth.roleCheck | object | `{"enabled":false}` | the role check checks if the user has access roles for the appId | | oauth.techUser | object | `{"clientId":"","clientSecret":""}` | note: this credentials need to have access to the Discovery Finder, BPN Discovery and EDC Discovery | | passport | object | `{"aspects":["urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport","urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass","urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass"]}` | passport data transfer configuration | | passport.aspects | list | `["urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport","urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass","urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass"]` | passport versions and aspects allowed | @@ -97,7 +99,7 @@ localhost:8888/health | resources.limits.memory | string | `"512Mi"` | | | resources.requests.cpu | string | `"250m"` | | | resources.requests.memory | string | `"512Mi"` | | -| securityCheck | object | `{"bpn":false,"edc":false,"enabled":false}` | security configuration | +| securityCheck | object | `{"bpn":false,"edc":false}` | security configuration | | securityContext.allowPrivilegeEscalation | bool | `false` | | | securityContext.readOnlyRootFilesystem | bool | `true` | | | securityContext.runAsGroup | int | `3000` | | diff --git a/dpp-backend/charts/digital-product-pass-backend/templates/NOTES.txt b/dpp-backend/charts/digital-product-pass-backend/templates/NOTES.txt index 8b4cbc0c3..33e3034f4 100644 --- a/dpp-backend/charts/digital-product-pass-backend/templates/NOTES.txt +++ b/dpp-backend/charts/digital-product-pass-backend/templates/NOTES.txt @@ -28,16 +28,16 @@ {{- end }} {{- end }} {{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "digital-product-pass.fullname" . }}) + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "chart.fullname" . }}) export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") echo http://$NODE_IP:$NODE_PORT {{- else if contains "LoadBalancer" .Values.service.type }} NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "digital-product-pass.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "digital-product-pass.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "chart.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "chart.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo http://$SERVICE_IP:{{ .Values.service.port }} {{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "digital-product-pass.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "chart.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") echo "Visit http://127.0.0.1:8080 to use your application" kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT diff --git a/dpp-backend/charts/digital-product-pass-backend/values-dev.yaml b/dpp-backend/charts/digital-product-pass-backend/values-dev.yaml index 376d92afd..1e6b89c6e 100644 --- a/dpp-backend/charts/digital-product-pass-backend/values-dev.yaml +++ b/dpp-backend/charts/digital-product-pass-backend/values-dev.yaml @@ -41,7 +41,7 @@ ingress: edc: xApiKey: - participantId: + participantId: &bpn endpoint: "materialpass.dev.demo.catena-x.net/consumer" hostname: *hostname diff --git a/dpp-backend/charts/digital-product-pass-backend/values-int.yaml b/dpp-backend/charts/digital-product-pass-backend/values-int.yaml index cdc681664..bc3d6ef98 100644 --- a/dpp-backend/charts/digital-product-pass-backend/values-int.yaml +++ b/dpp-backend/charts/digital-product-pass-backend/values-int.yaml @@ -40,7 +40,7 @@ ingress: - *hostname edc: xApiKey: - participantId: + participantId: &bpn endpoint: "materialpass.int.demo.catena-x.net/consumer" hostname: *hostname @@ -67,6 +67,6 @@ oauth: appId: bpnCheck: enabled: true - bpn: *bpn + bpn: "" roleCheck: enabled: false diff --git a/dpp-backend/charts/digital-product-pass-backend/values.yaml b/dpp-backend/charts/digital-product-pass-backend/values.yaml index 799c025b5..b4e6c9323 100644 --- a/dpp-backend/charts/digital-product-pass-backend/values.yaml +++ b/dpp-backend/charts/digital-product-pass-backend/values.yaml @@ -54,7 +54,7 @@ edc: # -- the secret for assesing the edc management API xApiKey: "" # -- BPN Number - participantId: "" + participantId: &bpn "" # -- edc consumer connection configuration endpoint: "" apis: From e7131c3515991e73a9596c617efa94c9a87bfff9 Mon Sep 17 00:00:00 2001 From: Mathias Brunkow Moser Date: Fri, 22 Dec 2023 18:04:05 +0100 Subject: [PATCH 11/11] chore: added by default no bpn block --- .../digitalproductpass/src/main/resources/application.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dpp-backend/digitalproductpass/src/main/resources/application.yml b/dpp-backend/digitalproductpass/src/main/resources/application.yml index 825973581..eda024e0b 100644 --- a/dpp-backend/digitalproductpass/src/main/resources/application.yml +++ b/dpp-backend/digitalproductpass/src/main/resources/application.yml @@ -56,11 +56,11 @@ configuration: security: authorization: - bpnAuth: true - roleAuth: true + bpnAuth: false + roleAuth: false startUpChecks: - bpnCheck: true - edcCheck: true + bpnCheck: false + edcCheck: false irs: enabled: true