Merge remote-tracking branch 'refs/remotes/upstream/main' into hotfix…

…/5.1.4 # Conflicts: # CHANGELOG.md # charts/item-relationship-service/CHANGELOG.md
eclipse-tractusx · May 27, 2024 · dbc5d5e · dbc5d5e
2 parents 3259c91 + 308fb42
commit dbc5d5e
Show file tree

Hide file tree

Showing 92 changed files with 14,925 additions and 8,815 deletions.
diff --git a/.github/workflows/BETA-xray-cucumber-integration.yaml b/.github/workflows/BETA-xray-cucumber-integration.yaml
@@ -17,7 +17,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Cache maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/changelog-changes.yaml b/.github/workflows/changelog-changes.yaml
@@ -23,7 +23,7 @@ jobs:
 
       - name: Check if CHANGELOG file was changed
         id: changelog-changed
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v44
         with:
           files: |
             CHANGELOG.md
@@ -37,7 +37,7 @@ jobs:
 
       - name: Find previous comment in PR
         if: steps.changelog-changed.outputs.any_changed == 'false'
-        uses: peter-evans/find-comment@v2
+        uses: peter-evans/find-comment@v3
         id: find-comment
         with:
           issue-number: ${{ github.event.pull_request.number }}
@@ -46,7 +46,7 @@ jobs:
 
       - name: Create or update comment in PR
         if: steps.changelog-changed.outputs.any_changed == 'false'
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v4
         with:
           comment-id: ${{ steps.find-comment.outputs.comment-id }}
           issue-number: ${{ github.event.pull_request.number }}

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -59,7 +59,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -71,7 +71,7 @@ jobs:
           queries: +security-and-quality,security-extended
 
       - name: Cache maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/dependencies-update.yaml b/.github/workflows/dependencies-update.yaml
@@ -20,7 +20,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Cache maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -48,7 +48,7 @@ jobs:
 
       - name: Create pull request
         if: ${{ env.was_file_changed }} == 'true'
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           add-paths: |
             DEPENDENCIES

diff --git a/.github/workflows/eclipse-dash.yml b/.github/workflows/eclipse-dash.yml
@@ -26,7 +26,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Cache maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -44,6 +44,6 @@ jobs:
 
       - name: upload results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: 'target/dash/summary'
diff --git a/.github/workflows/helm-chart-release.yaml b/.github/workflows/helm-chart-release.yaml
@@ -55,7 +55,7 @@ jobs:
           git config user.email "[email protected]"
 
       - name: Install Helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@v4
         with:
           version: v3.9.3
 

diff --git a/.github/workflows/helm-test.yaml b/.github/workflows/helm-test.yaml
@@ -42,7 +42,7 @@ jobs:
           tags: kind-registry:5000/irs-api:testing
 
       - name: Set up Helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@v4
         with:
           version: v3.9.3
 

diff --git a/.github/workflows/helm-upgrade.yaml b/.github/workflows/helm-upgrade.yaml
@@ -19,7 +19,7 @@ jobs:
         uses: container-tools/kind-action@v2
 
       - name: Set up Helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@v4
         with:
           version: v3.9.3
 

diff --git a/.github/workflows/int-test-automation.yml b/.github/workflows/int-test-automation.yml
@@ -24,7 +24,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Cache maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/irs-build.yml b/.github/workflows/irs-build.yml
@@ -33,7 +33,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Cache maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -61,14 +61,14 @@ jobs:
           distribution: 'temurin'
 
       - name: Cache maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
 
       - name: Cache SonarCloud packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
@@ -170,7 +170,7 @@ jobs:
           IMAGE_NAMESPACE: tractusx
           IMAGE_NAME: irs-api
         if: env.DOCKER_HUB_USER != '' && github.event_name != 'pull_request'
-        uses: peter-evans/dockerhub-description@v3
+        uses: peter-evans/dockerhub-description@v4
         with:
           username: ${{ secrets.DOCKER_HUB_USER }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}

diff --git a/.github/workflows/irs-load-test.yaml b/.github/workflows/irs-load-test.yaml
@@ -31,7 +31,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Cache maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -48,7 +48,7 @@ jobs:
           mvn gatling:test -pl irs-load-tests
 
       - name: Archive Report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: gatling-report
           path: irs-load-tests/target/gatling/
diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml
@@ -59,12 +59,12 @@ jobs:
       # Upload findings to GitHub Advanced Security Dashboard
       - name: Upload SARIF file for GitHub Advanced Security Dashboard
         if: always()
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: kicsResults/results.sarif
 
       - name: Archive results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: kicsResults.json

diff --git a/.github/workflows/maven-deploy.yaml b/.github/workflows/maven-deploy.yaml
@@ -49,7 +49,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Cache maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/owasp.yml b/.github/workflows/owasp.yml
@@ -33,7 +33,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Cache maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -44,6 +44,6 @@ jobs:
 
       - name: upload results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: 'target/dependency-check-report.html'
diff --git a/.github/workflows/publish-documentation.yaml b/.github/workflows/publish-documentation.yaml
@@ -25,7 +25,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Graphviz
-        uses: ts-graphviz/setup-graphviz@v1
+        uses: ts-graphviz/setup-graphviz@v2
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -39,7 +39,7 @@ jobs:
           node-version: 20
 
       - name: Cache maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -63,7 +63,7 @@ jobs:
             asciidoctor-reducer -o docs/target/arc42.adoc docs/src/docs/arc42/full.adoc
 
       - name: Cache plantuml jar
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: plantuml.jar
           key: ${{ runner.os }}-file-${{ hashFiles('plantuml.jar') }}

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -23,17 +23,17 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Update Chart.yaml appVersion
-        uses: mikefarah/yq@v4.40.5
+        uses: mikefarah/yq@v4.44.1
         with:
           cmd: yq -i eval '.appVersion = "${{ inputs.new-irs-version }}"' charts/item-relationship-service/Chart.yaml
 
       - name: Update Chart.yaml version
-        uses: mikefarah/yq@v4.40.5
+        uses: mikefarah/yq@v4.44.1
         with:
           cmd: yq -i eval '.version = "${{ inputs.helm-chart-version }}"' charts/item-relationship-service/Chart.yaml
 
       - name: Prepare Helm release
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           commit-message: "chore(release): Prepare release for Helm version ${{ inputs.helm-chart-version }}"
           branch: chore/prepare-helm-release-${{ inputs.helm-chart-version }}
@@ -55,7 +55,7 @@ jobs:
           echo "$EOF" >> "$GITHUB_ENV"
 
       - name: Create IRS release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           body: ${{ env.CHANGELOG }}
           tag_name: ${{ inputs.new-irs-version }}

diff --git a/.github/workflows/tavern.yml b/.github/workflows/tavern.yml
@@ -26,7 +26,7 @@ on:
       global-asset-id-asBuilt:
         type: string
         description: Global-asset-id to use for the asBuilt tests.
-        default: 'urn:uuid:8724338c-5c85-4c34-91eb-e2735d58fb0d'
+        default: 'urn:uuid:4509ea7c-c8d2-41a1-83ca-c214ee34af6c'
         required: true
       bpn-asBuilt:
         type: string
@@ -87,7 +87,7 @@ jobs:
           BPN_ESS_AS_BUILT: ${{ github.event.inputs.bpn-ess-asBuilt || 'BPNL00000003CRHK' }}
           BPN_ESS_INCIDENT: ${{ github.event.inputs.bpn-ess-incident || 'BPNS00000003B6LU' }}
           BPN_AS_PLANNED: ${{ github.event.inputs.bpn-asPlanned || 'BPNL00000003AYRE' }}
-          GLOBAL_ASSET_ID_AS_BUILT: ${{ github.event.inputs.global-asset-id-asBuilt || 'urn:uuid:6d505432-8b31-4966-9514-4b753372683f' }}
+          GLOBAL_ASSET_ID_AS_BUILT: ${{ github.event.inputs.global-asset-id-asBuilt || 'urn:uuid:4509ea7c-c8d2-41a1-83ca-c214ee34af6c' }}
           BPN_AS_BUILT: ${{ github.event.inputs.bpn-asBuilt || 'BPNL00000003AVTH' }}
         run: |
           python -m pytest local/testing/api-tests/irs-api-tests.tavern.yaml --junitxml=tavern-results.xml

diff --git a/.github/workflows/trivy-docker-hub-scan.yml b/.github/workflows/trivy-docker-hub-scan.yml
@@ -28,6 +28,6 @@ jobs:
       - run: cat trivy-results.sarif
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: 'trivy-results.sarif'
diff --git a/.github/workflows/trivy-image-scan.yml b/.github/workflows/trivy-image-scan.yml
@@ -64,7 +64,7 @@ jobs:
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: always()
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: "trivy-results2.sarif"
           ref: ${{ github.event.inputs.ref }}

diff --git a/.github/workflows/update-docs-for-release.yml b/.github/workflows/update-docs-for-release.yml
@@ -121,7 +121,7 @@ jobs:
 
       - name: Create pull request
         id: cpr
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           commit-message: 'chore(docs): Update docs for release ${{ inputs.irs-version }}'
           branch: chore/update-docs-for-irs-release-${{ inputs.irs-version }}

diff --git a/.github/workflows/update-registry-library.yaml b/.github/workflows/update-registry-library.yaml
@@ -68,7 +68,7 @@ jobs:
           sed -i -e 's#<irs-registry-client\.version>.*</irs-registry-client\.version>#<irs-registry-client\.version>'$VERSION'</irs-registry-client\.version>#g' pom.xml
 
       - name: Create PR for irs-registry-client version update
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           commit-message: "chore(dependencies): Update irs-registry-client to ${{ env.NEXT_VERSION }}"
           branch: chore/update-irs-registry-client-${{ env.NEXT_VERSION }}

diff --git a/.github/workflows/xray-cucumber-integration.yaml b/.github/workflows/xray-cucumber-integration.yaml
@@ -33,7 +33,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Cache maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

diff --git a/.gitignore b/.gitignore
@@ -74,3 +74,4 @@ docs/src/diagram-replacer/plantuml.jar
 # Helm Chart Dependencies
 /charts/item-relationship-service/Chart.lock
 /charts/item-relationship-service/charts/
+/docs/src/api/irs-api.actual.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,25 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 
 ## [Unreleased]
 
+### Fixed
+
+-  Fixed ESS Investigation job processing not starting #579
+
+### Changed
+
+- Improved policy store API input validation. #528
+- Extended datamodel of EdcPolicyPermissionConstraint to include andConstraints
+- Marked createAccessPolicy requests with deprecation mark.
+- Remove edc namespace from EdcContractAgreementNegotiationResponse and
+  EdcContractAgreementsResponse eclipse-tractusx/traceability-foss#963
+- Added missing @context values in edc asset creation eclipse-tractusx/traceability-foss#978
+- Switch to `dct:type` `https://w3id.org/catenax/taxonomy#` for notification asset creation eclipse-tractusx/traceability-foss#978
+- Shells in Job response will contain all submodel descriptors returned by provider, instead filtered by aspect-type parameter. #510
+
+## Added
+
+- Added endpoint for dedicated removal of policy from BPNL. #559
+- Integration Test Policy Store API Unhappy Path. #519
 
 ## [5.1.4] - 2024-05-27
 
@@ -25,7 +44,6 @@ _**For better traceability add the corresponding GitHub issue number in each cha
   or `edc:type`: `data.core.digitalTwinRegistry`. #616
 - Fix missing and malformed properties for EDC policy transformation. #648
 
-
 ## [5.1.2] - 2024-05-13
 
 ### Fixed
@@ -42,12 +60,11 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 
 ### Fixed
 
-- Fixed issue in EDR Token renewal #358
+- Fixed issue in EDR token renewal. #358
 
 ### Added
 
 - Cucumber test step definitions for Policy Store API (Happy Path) including some test helper utilities. #518
-
 
 ## [5.1.0] - 2024-05-06
 
@@ -64,7 +81,6 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 - Update bouncycastle to 1.78 to fix CVE's.
 - Fixed validation of json-schemas - IRS is creating tombstone instead collecting Submodel payload, when it not passes validation of schema #522
 
-
 ## [5.0.0] - 2024-04-16
 
 ### Added