diff --git a/DEPENDENCIES_BACKEND b/DEPENDENCIES_BACKEND index 6c80c5687..6abce8ce9 100644 --- a/DEPENDENCIES_BACKEND +++ b/DEPENDENCIES_BACKEND @@ -55,7 +55,7 @@ maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.7, Apache-2.0, maven/mavencentral/jakarta.activation/jakarta.activation-api/2.1.2, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.1.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca maven/mavencentral/jakarta.servlet/jakarta.servlet-api/6.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.servlet -maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, ee4j.validation maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.0, BSD-3-Clause, approved, ee4j.jaxb maven/mavencentral/net.minidev/accessors-smart/2.4.11, Apache-2.0, approved, #7515 maven/mavencentral/net.minidev/json-smart/2.4.11, Apache-2.0, approved, #3288 diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/listeners/AppListener.java b/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/listeners/AppListener.java index 4da9971e3..5cd38fbbd 100644 --- a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/listeners/AppListener.java +++ b/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/listeners/AppListener.java @@ -188,4 +188,4 @@ public void onStartUp() { } // Store the process manager in memory - } + } \ No newline at end of file diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessManager.java b/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessManager.java index 8b31fef65..07e3c5e98 100644 --- a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessManager.java +++ b/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/managers/ProcessManager.java @@ -687,4 +687,4 @@ public String saveDataset(String processId, Dataset dataset, Long startedTime, B } } -} +} \ No newline at end of file diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataTransferService.java b/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataTransferService.java index d25262fc4..830ef9479 100644 --- a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataTransferService.java +++ b/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/services/DataTransferService.java @@ -942,4 +942,4 @@ public Transfer getTransferData(IdResponse transferData) { } -} +} \ No newline at end of file diff --git a/consumer-backend/productpass/src/main/resources/application.yml b/consumer-backend/productpass/src/main/resources/application.yml index ae67f1211..bbd2df208 100644 --- a/consumer-backend/productpass/src/main/resources/application.yml +++ b/consumer-backend/productpass/src/main/resources/application.yml @@ -122,4 +122,4 @@ server: include-exception: false port: 8888 tomcat: - max-connections: 10000 + max-connections: 10000 \ No newline at end of file diff --git a/deployment/helm/edc-provider/values.yaml b/deployment/helm/edc-provider/values.yaml index 66966709a..8a39e3a1f 100644 --- a/deployment/helm/edc-provider/values.yaml +++ b/deployment/helm/edc-provider/values.yaml @@ -573,4 +573,5 @@ postgresql: auth: database: "edc" username: - password: \ No newline at end of file + password: + diff --git a/deployment/helm/registry/Chart.yaml b/deployment/helm/registry/Chart.yaml new file mode 100644 index 000000000..189b5a7ff --- /dev/null +++ b/deployment/helm/registry/Chart.yaml @@ -0,0 +1,34 @@ +############################################################### +# Copyright (c) 2021, 2023 Robert Bosch Manufacturing Solutions GmbH +# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation +# +# 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 governing permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +############################################################### + +apiVersion: v2 +name: registry +description: Tractus-X Digital Twin Registry Helm Chart + +type: application +version: 0.3.23 +#appVersion: 0.3.15-M1 + +dependencies: + - name: registry + repository: https://eclipse-tractusx.github.io/sldt-digital-twin-registry + alias: provider-dtr + version: 0.3.23 + condition: enabled diff --git a/deployment/helm/registry/values.yaml b/deployment/helm/registry/values.yaml new file mode 100644 index 000000000..a112b28a6 --- /dev/null +++ b/deployment/helm/registry/values.yaml @@ -0,0 +1,67 @@ +############################################################### +# Copyright (c) 2021, 2023 Robert Bosch Manufacturing Solutions GmbH +# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation +# +# 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 governing permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +############################################################### + + +provider-dtr: + registry: + host: materialpass.int.demo.catena-x.net + ## If 'authentication' is set to false, no OAuth authentication is enforced + authentication: false + # Issuer url for the dtr (resource server), + # make sure that the url points to an externally resolvable hostname. + # If no value is committed, and the integrated Keycloak is enabled, + # the K8s internal service name is used, which is a problem, when + # validating the issuer claim in an access token + idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central + idpClientId: Cl13-CX-Battery + tenantId: default-tenant + dataSource: + driverClassName: org.postgresql.Driver + sqlInitPlatform: pg + ## The url, user, and password parameter will be ignored if 'enablePostgres' is set to true. + ## In that case the postgresql auth parameters are used. + url: jdbc:postgresql://registry:5432 + user: + password: + ingress: + enabled: true + tls: true + urlPrefix: /semantics/registry + className: nginx + annotations: + # Add annotations for the ingress, e.g.: + cert-manager.io/cluster-issuer: selfsigned-cluster-issuer + nginx.ingress.kubernetes.io/rewrite-target: /$2 + nginx.ingress.kubernetes.io/use-regex: "true" + nginx.ingress.kubernetes.io/enable-cors: "true" + nginx.ingress.kubernetes.io/cors-allow-credentials: "true" + nginx.ingress.kubernetes.io/x-forwarded-prefix: /semantics/registry + + # enables the default postgres database + enablePostgres: true + # enables the default keycloak identity provider + # relies on a postgres instance + enableKeycloak: false + + postgresql: + auth: + username: + password: + database: default-database diff --git a/deployment/infrastructure/delete-provider-dtr.sh b/deployment/infrastructure/delete-provider-dtr.sh index 9d57a085f..970ce5c6c 100644 --- a/deployment/infrastructure/delete-provider-dtr.sh +++ b/deployment/infrastructure/delete-provider-dtr.sh @@ -42,7 +42,6 @@ DIGITAL_TWIN_SUBMODEL_ID_4='26bf39c5-68a5-43a1-8db7-d33e116a6f61' SERVER_URL='' REGISTRY_URL='' - # put access token without 'Bearer ' prefix BEARER_TOKEN='' diff --git a/deployment/infrastructure/init-provider-dtr.sh b/deployment/infrastructure/init-provider-dtr.sh index bc3d420f8..fd06d9da4 100644 --- a/deployment/infrastructure/init-provider-dtr.sh +++ b/deployment/infrastructure/init-provider-dtr.sh @@ -41,7 +41,6 @@ DIGITAL_TWIN_SUBMODEL_ID_4='26bf39c5-68a5-43a1-8db7-d33e116a6f61' SERVER_URL='' REGISTRY_URL='' - # put access token without 'Bearer ' prefix BEARER_TOKEN='' diff --git a/deployment/infrastructure/resources/assets/digital-twin-registry.json b/deployment/infrastructure/resources/assets/digital-twin-registry.json index d6d80ecf9..a6a5dc1cc 100644 --- a/deployment/infrastructure/resources/assets/digital-twin-registry.json +++ b/deployment/infrastructure/resources/assets/digital-twin-registry.json @@ -4,6 +4,7 @@ "@type": "data.core.digitalTwinRegistry", "@id": "digital-twin-registry", "properties": { + "type": "data.core.digitalTwinRegistry", "description": "Battery Passport test data", "contenttype": "application/json" } diff --git a/deployment/infrastructure/resources/digitaltwins/IMR18650V1.json b/deployment/infrastructure/resources/digitaltwins/IMR18650V1.json index b6a5ea0f7..249c717b7 100644 --- a/deployment/infrastructure/resources/digitaltwins/IMR18650V1.json +++ b/deployment/infrastructure/resources/digitaltwins/IMR18650V1.json @@ -10,7 +10,16 @@ "specificAssetIds": [ { "name": "partInstanceId", - "value": "IMR18650V1" + "value": "IMR18650V1", + "externalSubjectId": { + "type": "ExternalReference", + "keys": [ + { + "type": "Submodel", + "value": "" + } + ] + } } ], "submodelDescriptors": [ @@ -26,7 +35,14 @@ ], "subprotocol": "DSP", "subprotocolBody": "id=365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918;dspEndpoint=https://materialpass.int.demo.catena-x.net/BPNL000000000000/", - "subprotocolBodyEncoding": "plain" + "subprotocolBodyEncoding": "plain", + "securityAttributes": [ + { + "type": "NONE", + "key": "NONE", + "value": "NONE" + } + ] } } ], diff --git a/deployment/infrastructure/resources/digitaltwins/NCR186850B.json b/deployment/infrastructure/resources/digitaltwins/NCR186850B.json index 1de16fe1b..0c2e2cf33 100644 --- a/deployment/infrastructure/resources/digitaltwins/NCR186850B.json +++ b/deployment/infrastructure/resources/digitaltwins/NCR186850B.json @@ -10,7 +10,16 @@ "specificAssetIds": [ { "name": "partInstanceId", - "value": "NCR186850B" + "value": "NCR186850B", + "externalSubjectId": { + "type": "ExternalReference", + "keys": [ + { + "type": "Submodel", + "value": "" + } + ] + } } ], "submodelDescriptors": [ @@ -26,7 +35,14 @@ ], "subprotocol": "DSP", "subprotocolBody": "id=1f4a64f0-aba9-498a-917c-4936c24c50cd-49a06ad2-64b7-46c8-9f3b-a718c462ca23;dspEndpoint=https://materialpass.int.demo.catena-x.net/BPNL000000000000/", - "subprotocolBodyEncoding": "plain" + "subprotocolBodyEncoding": "plain", + "securityAttributes": [ + { + "type": "NONE", + "key": "NONE", + "value": "NONE" + } + ] } } ], diff --git a/deployment/infrastructure/resources/digitaltwins/X123456789012X12345678901234566.json b/deployment/infrastructure/resources/digitaltwins/X123456789012X12345678901234566.json index 2d0e861c7..260caa95a 100644 --- a/deployment/infrastructure/resources/digitaltwins/X123456789012X12345678901234566.json +++ b/deployment/infrastructure/resources/digitaltwins/X123456789012X12345678901234566.json @@ -10,7 +10,16 @@ "specificAssetIds": [ { "name": "partInstanceId", - "value": "X123456789012X12345678901234566" + "value": "X123456789012X12345678901234566", + "externalSubjectId": { + "type": "ExternalReference", + "keys": [ + { + "type": "Submodel", + "value": "" + } + ] + } } ], "submodelDescriptors": [ @@ -26,7 +35,14 @@ ], "subprotocol": "DSP", "subprotocolBody": "id=32aa72de-297a-4405-9148-13e12744028a-699f1245-f57e-4d6b-acdb-ab763665554a;dspEndpoint=https://materialpass.int.demo.catena-x.net/BPNL000000000000/", - "subprotocolBodyEncoding": "plain" + "subprotocolBodyEncoding": "plain", + "securityAttributes": [ + { + "type": "NONE", + "key": "NONE", + "value": "NONE" + } + ] } } ], diff --git a/deployment/infrastructure/resources/digitaltwins/Y792927456954B81677903848654570.json b/deployment/infrastructure/resources/digitaltwins/Y792927456954B81677903848654570.json index d742cdf21..0bff04ea4 100644 --- a/deployment/infrastructure/resources/digitaltwins/Y792927456954B81677903848654570.json +++ b/deployment/infrastructure/resources/digitaltwins/Y792927456954B81677903848654570.json @@ -10,7 +10,16 @@ "specificAssetIds": [ { "name": "partInstanceId", - "value": "Y792927456954B81677903848654570" + "value": "Y792927456954B81677903848654570", + "externalSubjectId": { + "type": "ExternalReference", + "keys": [ + { + "type": "Submodel", + "value": "" + } + ] + } } ], "submodelDescriptors": [ @@ -26,7 +35,14 @@ ], "subprotocol": "DSP", "subprotocolBody": "id=1f0ef836-40b7-4f31-a9bd-cb6a8960779e-26bf39c5-68a5-43a1-8db7-d33e116a6f61;dspEndpoint=https://materialpass.int.demo.catena-x.net/BPNL000000000000/", - "subprotocolBodyEncoding": "plain" + "subprotocolBodyEncoding": "plain", + "securityAttributes": [ + { + "type": "NONE", + "key": "NONE", + "value": "NONE" + } + ] } } ], @@ -49,4 +65,4 @@ ] } ] -} +} \ No newline at end of file