From 1122c015570e2ff7af03b44e29800a074aa25591 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Mon, 6 May 2024 14:02:57 +0200 Subject: [PATCH 01/18] chore(dependabot): 778 update of irs --- charts/traceability-foss/Chart.yaml | 4 ++-- pom.xml | 2 +- tx-backend/pom.xml | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/charts/traceability-foss/Chart.yaml b/charts/traceability-foss/Chart.yaml index cbf3716ca4..7eb389c330 100644 --- a/charts/traceability-foss/Chart.yaml +++ b/charts/traceability-foss/Chart.yaml @@ -40,9 +40,9 @@ dependencies: repository: https://helm.runix.net version: 1.23.1 condition: pgadmin4.enabled - - name: irs-helm + - name: item-relationship-service repository: https://eclipse-tractusx.github.io/item-relationship-service - version: 6.18.0 + version: 7.0.1 condition: irs-helm.enabled - name: tractusx-connector repository: https://eclipse-tractusx.github.io/tractusx-edc diff --git a/pom.xml b/pom.xml index 97e3d46c16..2e212a1bb6 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ SPDX-License-Identifier: Apache-2.0 7.16.1 5.10.2 4.2.1 - 1.8.0 + 2.0.0 5.4.0 jacoco diff --git a/tx-backend/pom.xml b/tx-backend/pom.xml index 3360e05bb5..6bf3319655 100644 --- a/tx-backend/pom.xml +++ b/tx-backend/pom.xml @@ -65,6 +65,8 @@ SPDX-License-Identifier: Apache-2.0 irs-registry-client ${irs-client-lib.version} + + org.eclipse.tractusx.traceability From ba67b58d7fc0468830e25e8ec18bdfb0425a2ffe Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Mon, 6 May 2024 14:18:42 +0200 Subject: [PATCH 02/18] chore(dependabot): 778 removed edc dependencies since there are all existing in the edc client lib of irs. --- tx-backend/pom.xml | 47 ---------------------------------------------- 1 file changed, 47 deletions(-) diff --git a/tx-backend/pom.xml b/tx-backend/pom.xml index 6bf3319655..d64db36641 100644 --- a/tx-backend/pom.xml +++ b/tx-backend/pom.xml @@ -89,53 +89,6 @@ SPDX-License-Identifier: Apache-2.0 spring-boot-starter-data-jpa - - - org.eclipse.edc - connector-core - ${edc-library.version} - - - runtime-metamodel - org.eclipse.edc - - - - - org.eclipse.edc - dsp - ${edc-library.version} - - - runtime-metamodel - org.eclipse.edc - - - - websocket-jakarta-server - org.eclipse.jetty.websocket - - - - - org.eclipse.edc - json-ld - ${edc-library.version} - - - runtime-metamodel - org.eclipse.edc - - - - - runtime-metamodel - org.eclipse.edc - ${edc-library.version} - - org.yaml snakeyaml From 031e25edfff11d182f3144e2f009fd9c24e5ea20 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Mon, 6 May 2024 15:10:55 +0200 Subject: [PATCH 03/18] chore(helm): 778 update values.yaml --- charts/traceability-foss/Chart.yaml | 2 +- charts/traceability-foss/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/traceability-foss/Chart.yaml b/charts/traceability-foss/Chart.yaml index 7eb389c330..ebe704ee19 100644 --- a/charts/traceability-foss/Chart.yaml +++ b/charts/traceability-foss/Chart.yaml @@ -43,7 +43,7 @@ dependencies: - name: item-relationship-service repository: https://eclipse-tractusx.github.io/item-relationship-service version: 7.0.1 - condition: irs-helm.enabled + condition: item-relationship-service.enabled - name: tractusx-connector repository: https://eclipse-tractusx.github.io/tractusx-edc version: 0.7.0 diff --git a/charts/traceability-foss/values.yaml b/charts/traceability-foss/values.yaml index 9a566d7e18..cd98a7d6bc 100644 --- a/charts/traceability-foss/values.yaml +++ b/charts/traceability-foss/values.yaml @@ -364,7 +364,7 @@ postgresql: ######################### # IRS configuration # ######################### -irs-helm: +item-relationship-service: enabled: false # nameOverride: "tracex-irs" fullnameOverride: "tracex-irs" From da6912e5957bc620ce96ae6292c15ad71b395fa4 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Mon, 6 May 2024 16:01:03 +0200 Subject: [PATCH 04/18] chore(helm): 778 update policy mapper of edc contract creation. --- .../assets/application/importpoc/mapper/PolicyMapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/importpoc/mapper/PolicyMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/importpoc/mapper/PolicyMapper.java index a97c95f107..a4f05b7123 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/importpoc/mapper/PolicyMapper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/importpoc/mapper/PolicyMapper.java @@ -37,12 +37,12 @@ public class PolicyMapper { public static EdcCreatePolicyDefinitionRequest mapToEdcPolicyRequest(PolicyResponse policy) { OdrlContext odrlContext = OdrlContext.builder().odrl("http://www.w3.org/ns/odrl/2/").build(); - EdcPolicy edcPolicy = EdcPolicy.builder().odrlPermissions(mapToPermissions(policy.permissions())).type("Policy").build(); + EdcPolicy edcPolicy = EdcPolicy.builder().odrlPermissions(mapToPermissions(policy.permissions())).type("odrl:Set").build(); return EdcCreatePolicyDefinitionRequest.builder() .policyDefinitionId(policy.policyId()) .policy(edcPolicy) .odrlContext(odrlContext) - .type("PolicyDefinitionRequestDto") + .type("odrl:Set") .build(); } From 05fce9ea4fc1047d80d382d96251b3dfa8d9afe5 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Tue, 7 May 2024 09:38:03 +0200 Subject: [PATCH 05/18] chore(helm): 778 updated test datascript call --- .github/workflows/argo.yml | 12 ++++++------ dev/README.md | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/argo.yml b/.github/workflows/argo.yml index 5ee87ab8ca..96cb3fdd45 100644 --- a/.github/workflows/argo.yml +++ b/.github/workflows/argo.yml @@ -378,19 +378,19 @@ jobs: curl -o transform-and-upload.py https://raw.githubusercontent.com/catenax-ng/tx-item-relationship-service/main/local/testing/testdata/transform-and-upload.py if [ "${{ github.event.inputs.testdata_upload }}" == "true" ]; then if [ "${{ github.event.inputs.environment }}" == "Dev/Test" ]; then - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-test.dev.demo.catena-x.net/api/submodel -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-test-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-test.dev.demo.catena-x.net/api/submodel -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-test-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry-dev.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry-dev.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 elif [ "${{ github.event.inputs.environment }}" == "E2E-A/E2E-B" ]; then - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-a.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-a.dev.demo.catena-x.net -a https://trace-x-registry-e2e-a.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-e2e-a-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-a.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-a.dev.demo.catena-x.net -a https://trace-x-registry-e2e-a.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-e2e-a-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-b.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-b.dev.demo.catena-x.net -a https://trace-x-registry-e2e-b.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-e2e-b-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-b.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-b.dev.demo.catena-x.net -a https://trace-x-registry-e2e-b.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-e2e-b-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 elif [ "${{ github.event.inputs.environment }}" == "int-a/int-b" ]; then - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-a.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-a.int.demo.catena-x.net -a https://trace-x-registry-int-a.int.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_INT_A }} --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-a.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-a.int.demo.catena-x.net -a https://trace-x-registry-int-a.int.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_INT_A }} --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV sleep 10 - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-b.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-b.int.demo.catena-x.net -a https://trace-x-registry-int-b.int.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_INT_B }} --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-b.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-b.int.demo.catena-x.net -a https://trace-x-registry-int-b.int.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_INT_B }} --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV sleep 10 fi elif [ "${{ github.event.inputs.testdata_upload }}" == "false" ]; then diff --git a/dev/README.md b/dev/README.md index 86c9709a3c..939028b3a7 100644 --- a/dev/README.md +++ b/dev/README.md @@ -32,49 +32,49 @@ Keep in mind to always update DEV and TEST since they are dependend on each othe Sample invocation (DEV) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC ``` Sample invocation (TEST) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-test.dev.demo.catena-x.net/api/submodel -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-test-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-test.dev.demo.catena-x.net/api/submodel -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-test-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC ``` Sample invocation (E2E A) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-e2e-a.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-a.dev.demo.catena-x.net -a https://trace-x-registry-e2e-a.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-e2e-a-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-e2e-a.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-a.dev.demo.catena-x.net -a https://trace-x-registry-e2e-a.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-e2e-a-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC ``` Sample invocation (E2E B) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-e2e-b.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-b.dev.demo.catena-x.net -a https://trace-x-registry-e2e-b.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-e2e-b-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-e2e-b.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-b.dev.demo.catena-x.net -a https://trace-x-registry-e2e-b.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-e2e-b-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC ``` Sample invocation (INT A) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-int-a.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-a.int.demo.catena-x.net -a https://trace-x-registry-int-a.int.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-int-a.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-a.int.demo.catena-x.net -a https://trace-x-registry-int-a.int.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV ``` Sample invocation (INT B) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-int-b.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-b.int.demo.catena-x.net -a https://trace-x-registry-int-b.int.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-int-b.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-b.int.demo.catena-x.net -a https://trace-x-registry-int-b.int.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV ``` Sample invocation (STABLE A) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-stable-a.stable.demo.catena-x.net/api/submodel -edc https://trace-x-edc-stable-a.stable.demo.catena-x.net -a https://trace-x-registry-stable-a.stable.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-stable-a-dataplane.stable.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-stable-a.stable.demo.catena-x.net/api/submodel -edc https://trace-x-edc-stable-a.stable.demo.catena-x.net -a https://trace-x-registry-stable-a.stable.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-stable-a-dataplane.stable.demo.catena-x.net -p id-3.0-trace -k --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV ``` Sample invocation (STABLE B) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-stable-b.stable.demo.catena-x.net/api/submodel -edc https://trace-x-edc-stable-b.stable.demo.catena-x.net -a https://trace-x-registry-stable-b.stable.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-stable-b-dataplane.stable.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.12.json -s https://traceability-stable-b.stable.demo.catena-x.net/api/submodel -edc https://trace-x-edc-stable-b.stable.demo.catena-x.net -a https://trace-x-registry-stable-b.stable.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-stable-b-dataplane.stable.demo.catena-x.net -p id-3.0-trace -k --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV ``` where: From 33ea2b9d0fbcc238754aac438317c386d386508e Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Tue, 7 May 2024 09:52:16 +0200 Subject: [PATCH 06/18] chore(helm): 778 updated test datascript call --- .github/workflows/argo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/argo.yml b/.github/workflows/argo.yml index 96cb3fdd45..3be27af7aa 100644 --- a/.github/workflows/argo.yml +++ b/.github/workflows/argo.yml @@ -375,7 +375,7 @@ jobs: - name: Upload testdata run: | python -m pip install requests - curl -o transform-and-upload.py https://raw.githubusercontent.com/catenax-ng/tx-item-relationship-service/main/local/testing/testdata/transform-and-upload.py + curl -o transform-and-upload.py https://raw.githubusercontent.com/eclipse-tractusx/item-relationship-service/main/local/testing/testdata/transform-and-upload.py if [ "${{ github.event.inputs.testdata_upload }}" == "true" ]; then if [ "${{ github.event.inputs.environment }}" == "Dev/Test" ]; then python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-test.dev.demo.catena-x.net/api/submodel -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-test-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC From c76974185ccf50b72df39e8f6174d860453c7037 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Tue, 7 May 2024 10:29:34 +0200 Subject: [PATCH 07/18] chore(helm): 778 update script --- .github/workflows/argo.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/argo.yml b/.github/workflows/argo.yml index 3be27af7aa..ccad70147a 100644 --- a/.github/workflows/argo.yml +++ b/.github/workflows/argo.yml @@ -378,19 +378,19 @@ jobs: curl -o transform-and-upload.py https://raw.githubusercontent.com/eclipse-tractusx/item-relationship-service/main/local/testing/testdata/transform-and-upload.py if [ "${{ github.event.inputs.testdata_upload }}" == "true" ]; then if [ "${{ github.event.inputs.environment }}" == "Dev/Test" ]; then - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-test.dev.demo.catena-x.net/api/submodel -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-test-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-test.dev.demo.catena-x.net/api/submodel -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-test-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry-dev.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry-dev.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 elif [ "${{ github.event.inputs.environment }}" == "E2E-A/E2E-B" ]; then - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-a.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-a.dev.demo.catena-x.net -a https://trace-x-registry-e2e-a.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-e2e-a-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-a.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-a.dev.demo.catena-x.net -a https://trace-x-registry-e2e-a.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-e2e-a-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-b.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-b.dev.demo.catena-x.net -a https://trace-x-registry-e2e-b.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-e2e-b-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-b.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-b.dev.demo.catena-x.net -a https://trace-x-registry-e2e-b.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-e2e-b-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 elif [ "${{ github.event.inputs.environment }}" == "int-a/int-b" ]; then - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-a.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-a.int.demo.catena-x.net -a https://trace-x-registry-int-a.int.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_INT_A }} --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-a.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-a.int.demo.catena-x.net -a https://trace-x-registry-int-a.int.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_INT_A }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV sleep 10 - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-b.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-b.int.demo.catena-x.net -a https://trace-x-registry-int-b.int.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_INT_B }} --aas3 --edcBPN BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-b.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-b.int.demo.catena-x.net -a https://trace-x-registry-int-b.int.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_INT_B }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV sleep 10 fi elif [ "${{ github.event.inputs.testdata_upload }}" == "false" ]; then From 353aa99c7d15f92ec0fcb090ab0e99447fa41ed2 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Tue, 7 May 2024 10:57:32 +0200 Subject: [PATCH 08/18] chore(helm): 778 update script --- .github/workflows/argo.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/argo.yml b/.github/workflows/argo.yml index ccad70147a..2d7c97aad2 100644 --- a/.github/workflows/argo.yml +++ b/.github/workflows/argo.yml @@ -378,19 +378,19 @@ jobs: curl -o transform-and-upload.py https://raw.githubusercontent.com/eclipse-tractusx/item-relationship-service/main/local/testing/testdata/transform-and-upload.py if [ "${{ github.event.inputs.testdata_upload }}" == "true" ]; then if [ "${{ github.event.inputs.environment }}" == "Dev/Test" ]; then - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-test.dev.demo.catena-x.net/api/submodel -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-test-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-test.dev.demo.catena-x.net/api/submodel/data -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-test-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry-dev.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability.dev.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry-dev.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 elif [ "${{ github.event.inputs.environment }}" == "E2E-A/E2E-B" ]; then - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-a.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-a.dev.demo.catena-x.net -a https://trace-x-registry-e2e-a.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-e2e-a-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-a.dev.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc-e2e-a.dev.demo.catena-x.net -a https://trace-x-registry-e2e-a.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-e2e-a-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-b.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-b.dev.demo.catena-x.net -a https://trace-x-registry-e2e-b.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-e2e-b-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-b.dev.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc-e2e-b.dev.demo.catena-x.net -a https://trace-x-registry-e2e-b.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-e2e-b-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 elif [ "${{ github.event.inputs.environment }}" == "int-a/int-b" ]; then - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-a.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-a.int.demo.catena-x.net -a https://trace-x-registry-int-a.int.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_INT_A }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-a.int.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc-int-a.int.demo.catena-x.net -a https://trace-x-registry-int-a.int.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_INT_A }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV sleep 10 - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-b.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-b.int.demo.catena-x.net -a https://trace-x-registry-int-b.int.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_INT_B }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-b.int.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc-int-b.int.demo.catena-x.net -a https://trace-x-registry-int-b.int.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_INT_B }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV sleep 10 fi elif [ "${{ github.event.inputs.testdata_upload }}" == "false" ]; then From 365c4cb25c0e494c5db0e7d33bf111b9b95706b3 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Tue, 7 May 2024 11:35:35 +0200 Subject: [PATCH 09/18] chore(helm): 778 override bean --- .../config/DecentralRegistryClientConfig.java | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/DecentralRegistryClientConfig.java diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/DecentralRegistryClientConfig.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/DecentralRegistryClientConfig.java new file mode 100644 index 0000000000..6d66c551f8 --- /dev/null +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/DecentralRegistryClientConfig.java @@ -0,0 +1,49 @@ +/******************************************************************************** + * Copyright (c) 2024 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 + ********************************************************************************/ +package org.eclipse.tractusx.traceability.common.config; + +import org.eclipse.tractusx.irs.edc.client.EdcSubmodelFacade; +import org.eclipse.tractusx.irs.edc.client.exceptions.EdcClientException; +import org.eclipse.tractusx.irs.registryclient.decentral.EdcEndpointReferenceRetriever; +import org.eclipse.tractusx.irs.registryclient.decentral.EdcRetrieverException; +import org.eclipse.tractusx.irs.registryclient.decentral.EndpointDataForConnectorsService; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Bean; + +import static com.zaxxer.hikari.hibernate.HikariConfigurationUtil.CONFIG_PREFIX; + +public class DecentralRegistryClientConfig { + + + // TODO fix in irs + @Bean + @ConditionalOnProperty(prefix = CONFIG_PREFIX, name = "type", havingValue = "decentral") + public EndpointDataForConnectorsService endpointDataForConnectorsService(final EdcSubmodelFacade facade) { + + final EdcEndpointReferenceRetriever edcEndpointReferenceRetriever = (edcConnectorEndpoint, assetType, assetValue, bpn) -> { + try { + return facade.getEndpointReferencesForAsset(edcConnectorEndpoint, assetType, assetValue, bpn); + } catch (EdcClientException e) { + throw new EdcRetrieverException(e); + } + }; + + return new EndpointDataForConnectorsService(edcEndpointReferenceRetriever); + } +} From b71dd1d3a8ff4e908b6f8828f4812becf2b35491 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Tue, 7 May 2024 11:46:43 +0200 Subject: [PATCH 10/18] chore(helm): 778 override bean --- .../common/config/DecentralRegistryClientConfig.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/DecentralRegistryClientConfig.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/DecentralRegistryClientConfig.java index 6d66c551f8..6f60a548be 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/DecentralRegistryClientConfig.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/DecentralRegistryClientConfig.java @@ -25,9 +25,10 @@ import org.eclipse.tractusx.irs.registryclient.decentral.EndpointDataForConnectorsService; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import static com.zaxxer.hikari.hibernate.HikariConfigurationUtil.CONFIG_PREFIX; - +@Configuration public class DecentralRegistryClientConfig { From c53d2ebc3ef1dcd896dae8943e901391eb7c5335 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Tue, 7 May 2024 11:59:18 +0200 Subject: [PATCH 11/18] chore(helm): 778 override bean --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2e212a1bb6..c574ceb7fc 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ SPDX-License-Identifier: Apache-2.0 7.16.1 5.10.2 4.2.1 - 2.0.0 + 2.0.1-SNAPSHOT 5.4.0 jacoco From f585862ae2ba80d6df69193c68da3c309e78cb90 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Tue, 7 May 2024 12:33:25 +0200 Subject: [PATCH 12/18] chore(helm): 778 update policy --- .../CX_Testdata_MessagingTest_v0.0.13.json | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.13.json b/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.13.json index 24badfba2b..1eae6233ae 100644 --- a/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.13.json +++ b/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.13.json @@ -1,26 +1,26 @@ { "policies" : { - "ID 3.0 Trace" : { - "@context" : { - "odrl" : "http://www.w3.org/ns/odrl/2/" + "ID 3.1 Trace": { + "@context": { + "odrl": "http://www.w3.org/ns/odrl/2/" }, - "@type" : "PolicyDefinitionRequestDto", - "@id" : "id-3.0-trace", - "policy" : { - "@type" : "Policy", - "odrl:permission" : [ + "@type": "PolicyDefinitionRequestDto", + "@id": "id-3.1-trace", + "policy": { + "@type": "odrl:Set", + "odrl:permission": [ { - "odrl:action" : "USE", - "odrl:constraint" : { - "@type" : "AtomicConstraint", - "odrl:or" : [ + "odrl:action": "USE", + "odrl:constraint": { + "@type": "AtomicConstraint", + "odrl:or": [ { - "@type" : "Constraint", - "odrl:leftOperand" : "PURPOSE", - "odrl:operator" : { - "@id" : "odrl:eq" + "@type": "Constraint", + "odrl:leftOperand": "PURPOSE", + "odrl:operator": { + "@id": "odrl:eq" }, - "odrl:rightOperand" : "ID 3.0 Trace" + "odrl:rightOperand": "ID 3.1 Trace" } ] } From 18982c8b2866d996ed30a207c02946cde3d491fe Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Tue, 7 May 2024 13:38:59 +0200 Subject: [PATCH 13/18] chore(helm): 778 update policy --- .github/workflows/argo.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/argo.yml b/.github/workflows/argo.yml index 2d7c97aad2..db8c0e27ac 100644 --- a/.github/workflows/argo.yml +++ b/.github/workflows/argo.yml @@ -378,19 +378,19 @@ jobs: curl -o transform-and-upload.py https://raw.githubusercontent.com/eclipse-tractusx/item-relationship-service/main/local/testing/testdata/transform-and-upload.py if [ "${{ github.event.inputs.testdata_upload }}" == "true" ]; then if [ "${{ github.event.inputs.environment }}" == "Dev/Test" ]; then - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-test.dev.demo.catena-x.net/api/submodel/data -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-test-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-test.dev.demo.catena-x.net/api/submodel/data -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-test-edc-dataplane.dev.demo.catena-x.net -p id-3.1-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability.dev.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry-dev.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability.dev.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry-dev.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-dataplane.dev.demo.catena-x.net -p id-3.1-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 elif [ "${{ github.event.inputs.environment }}" == "E2E-A/E2E-B" ]; then - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-a.dev.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc-e2e-a.dev.demo.catena-x.net -a https://trace-x-registry-e2e-a.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-e2e-a-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-a.dev.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc-e2e-a.dev.demo.catena-x.net -a https://trace-x-registry-e2e-a.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-e2e-a-dataplane.dev.demo.catena-x.net -p id-3.1-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-b.dev.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc-e2e-b.dev.demo.catena-x.net -a https://trace-x-registry-e2e-b.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-e2e-b-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-e2e-b.dev.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc-e2e-b.dev.demo.catena-x.net -a https://trace-x-registry-e2e-b.dev.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-e2e-b-dataplane.dev.demo.catena-x.net -p id-3.1-trace -k ${{ secrets.TRACE_X_API_KEY_DEV }} --aas3 --edcBPN BPNL00000003CNKC --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC sleep 10 elif [ "${{ github.event.inputs.environment }}" == "int-a/int-b" ]; then - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-a.int.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc-int-a.int.demo.catena-x.net -a https://trace-x-registry-int-a.int.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_INT_A }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-a.int.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc-int-a.int.demo.catena-x.net -a https://trace-x-registry-int-a.int.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.1-trace -k ${{ secrets.TRACE_X_API_KEY_INT_A }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV sleep 10 - python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-b.int.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc-int-b.int.demo.catena-x.net -a https://trace-x-registry-int-b.int.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k ${{ secrets.TRACE_X_API_KEY_INT_B }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV + python transform-and-upload.py -f ./tx-backend/testdata/CX_Testdata_MessagingTest_v${{ github.event.inputs.testdata_version }}.json -s https://traceability-int-b.int.demo.catena-x.net/api/submodel/data -edc https://trace-x-edc-int-b.int.demo.catena-x.net -a https://trace-x-registry-int-b.int.demo.catena-x.net/semantics/registry/api/v3 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.1-trace -k ${{ secrets.TRACE_X_API_KEY_INT_B }} --aas3 --edcBPN BPNL00000003CML1 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV sleep 10 fi elif [ "${{ github.event.inputs.testdata_upload }}" == "false" ]; then From c9494577a12c37a8cd804007e7a47bfc391a3b37 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Tue, 7 May 2024 14:00:49 +0200 Subject: [PATCH 14/18] chore(helm): 778 update irs --- charts/traceability-foss/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/traceability-foss/Chart.yaml b/charts/traceability-foss/Chart.yaml index ebe704ee19..cd64b7428d 100644 --- a/charts/traceability-foss/Chart.yaml +++ b/charts/traceability-foss/Chart.yaml @@ -42,7 +42,7 @@ dependencies: condition: pgadmin4.enabled - name: item-relationship-service repository: https://eclipse-tractusx.github.io/item-relationship-service - version: 7.0.1 + version: 7.1.0 condition: item-relationship-service.enabled - name: tractusx-connector repository: https://eclipse-tractusx.github.io/tractusx-edc From 0c063de1a5be0804a3b5204bb0edf33783a3417d Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Tue, 7 May 2024 15:36:07 +0200 Subject: [PATCH 15/18] chore(helm): 778 updated testdata set --- .../CX_Testdata_MessagingTest_v0.0.13.json | 235 ++---------------- 1 file changed, 24 insertions(+), 211 deletions(-) diff --git a/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.13.json b/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.13.json index 1eae6233ae..99c74c38e3 100644 --- a/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.13.json +++ b/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.13.json @@ -77,10 +77,6 @@ { "value" : "OMAOYGBDTSRCMYSCX", "key" : "van" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { @@ -132,14 +128,10 @@ { "value" : "NO-313869652971440618042264", "key" : "partInstanceId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", @@ -195,14 +187,10 @@ { "value" : "NO-584478761469608738361558", "key" : "partInstanceId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:1d2d8480-90a5-4a17-9ecb-2ff039d35fec", @@ -279,14 +267,10 @@ { "value" : "OMAYSKEITUGNVHKKX", "key" : "van" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { - "date" : "2015-03-07T19:38:12.000Z", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:d8030bbf-a874-49fb-b2e1-7610f0ccad12", @@ -334,14 +318,10 @@ { "value" : "NO-989134870198932317923938", "key" : "partInstanceId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", @@ -397,14 +377,10 @@ { "value" : "NO-493575190274381019348907", "key" : "partInstanceId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:4e390dab-707f-446e-bfbe-653f6f5b1f37", @@ -481,14 +457,10 @@ { "value" : "OMAZRXWWMSPTQUEKI", "key" : "van" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { - "date" : "2015-07-04T14:30:31.000Z", + "date" : "2015-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:7c7d5aec-b15d-491c-8fbd-c61c6c02c69a", @@ -536,14 +508,10 @@ { "value" : "NO-004314332935115065980115", "key" : "partInstanceId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", @@ -599,14 +567,10 @@ { "value" : "NO-246880451848384868750731", "key" : "partInstanceId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:4a5e9ff6-2d5c-4510-a90e-d55af3ba502f", @@ -683,14 +647,10 @@ { "value" : "OMAFIVCDHEBNXKNHH", "key" : "van" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { - "date" : "2015-01-03T03:16:41.000Z", + "date" : "2015-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:4d33bfa6-0f1f-43a5-ad63-c3fe07a2d076", @@ -738,14 +698,10 @@ { "value" : "NO-477013846751358222215326", "key" : "partInstanceId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", @@ -801,14 +757,10 @@ { "value" : "NO-613963493493659233961306", "key" : "partInstanceId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:6ec3f1db-2798-454b-a73f-0d21a8966c74", @@ -868,10 +820,6 @@ { "value" : "NO-341449848714937445621543", "key" : "batchId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { @@ -927,10 +875,6 @@ { "value" : "NO-341449848714937445621543", "key" : "batchId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { @@ -963,10 +907,6 @@ { "value" : "NO-341449848714937445621543", "key" : "batchId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { @@ -1016,10 +956,6 @@ { "value" : "NO-341449848714937445621543", "key" : "batchId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { @@ -1071,10 +1007,6 @@ { "value" : "NO-341449848714937445621543", "key" : "batchId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { @@ -1126,10 +1058,6 @@ { "value" : "NO-341449848714937445621543", "key" : "batchId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { @@ -1187,10 +1115,6 @@ { "value" : "NO-341449848714937445621543", "key" : "batchId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { @@ -1218,10 +1142,6 @@ "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ { "localIdentifiers" : [ - { - "value" : "PartType", - "key" : "digitalTwinType" - } ], "validityPeriod" : { "validFrom" : "2019-04-04T03:19:03.000Z", @@ -1237,8 +1157,7 @@ "classificationDescription" : "classificationDescription" } ], - "nameAtManufacturer" : "a/dev Vehicle Model A", - "digitalTwinType" : "PartType" + "nameAtManufacturer" : "a/dev Vehicle Model A" }, "partSitesInformationAsPlanned" : [ { @@ -1291,10 +1210,6 @@ "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ { "localIdentifiers" : [ - { - "value" : "PartType", - "key" : "digitalTwinType" - } ], "validityPeriod" : { "validFrom" : "2019-04-04T03:19:03.000Z", @@ -1305,9 +1220,9 @@ "manufacturerPartId" : "7805659-25", "partClassification" : [ { - "classificationStandard": "classificationStandard", - "classificationID": "classificationID", - "classificationDescription": "classificationDescription" + "classificationStandard" : "classificationStandard", + "classificationID" : "classificationID", + "classificationDescription" : "classificationDescription" } ], "nameAtManufacturer" : "b/test Vehicle Model B" @@ -1370,10 +1285,6 @@ { "value" : "12345678ABC", "key" : "jisNumber" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { @@ -1404,10 +1315,6 @@ { "value" : "12345678ABC", "key" : "jisNumber" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { @@ -1444,10 +1351,6 @@ "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ { "localIdentifiers" : [ - { - "value" : "PartType", - "key" : "digitalTwinType" - } ], "validityPeriod" : { "validFrom" : "2015-05-18T23:10:44.000Z", @@ -1531,10 +1434,7 @@ "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ { "localIdentifiers" : [ - { - "value" : "PartType", - "key" : "digitalTwinType" - } + ], "validityPeriod" : { "validFrom" : "2017-01-03T07:45:04.000Z", @@ -1597,10 +1497,7 @@ "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ { "localIdentifiers" : [ - { - "value" : "PartType", - "key" : "digitalTwinType" - } + ], "validityPeriod" : { "validFrom" : "2018-01-25T08:42:58.000Z", @@ -1684,10 +1581,6 @@ "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ { "localIdentifiers" : [ - { - "value" : "PartType", - "key" : "digitalTwinType" - } ], "validityPeriod" : { "validFrom" : "2016-04-28T20:00:55.000Z", @@ -1749,10 +1642,6 @@ "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ { "localIdentifiers" : [ - { - "value" : "PartType", - "key" : "digitalTwinType" - } ], "validityPeriod" : { "validFrom" : "2015-05-18T23:10:44.000Z", @@ -1815,10 +1704,6 @@ "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ { "localIdentifiers" : [ - { - "value" : "PartType", - "key" : "digitalTwinType" - } ], "validityPeriod" : { "validFrom" : "2013-11-24T00:27:33.000Z", @@ -1860,10 +1745,6 @@ "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ { "localIdentifiers" : [ - { - "value" : "PartType", - "key" : "digitalTwinType" - } ], "validityPeriod" : { "validFrom" : "2017-07-03T05:23:01.000Z", @@ -1940,10 +1821,6 @@ "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ { "localIdentifiers" : [ - { - "value" : "PartType", - "key" : "digitalTwinType" - } ], "validityPeriod" : { "validFrom" : "2013-06-18T03:47:22.000Z", @@ -2006,10 +1883,6 @@ "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ { "localIdentifiers" : [ - { - "value" : "PartType", - "key" : "digitalTwinType" - } ], "validityPeriod" : { "validFrom" : "2015-01-23T16:24:59.000Z", @@ -2093,10 +1966,6 @@ "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ { "localIdentifiers" : [ - { - "value" : "PartType", - "key" : "digitalTwinType" - } ], "validityPeriod" : { "validFrom" : "2016-04-24T08:26:56.000Z", @@ -2180,10 +2049,6 @@ "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ { "localIdentifiers" : [ - { - "value" : "PartType", - "key" : "digitalTwinType" - } ], "validityPeriod" : { "validFrom" : "2019-08-17T14:14:30.000Z", @@ -2246,10 +2111,6 @@ "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ { "localIdentifiers" : [ - { - "value" : "PartType", - "key" : "digitalTwinType" - } ], "validityPeriod" : { "validFrom" : "2016-04-09T20:41:14.000Z", @@ -2312,10 +2173,6 @@ "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned" : [ { "localIdentifiers" : [ - { - "value" : "PartType", - "key" : "digitalTwinType" - } ], "validityPeriod" : { "validFrom" : "2019-11-02T11:14:15.000Z", @@ -2351,14 +2208,10 @@ { "value" : "NO-282209222605524629600815", "key" : "partInstanceId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:44347dec-21d1-47aa-b2a7-f959bf9d424b", @@ -2427,14 +2280,10 @@ { "value" : "NO-917923082133064161014067", "key" : "partInstanceId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:b0acf3e1-3fbe-46c0-aa0b-0724caae7772", @@ -2479,14 +2328,10 @@ { "value" : "NO-135342108157438763234738", "key" : "partInstanceId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:1233b405-5ac8-4867-93f8-6fdf37733737", @@ -2531,14 +2376,10 @@ { "value" : "NO-655858074471261486971940", "key" : "partInstanceId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:da978a30-4dde-4d76-808a-b7946763ff0d", @@ -2563,10 +2404,6 @@ { "value" : "92879626SFC", "key" : "jisNumber" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { @@ -2597,14 +2434,10 @@ { "value" : "NO-200738629800530338038454", "key" : "partInstanceId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:bcfae197-40fa-4be0-821d-5c1873a1b7c2", @@ -2629,10 +2462,6 @@ { "value" : "85851549CBX", "key" : "jisNumber" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { @@ -2685,14 +2514,10 @@ { "value" : "NO-570196089623842018037372", "key" : "partInstanceId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4070e", @@ -2743,10 +2568,6 @@ { "value" : "BID12345678", "key" : "batchId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { @@ -2789,14 +2610,10 @@ { "value" : "NO-570196089623842018037372", "key" : "partInstanceId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { - "date" : "2022-02-04T14:48:54", + "date" : "2022-02-04T14:48:54Z", "country" : "DEU" }, "catenaXId" : "urn:uuid:254604ab-2153-45fb-8cad-54ef09f4080f", @@ -2847,10 +2664,6 @@ { "value" : "BID12345678", "key" : "batchId" - }, - { - "value" : "PartInstance", - "key" : "digitalTwinType" } ], "manufacturingInformation" : { From 75cccfad8d64bdc8a3cc4ba12a14bb7fc61a29e7 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Tue, 7 May 2024 15:53:10 +0200 Subject: [PATCH 16/18] chore(helm): 778 updated testdata set --- .../CX_Testdata_MessagingTest_v0.0.13.json | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.13.json b/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.13.json index 99c74c38e3..6567d2cf2a 100644 --- a/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.13.json +++ b/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.13.json @@ -58,7 +58,8 @@ "createdOn" : "2022-02-03T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z", "catenaXId" : "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd", - "businessPartner" : "BPNL00000003CNKC" + "businessPartner" : "BPNL00000003CNKC", + "hasAlternatives": false } ] } @@ -113,7 +114,8 @@ "createdOn" : "2023-02-20T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z", "catenaXId" : "urn:uuid:1d2d8480-90a5-4a17-9ecb-2ff039d35fec", - "businessPartner" : "BPNL00000003CSGV" + "businessPartner" : "BPNL00000003CSGV", + "hasAlternatives": false } ] } @@ -248,7 +250,8 @@ "createdOn" : "2021-01-15T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z", "catenaXId" : "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a", - "businessPartner" : "BPNL00000003CNKC" + "businessPartner" : "BPNL00000003CNKC", + "hasAlternatives": false } ] } @@ -303,7 +306,8 @@ "createdOn" : "2020-05-02T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z", "catenaXId" : "urn:uuid:4e390dab-707f-446e-bfbe-653f6f5b1f37", - "businessPartner" : "BPNL00000003CML1" + "businessPartner" : "BPNL00000003CML1", + "hasAlternatives": false } ] } @@ -438,7 +442,8 @@ "createdOn" : "2022-11-22T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z", "catenaXId" : "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd", - "businessPartner" : "BPNL00000003CNKC" + "businessPartner" : "BPNL00000003CNKC", + "hasAlternatives": false } ] } @@ -493,7 +498,8 @@ "createdOn" : "2018-09-17T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z", "catenaXId" : "urn:uuid:4a5e9ff6-2d5c-4510-a90e-d55af3ba502f", - "businessPartner" : "BPNL00000003CML1" + "businessPartner" : "BPNL00000003CML1", + "hasAlternatives": false } ] } @@ -628,7 +634,8 @@ "createdOn" : "2021-10-24T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z", "catenaXId" : "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d", - "businessPartner" : "BPNL00000003CNKC" + "businessPartner" : "BPNL00000003CNKC", + "hasAlternatives": false } ] } @@ -683,7 +690,8 @@ "createdOn" : "2022-06-28T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z", "catenaXId" : "urn:uuid:6ec3f1db-2798-454b-a73f-0d21a8966c74", - "businessPartner" : "BPNL00000003CML1" + "businessPartner" : "BPNL00000003CML1", + "hasAlternatives": false } ] } @@ -933,7 +941,8 @@ "createdOn" : "2016-01-20T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z", "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb01", - "businessPartner" : "BPNL00000003CNKC" + "businessPartner" : "BPNL00000003CNKC", + "hasAlternatives": false } ] } @@ -1039,7 +1048,8 @@ "createdOn" : "2019-08-15T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z", "catenaXId" : "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa03", - "businessPartner" : "BPNL00000003CML1" + "businessPartner" : "BPNL00000003CML1", + "hasAlternatives": false } ] } @@ -2547,7 +2557,7 @@ "unit" : "unit:litre" }, "hasAlternatives" : true, - "businessPartner" : "BPNL00000003CML1", + "businessPartner" : "BPNL00000003CML1",, "createdOn" : "2022-02-03T14:48:54.709Z", "lastModifiedOn" : "2022-02-03T14:48:54.709Z" } From 682f6ef1015fc699784ea724b4689c5c57ec59f1 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Tue, 7 May 2024 16:27:09 +0200 Subject: [PATCH 17/18] chore(helm): 778 updated testdata set --- .../config/DecentralRegistryClientConfig.java | 50 ------------------- 1 file changed, 50 deletions(-) delete mode 100644 tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/DecentralRegistryClientConfig.java diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/DecentralRegistryClientConfig.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/DecentralRegistryClientConfig.java deleted file mode 100644 index 6f60a548be..0000000000 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/DecentralRegistryClientConfig.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2024 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 - ********************************************************************************/ -package org.eclipse.tractusx.traceability.common.config; - -import org.eclipse.tractusx.irs.edc.client.EdcSubmodelFacade; -import org.eclipse.tractusx.irs.edc.client.exceptions.EdcClientException; -import org.eclipse.tractusx.irs.registryclient.decentral.EdcEndpointReferenceRetriever; -import org.eclipse.tractusx.irs.registryclient.decentral.EdcRetrieverException; -import org.eclipse.tractusx.irs.registryclient.decentral.EndpointDataForConnectorsService; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import static com.zaxxer.hikari.hibernate.HikariConfigurationUtil.CONFIG_PREFIX; -@Configuration -public class DecentralRegistryClientConfig { - - - // TODO fix in irs - @Bean - @ConditionalOnProperty(prefix = CONFIG_PREFIX, name = "type", havingValue = "decentral") - public EndpointDataForConnectorsService endpointDataForConnectorsService(final EdcSubmodelFacade facade) { - - final EdcEndpointReferenceRetriever edcEndpointReferenceRetriever = (edcConnectorEndpoint, assetType, assetValue, bpn) -> { - try { - return facade.getEndpointReferencesForAsset(edcConnectorEndpoint, assetType, assetValue, bpn); - } catch (EdcClientException e) { - throw new EdcRetrieverException(e); - } - }; - - return new EndpointDataForConnectorsService(edcEndpointReferenceRetriever); - } -} From b8b48335dee153fa95b01d0a5b8bd37506b8ff8b Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Tue, 7 May 2024 17:14:09 +0200 Subject: [PATCH 18/18] chore(helm): 778 updated testdata set --- .../testdata/CX_Testdata_MessagingTest_v0.0.13.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.13.json b/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.13.json index 6567d2cf2a..4367f4eaa4 100644 --- a/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.13.json +++ b/tx-backend/testdata/CX_Testdata_MessagingTest_v0.0.13.json @@ -876,10 +876,6 @@ "value" : "BPNL00000003CML1", "key" : "manufacturerId" }, - { - "value" : "9858559-85", - "key" : "manufacturerPartId" - }, { "value" : "NO-341449848714937445621543", "key" : "batchId" @@ -908,10 +904,6 @@ "value" : "BPNL00000003CML1", "key" : "manufacturerId" }, - { - "value" : "9623673-66", - "key" : "manufacturerPartId" - }, { "value" : "NO-341449848714937445621543", "key" : "batchId"