Merge pull request #383 from catenax-ng/main

Merge from CatenaX fork
eclipse-tractusx · Jan 23, 2024 · 58a2ddc · 58a2ddc
2 parents 5dfc9db + e7b757a
commit 58a2ddc
Show file tree

Hide file tree

Showing 451 changed files with 1,410 additions and 932 deletions.
diff --git a/.config/irs.header b/.config/irs.header
@@ -1,8 +1,8 @@
 ^/\*\*{79}$
-^ \* Copyright \(c\) 2021,2022,2023$
+^ \* Copyright \(c\) 2022,2024$
 ^ \*       2022: ZF Friedrichshafen AG$
 ^ \*       2022: ISTOS GmbH$
-^ \*       2022,2023: Bayerische Motoren Werke Aktiengesellschaft \(BMW AG\)$
+^ \*       2022,2024: Bayerische Motoren Werke Aktiengesellschaft \(BMW AG\)$
 ^ \*       2022,2023: BOSCH AG$
 ^ \* Copyright \(c\) 2021,2024 Contributors to the Eclipse Foundation$
 ^ \*$

diff --git a/.github/workflows/irs-build.yml b/.github/workflows/irs-build.yml
@@ -80,7 +80,8 @@ jobs:
         run: |
           mvn --batch-mode --update-snapshots verify \
           org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
-          -Dsonar.projectKey=${{ secrets.SONAR_PROJECT_KEY }} -Dsonar.organization=${{ secrets.SONAR_ORGANIZATION }}
+          -Dsonar.projectKey=${{ secrets.SONAR_PROJECT_KEY }} -Dsonar.organization=${{ secrets.SONAR_ORGANIZATION }} \
+          -Dcheckstyle.skip -Dpmd.skip=true
 
   build_images:
     strategy:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,11 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Updated license header to "Copyright (c) 2021,2024 Contributors to the Eclipse Foundation"
+- Changed lookupGlobalAssetIds to lookupShellsByBPN, which provides full object.
 
 ## [4.4.0] - 2024-01-15
 ### Added
 - Added EDR token cache to reuse token after contract negotiation
 - Added cache mechanism in DiscoveryFinderClientImpl for findDiscoveryEndpoints
+- Add concept docs/#322-Provisioning-of-contractAgreementId-for-assets.md
 
 ### Changed
 - Authentication was redesigned to use API keys, instead of OAuth2 protocol. The api key has to be sent as a X-API-KEY request header. IRS is supporting two types of API keys - one for admin and one for regular/view usage. Use new ``apiKeyAdmin`` and ``apiKeyRegular`` config entries to set up API keys.

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
-# Copyright (c) 2021,2022,2023
+# Copyright (c) 2022,2024
 #       2022: ZF Friedrichshafen AG
 #       2022: ISTOS GmbH
-#       2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#       2022,2024: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #       2022,2023: BOSCH AG
 # Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
 #

diff --git a/charts/irs-helm/.helmignore b/charts/irs-helm/.helmignore
@@ -1,7 +1,7 @@
-# Copyright (c) 2021,2022,2023
+# Copyright (c) 2022,2024
 #       2022: ZF Friedrichshafen AG
 #       2022: ISTOS GmbH
-#       2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#       2022,2024: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #       2022,2023: BOSCH AG
 # Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
 #

diff --git a/charts/irs-helm/Chart.yaml b/charts/irs-helm/Chart.yaml
@@ -1,7 +1,7 @@
-# Copyright (c) 2021,2022,2023
+# Copyright (c) 2022,2024
 #       2022: ZF Friedrichshafen AG
 #       2022: ISTOS GmbH
-#       2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#       2022,2024: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #       2022,2023: BOSCH AG
 # Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
 #

diff --git a/charts/irs-helm/templates/_helpers.tpl b/charts/irs-helm/templates/_helpers.tpl
@@ -1,8 +1,8 @@
 {{/*
- * Copyright (c) 2021,2022,2023
+ * Copyright (c) 2022,2024
  *       2022: ZF Friedrichshafen AG
  *       2022: ISTOS GmbH
- *       2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *       2022,2024: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
  *       2022,2023: BOSCH AG
  * Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
  *

diff --git a/charts/irs-helm/templates/configmap-grafana-dashboards.yaml b/charts/irs-helm/templates/configmap-grafana-dashboards.yaml
@@ -1,7 +1,7 @@
-# Copyright (c) 2021,2022,2023
+# Copyright (c) 2022,2024
 #       2022: ZF Friedrichshafen AG
 #       2022: ISTOS GmbH
-#       2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#       2022,2024: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #       2022,2023: BOSCH AG
 # Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
 #

diff --git a/charts/irs-helm/templates/configmap-semantic-models.yaml b/charts/irs-helm/templates/configmap-semantic-models.yaml
@@ -1,7 +1,7 @@
-# Copyright (c) 2021,2022,2023
+# Copyright (c) 2022,2024
 #       2022: ZF Friedrichshafen AG
 #       2022: ISTOS GmbH
-#       2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#       2022,2024: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #       2022,2023: BOSCH AG
 # Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
 #

diff --git a/charts/irs-helm/templates/configmap-spring-app-config.yaml b/charts/irs-helm/templates/configmap-spring-app-config.yaml
@@ -1,7 +1,7 @@
-# Copyright (c) 2021,2022,2023
+# Copyright (c) 2022,2024
 #       2022: ZF Friedrichshafen AG
 #       2022: ISTOS GmbH
-#       2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#       2022,2024: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #       2022,2023: BOSCH AG
 # Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
 #

diff --git a/charts/irs-helm/templates/deployment.yaml b/charts/irs-helm/templates/deployment.yaml
@@ -1,7 +1,7 @@
-# Copyright (c) 2021,2022,2023
+# Copyright (c) 2022,2024
 #       2022: ZF Friedrichshafen AG
 #       2022: ISTOS GmbH
-#       2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#       2022,2024: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #       2022,2023: BOSCH AG
 # Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
 #

diff --git a/charts/irs-helm/templates/ingress.yaml b/charts/irs-helm/templates/ingress.yaml
@@ -1,7 +1,7 @@
-# Copyright (c) 2021,2022,2023
+# Copyright (c) 2022,2024
 #       2022: ZF Friedrichshafen AG
 #       2022: ISTOS GmbH
-#       2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#       2022,2024: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #       2022,2023: BOSCH AG
 # Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
 #

diff --git a/charts/irs-helm/templates/secrets.yaml b/charts/irs-helm/templates/secrets.yaml
@@ -1,7 +1,7 @@
-# Copyright (c) 2021,2022,2023
+# Copyright (c) 2022,2024
 #       2022: ZF Friedrichshafen AG
 #       2022: ISTOS GmbH
-#       2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#       2022,2024: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #       2022,2023: BOSCH AG
 # Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
 #

diff --git a/charts/irs-helm/templates/service.yaml b/charts/irs-helm/templates/service.yaml
@@ -1,7 +1,7 @@
-# Copyright (c) 2021,2022,2023
+# Copyright (c) 2022,2024
 #       2022: ZF Friedrichshafen AG
 #       2022: ISTOS GmbH
-#       2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#       2022,2024: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #       2022,2023: BOSCH AG
 # Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
 #

diff --git a/charts/irs-helm/templates/tests/test-connection.yaml b/charts/irs-helm/templates/tests/test-connection.yaml
@@ -1,7 +1,7 @@
-# Copyright (c) 2021,2022,2023
+# Copyright (c) 2022,2024
 #       2022: ZF Friedrichshafen AG
 #       2022: ISTOS GmbH
-#       2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#       2022,2024: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #       2022,2023: BOSCH AG
 # Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
 #

diff --git a/charts/irs-helm/values.yaml b/charts/irs-helm/values.yaml
@@ -1,7 +1,7 @@
-# Copyright (c) 2021,2022,2023
+# Copyright (c) 2022,2024
 #       2022: ZF Friedrichshafen AG
 #       2022: ISTOS GmbH
-#       2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#       2022,2024: Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #       2022,2023: BOSCH AG
 # Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
 #

diff --git a/docs/concept/#223-Transfer-to-PCWM/#223-Transfer-to-PCWM.md b/docs/concept/#223-Transfer-to-PCWM/#223-Transfer-to-PCWM.md
@@ -0,0 +1,53 @@
+# Transfer to Post-consortia-working-model (PCWM)
+
+## How to migrate the Confluence pages to GitHub (Pages, Wiki, MD, issues)
+
+Only a small portion of our Confluence documentation has to be migrated to GitHub, so copy-pasting the content manually is sufficient and the fastest solution.
+
+Confluence pages which shall not be moved to GitHub have to be marked as such. Everything else will be moved. [@DEPRECATION] lable will be used to identify those pages which will not be moved. 
+This [@DEPRECATION] label could be set on headline level as well to identify chapter which should not be moved. 
+
+**Notice:**
+During transition phase:
+1. Content of the pages or chapters will be moved to Github.
+2. However, the pages and structures are retained (not deleted)
+3. Links leading to the new content will be added instead. 
+4. After moving content and adding the link the lable  [@DEPRECATION] will be added to chapter or page.
+
+
+## Test management and Test Reporting (Cucumber)
+
+AsIs:
+Cucumber Tests are stored in and reported to Jira, using the Jira-Xray plugin. 
+
+ToBe:
+Feature files can be exported and directly stored in GitHub.
+
+Test results have to be displayed directly in GitHub workflow / Pull Request. This can be done in two ways:
+
+- using the free [Cucumber Report Service](https://cucumber.io/docs/cucumber/reporting/?lang=java#cucumber-reports-service), where the results will be published to a cloud hosted service
+- Using the generated test report and upload it using a GitHub Action https://github.com/marketplace/actions/publish-test-results
+
+## Replacing the CatenaX-NG environment
+
+AsIs:
+The CatenaX-NG ArgoCD environments were used to execute Integration- and E2E-Tests. After the end of the Consortia phase, they are no longer available and have to be replaced by an open solution.
+
+ToBe:
+The proposed solution is a helm chart with all required dependencies, including EDC Consumer, EDC Provider, MIW,
+Semantic Hub, Discovery Service, Digital Twin Registry, OAuth Provider and IRS. Implementation of this chart is planned
+in https://github.com/eclipse-tractusx/item-relationship-service/issues/312
+
+The chart will then be used in a GitHub workflow to test the E2E Workflow. The already existing Cucumber Tests can be
+used.
+
+Furthermore, integration tests using mocks of the third-party systems should be extended so testing can be done as much as possible on the local machine or in GitHub workflows, without setting up the entire helm deployment. This is planned in https://github.com/eclipse-tractusx/item-relationship-service/issues/344
+
+## Change of development workflow
+
+PRs are to be opened directly to eclipse-tractusx/item-relationship-service. Eclipse committers can create branches directly in this project. External contributors can contribute by forking the eclipse-tractusx/item-relationship-service project and create pull requests from their fork.
+
+Non-committers of the core IRS team can still use the catenax-ng/tx-item-relationship-service fork but pull requests still have to be opened directly to eclipse-tractusx/item-relationship-service.
+
+Branch protection of catenax-ng/tx-item-relationship-service:main will be removed so synchronization with the upstream project can be done by one click.
+