Merge remote-tracking branch 'origin/chore/1007-data-sovereignty' int…

…o chore/1007-data-sovereignty
eclipse-tractusx · Jul 22, 2024 · 67be707 · 67be707
2 parents edc9e3f + a8d21ac
commit 67be707
Show file tree

Hide file tree

Showing 239 changed files with 3,976 additions and 885 deletions.
diff --git a/.github/workflows/.trivyignore b/.github/workflows/.trivyignore
@@ -1,5 +1,5 @@
-# ref https://github.com/catenax-ng/product-traceability-foss-backend/security/code-scanning/1419
+# ref https://github.com/eclipse-tractusx/traceability-foss-backend/security/code-scanning/1419
 CVE-2022-25857
-# ref https://github.com/catenax-ng/tx-traceability-foss/security/code-scanning/6879
+# ref https://github.com/eclipse-tractusx/traceability-foss/security/code-scanning/6879
 # this is acceptable due to custom environment variable injection script which is executed upon FE container startup
 AVD-KSV-0014
diff --git a/.github/workflows/docker-image-branch_frontend.yml b/.github/workflows/docker-image-branch_frontend.yml
@@ -55,7 +55,7 @@ jobs:
         env:
           DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
         if: env.DOCKER_HUB_USER == ''
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./frontend/Dockerfile
@@ -75,7 +75,7 @@ jobs:
         env:
           DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
         if: env.DOCKER_HUB_USER != ''
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./frontend/Dockerfile

diff --git a/.github/workflows/docker-image-main_backend.yml b/.github/workflows/docker-image-main_backend.yml
@@ -61,7 +61,7 @@ jobs:
         env:
           DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
         if: env.DOCKER_HUB_USER == ''
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
@@ -80,7 +80,7 @@ jobs:
         env:
           DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
         if: env.DOCKER_HUB_USER != ''
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true

diff --git a/.github/workflows/docker-image-main_frontend.yml b/.github/workflows/docker-image-main_frontend.yml
@@ -56,7 +56,7 @@ jobs:
         env:
           DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
         if: env.DOCKER_HUB_USER == ''
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./frontend/Dockerfile
@@ -76,7 +76,7 @@ jobs:
         env:
           DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
         if: env.DOCKER_HUB_USER != ''
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./frontend/Dockerfile

diff --git a/.github/workflows/docker-image-tag-release.yaml b/.github/workflows/docker-image-tag-release.yaml
@@ -59,7 +59,7 @@ jobs:
         env:
           DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
         if: env.DOCKER_HUB_USER == ''
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./frontend/Dockerfile
@@ -79,7 +79,7 @@ jobs:
         env:
           DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
         if: env.DOCKER_HUB_USER != ''
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./frontend/Dockerfile
@@ -135,7 +135,7 @@ jobs:
         env:
           DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
         if: env.DOCKER_HUB_USER == ''
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
@@ -154,7 +154,7 @@ jobs:
         env:
           DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
         if: env.DOCKER_HUB_USER != ''
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true

diff --git a/.github/workflows/helm-test.yaml b/.github/workflows/helm-test.yaml
@@ -62,14 +62,14 @@ jobs:
           version: v0.20.0
 
       - name: Build & push Image App to KinD
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.APP_NAME}}:${{ env.TAG }}
 
       - name: Build & push Image Frontend to KinD
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./frontend/Dockerfile

diff --git a/.github/workflows/pull-request_backend.yml b/.github/workflows/pull-request_backend.yml
@@ -141,7 +141,7 @@ jobs:
         env:
           DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
         if: env.DOCKER_HUB_USER == ''
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
@@ -160,7 +160,7 @@ jobs:
         env:
           DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
         if: env.DOCKER_HUB_USER != ''
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true

diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -171,7 +171,7 @@ jobs:
           cache: 'maven'
 
       - name: Locally build docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: false

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,13 +13,20 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 - #999 Added notification processing feedback in FE
 - #1108 Added concept for policy management enhancement
 - #1007 Added data-sovereignty/policy-management section in arc42 documentation
+- #1190 update notification contracts on policy updates
 
 ### Changed
+- #1070 Convert png to svg according to TRG 1.04 - Diagrams as code / Editable static files
 - #1173 Update IRS-Helm from 7.1.4 to 7.2.0 - updated Compatibility Matrix
 - #1082 fix duplicate key errors when synchronizing assets with IRS
 - #970 fixed bug where the right operand of policies was not showing up in table and detailed view
+- #1191 Refactored contractAgreementId to be a list of elements.
 - #1188 prevent retry requests for notification actions to prevent duplicate error messages in history
 - #1025 fix overlapping table actions
+- #1221 Updgrade EDC version to 0.7.3
+- #1196 Update IRS to 7.3.1
+- #941 made the naming for quality notifications consistent throughout the FE app
+- #1190 store accepted policies in catalog offers on startup
 
 ## [12.0.0 - 05.07.2024]
 
@@ -36,7 +43,10 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 - #1112 Added association int-a/int-b environment to argo workflow
 
 ### Changed
-- XXX update legal notice for documents arc42, admin and user manual to years 2024
+- #1070 Converted pngs of concept  into svg
+- #1070 Update project documentation to current state
+- #1070 formatting README
+- #1070 Add code coverage badges
 - #965 Implement proxy functionality of the IRS policy store
 - #962 Changed notification model to new one in frontend/backend
 - #962 Removed initial notification message for notification flow

diff --git a/COMPATIBILITY_MATRIX.md b/COMPATIBILITY_MATRIX.md
@@ -11,8 +11,8 @@
 | Dependency       | Name of Service              | Version              | Helm     | Comments                                            |
 |------------------|------------------------------|----------------------|----------|-----------------------------------------------------|
 | EDC              | edc-postgresql               | 15.4.0-debian-11-r45 | 12.12.10 | Enterprise Data Connector for PostgreSQL            |
-| IRS              | item-relationship-service    | 5.2.0                | 7.2.1    | Helm charts for Item Relationship Service           |
-| EDC              | tractusx-connector           | 0.7.0                | 0.7.0    | Connector for Data Transfer and Registration        |
+| IRS              | item-relationship-service    | 5.3.0                | 7.3.1    | Helm charts for Item Relationship Service           |
+| EDC              | tractusx-connector           | 0.7.3                | 0.7.3    | Connector for Data Transfer and Registration        |
 | Discovery Finder | discovery service            | 0.2.5                | -        | Service for discovering and registering artifacts   |
 | Portal           | portal                       | 1.8.0                | -        | Web portal for interacting with Trace-X             |
 | SD-Factory       | SD-Factory                   | 2.1.7                | -        | Service Discovery Factory for managing dependencies |

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -91,7 +91,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-* Add release notes for new version in [CHANGELOG.md](CHANGELOG.md)      
+* Add release notes for new version in [CHANGELOG.md](CHANGELOG.md)
 * Features of your product(s) or component(s), available for market entry
 * Please provide minimum 5 to maximum 10 key feature descriptions
 * Use category “ADDED” as per good practice
@@ -103,7 +103,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 _**For better traceability add the corresponding GitHub issue number in each changelog entry, please.**_
 
 ### git-hooks
-Use git-hooks to ensure commit message consistency. 
+Use git-hooks to ensure commit message consistency.
 Detailed pattern can be found here: [commit-msg](https://github.com/eclipse-tractusx/traceability-foss/blob/457cb3523e981ef6aed98355a7faf0ff29867c33/dev/commit-msg#L4)
 
 #### How to use
@@ -122,21 +122,20 @@ The commit messages have to match a pattern in the form of:
 ````
 
 ````
-fix(api):[TRACEFOSS-123] Fix summary what is fixed.
-chore(repos):[TRACEFOSS-123] Configuration change of ci cd pipeline for new repository. 
-docs(arc42):[TRACEFOSS-123] Added level 1 description for runtime view.
- 
-chore(helm): TRACEFOSS-1131- Moving the values under the global key - increasing the version  
+fix(api):[#123] Fix summary what is fixed.
+chore(repos):[#123] Configuration change of ci cd pipeline for new repository.
+docs(arc42):[#123] Added level 1 description for runtime view.
+chore(helm):[#113] Moving the values under the global key - increasing the version
 ````
 
 ## Pull Request &  Reviews
 
-The goal is that the maximal life cycle of a pull request: 1.5 days.
+The goal is that the maximal life cycle of a pull request: 1.5 days.
 
 **Steps:**
 
 - Every developer creating a pull request is responsible to assign a reviewer.
-- Add comment for pull request with required information. 
+- Add comment for pull request with required information.
 - Please check the availability of a reviewer. The daily might be a good way to check the availability of team members.
 - If Review needs to be planned: Assign corresponding Jira ticket to reviewer, with link to pull-request
 
@@ -161,9 +160,9 @@ Only after the code is stable it can be merged to main.
   - chore/* - any small change without any impact
 - Branch Name:
   - MUST contain : Issue ID in the format #XXX
-  - MUST contain: Subject of issue (Abbreviation of pbi summary without using spaces / use "-" to connect) 
+  - MUST contain: Subject of issue (Abbreviation of pbi summary without using spaces / use "-" to connect)
 
-<img src="https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/images/github-flow-branching-model.jpeg" height="60%" width="60%"/>
+<img src="https://raw.githubusercontent.com/eclipse-tractusx/traceability-foss/main/docs/images/github-flow-branching-model.svg" height="60%" width="60%"/>
 
 ### Commit messages
 - The commit messages have to match a pattern in the form of:

diff --git a/DEPENDENCIES_BACKEND b/DEPENDENCIES_BACKEND
@@ -267,10 +267,10 @@ maven/mavencentral/org.eclipse.tractusx.edc/callback-spi/0.6.0, Apache-2.0, appr
 maven/mavencentral/org.eclipse.tractusx.edc/core-spi/0.6.0, Apache-2.0, approved, automotive.tractusx
 maven/mavencentral/org.eclipse.tractusx.edc/edr-api/0.6.0, Apache-2.0, approved, automotive.tractusx
 maven/mavencentral/org.eclipse.tractusx.edc/edr-spi/0.6.0, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.irs/irs-common/2.1.4, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/2.1.4, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.irs/irs-models/2.1.4, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/2.1.4, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-common/2.1.9, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/2.1.9, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-models/2.1.9, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/2.1.9, Apache-2.0, approved, automotive.tractusx
 maven/mavencentral/org.eclipse.tractusx.traceability/tx-backend/0.0.1-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
 maven/mavencentral/org.eclipse.tractusx.traceability/tx-models/0.0.1-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
 maven/mavencentral/org.flywaydb/flyway-core/9.22.3, Apache-2.0, approved, #15215