Feature/trx xxx upstream contribution

.github/actions/setup-umbrella-env/action.yaml

@@ -63,7 +63,7 @@ runs:
       run: |
         helm dependency update charts/tx-data-provider
         helm dependency update charts/umbrella
-        helm install umbrella charts/umbrella -f charts/umbrella/values-adopter-irs.yaml --timeout 5m \
+        helm install umbrella charts/umbrella -f charts/umbrella/values-adopter-irs.yaml --timeout 10m \
         --namespace e2e-testing --create-namespace --debug \
         --set iatpmock.image.repository=kind-registry:5000/iatp-mock --set iatpmock.image.tag=testing
 
@@ -112,10 +112,10 @@ runs:
     - uses: azure/setup-kubectl@v3
 
     - run: |
-        kubectl wait --for=condition=available deployment/umbrella-dataprovider-dtr --timeout=60s --namespace e2e-testing
-        kubectl wait --for=condition=available deployment/umbrella-dataprovider-edc-controlplane --timeout=60s --namespace e2e-testing
-        kubectl wait --for=condition=available deployment/umbrella-dataprovider-edc-dataplane --timeout=60s --namespace e2e-testing
-        kubectl wait --for=condition=available deployment/umbrella-dataprovider-submodelserver --timeout=60s --namespace e2e-testing
+        kubectl wait --for=condition=available deployment/umbrella-dataprovider-dtr --timeout=90s --namespace e2e-testing
+        kubectl wait --for=condition=available deployment/umbrella-dataprovider-edc-controlplane --timeout=90s --namespace e2e-testing
+        kubectl wait --for=condition=available deployment/umbrella-dataprovider-edc-dataplane --timeout=90s --namespace e2e-testing
+        kubectl wait --for=condition=available deployment/umbrella-dataprovider-submodelserver --timeout=90s --namespace e2e-testing
 
         kubectl port-forward svc/umbrella-dataprovider-dtr 4444:8080 --namespace e2e-testing &
         kubectl port-forward svc/umbrella-dataprovider-edc-controlplane 8888:8081 --namespace e2e-testing &
@@ -136,7 +136,7 @@ runs:
       id: deployment-ready
       shell: bash
       run: |
-        kubectl wait --for=condition=available deployment/irs-item-relationship-service --timeout=60s --namespace e2e-testing
+        kubectl wait --for=condition=available deployment/irs-item-relationship-service --timeout=90s --namespace e2e-testing
         kubectl port-forward svc/irs-item-relationship-service 8080:8080 --namespace e2e-testing &
 
     - name: Get Pods

.github/workflows/changelog-changes.yaml

@@ -7,15 +7,18 @@ on:
       - '**/*.md'
       - '**/*.txt'
       - '.config/**'
-      - '.github/**'
       - 'docs/**'
       - 'local/**'
 
+env:
+  # Specific CHANGELOG file which is used for releasing the product. Default <CHANGELOG.md>.
+  CHANGELOG_PATH: 'CHANGELOG.md'
 jobs:
   analyze:
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
+      contents: read
 
     name: changelog-check
     steps:
@@ -26,7 +29,7 @@ jobs:
         uses: tj-actions/changed-files@v44
         with:
           files: |
-            CHANGELOG.md
+            ${{ env.CHANGELOG_PATH }}
 
       - name: Echo result if CHANGELOG file was changed
         if: steps.changelog-changed.outputs.any_changed == 'true'

.github/workflows/dependencies-update.yaml

@@ -8,6 +8,9 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: read
 
     steps:
       - name: Checkout repository

.github/workflows/helm-chart-release.yaml

@@ -8,6 +8,10 @@ on:
     paths:
       - 'charts/**'
 
+env:
+  # Specific CHANGELOG file which is used for releasing the product. Default <CHANGELOG.md>.
+  CHANGELOG_PATH: 'CHANGELOG.md'
+
 jobs:
   get-helm-charts-versions-irs:
     outputs:
@@ -76,7 +80,7 @@ jobs:
           currentVersionNumber=$(echo ${{ needs.get-helm-charts-versions-irs.outputs.current_version }} | sed -e "s/^item-relationship-service-//" )
           echo currentVersionNumber=$currentVersionNumber
 
-          sed -n -e '/## \['"${currentVersionNumber}"'\]/,/## \[/ p' CHANGELOG.md | head -n -1 | tail -n +2 >> CHANGELOG-temp.md
+          sed -n -e '/## \['"${currentVersionNumber}"'\]/,/## \[/ p' ${{ env.CHANGELOG_PATH }} | head -n -1 | tail -n +2 >> CHANGELOG-temp.md
           echo **Full Changelog**: ${{ github.server_url }}/${{ github.repository }}/compare/${{ needs.get-helm-charts-versions-irs.outputs.latest_version }}...${{ needs.get-helm-charts-versions-irs.outputs.current_version }} >> CHANGELOG-temp.md
 
           echo "cat CHANGELOG-temp.md"

.github/workflows/irs-build.yml

@@ -19,7 +19,6 @@ on:
     tags:
       - '**'
 
-
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/release.yaml

@@ -21,6 +21,7 @@
 
 env:
   IRS_APPLICATION_PATH: 'irs-api/src/main/java/org/eclipse/tractusx/irs/IrsApplication.java'
+  # Specific CHANGELOG file which is used for releasing the product. Default <CHANGELOG.md>.
   CHANGELOG_PATH: 'CHANGELOG.md'
   OPENAPI_SPEC_PATH: 'docs/src/api/irs-api.yaml'
   HELM_CHART_PATH: 'charts/item-relationship-service'
@@ -30,7 +31,17 @@
 jobs:
   release:
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: write
     steps:
+
+      - uses: actions/create-github-app-token@v1
+        id: generate-token
+        with:
+          app-id: ${{ secrets.TRACE_X_RELEASE_DOCUMENTATION_GH_APP_ID }}
+          private-key: ${{ secrets.TRACE_X_RELEASE_DOCUMENTATION_GH_APP_PRIVATE_KEY }}
+
       - uses: actions/checkout@v4
 
       - name: Validate that workflow inputs are SemVer strings
@@ -142,8 +153,9 @@
           echo "$EOF" >> "$GITHUB_ENV"
 
       - name: Update docs and Helm chart for release
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
+          token: ${{ steps.generate-token.outputs.token }}
           commit-message: 'chore(docs): updated docs and Helm chart for IRS release ${{ inputs.irs-version }}'
           branch: action/update-for-release-${{ inputs.irs-version }}
           delete-branch: true

.github/workflows/tavern-UMBRELLA.yml

@@ -32,6 +32,7 @@ concurrency:
 jobs:
   test:
     runs-on: "${{ github.repository == 'eclipse-tractusx/item-relationship-service' && 'tractusx-runner' || 'ubuntu-latest' }}"
+    permissions: write-all
     steps:
       - uses: actions/checkout@v4
 
@@ -83,7 +84,7 @@ jobs:
             result.xml
 
       - name: Run ESS tests
-        if: always() && steps.setup-env.outcome == 'success'
+        if: ${{ !always() && steps.setup-env.outcome == 'success' }}
         env:
           IRS_HOST: 'http://localhost:8080'
           IRS_ESS_HOST: 'http://localhost:8080'

.github/workflows/update-registry-library.yaml

@@ -22,6 +22,9 @@ jobs:
   open-pr-with-version-update:
     name: "Open a Pull Request with the updated version of irs-registry-client."
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: read
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

.gitignore

@@ -75,3 +75,4 @@ docs/src/diagram-replacer/plantuml.jar
 /charts/item-relationship-service/Chart.lock
 /charts/item-relationship-service/charts/
 /docs/src/api/irs-api.actual.yaml
+/.github/workflows/custom/

CHANGELOG.md

@@ -8,24 +8,15 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 
 ## [Unreleased]
 
-### Changed
-
-- Resolve Null pointer exception while registering the company https://github.com/eclipse-tractusx/item-relationship-service/issues/888
-- Added the discovery type configurable, with a default value of bpnl in (ConnectorEndpointsService) https://github.com/eclipse-tractusx/sig-release/issues/939
-- Changed orchestration of EDC negotiations to be more efficient https://github.com/eclipse-tractusx/sig-release/issues/931
+### Changed 
 
-### Removed
-- Removed subjectId from AssetAdministrationShellDescriptor object
-
-### Fixed
-
-- Fixed URI composition of href URL and configurable submodel suffix to append the path at the correct position #889
+- Build href URL correctly for accessing submodel assets #889
+- Resolve Null pointer exception while registering the company #888
 
 ### Added
 
-- Added api key authentication for edc notification requests
-- Added integration tests for /irs/orders API https://github.com/eclipse-tractusx/sig-release/issues/933
-- Configurable number of threads for parallel processing of batch order jobs https://github.com/eclipse-tractusx/item-relationship-service/issues/892
+- Added new section under crosscuting/api-endpoints to arc42 documentation 
+
 
 ## [5.4.1] - 2024-08-19
 

COMPATIBILITY_MATRIX.md

@@ -4,9 +4,11 @@ Full changelog of IRS: [changelog](CHANGELOG.md)
 
 ## [Unreleased]
 
+## [5.4.1-cfx-3](https://github.com/eclipse-tractusx/item-relationship-service/releases/tag/5.4.1-cfx-3) - 2024-11.06
+
 | Dependency                                                                                                                               | Version                      | Helm  | Comments        |
 |------------------------------------------------------------------------------------------------------------------------------------------|------------------------------|-------|-----------------|
-| EDC                                                                                                                                      | 0.7.3                        | 0.7.3 |                 |
+| EDC                                                                                                                                      | 0.7.5                        | 0.7.5 |                 |
 | Semantics Hub                                                                                                                            | 0.3.1                        | 0.2.1 | REST connection |
 | DTR                                                                                                                                      | 0.5.0                        | 0.5.3 | REST connection |
 | Discovery Finder                                                                                                                         | 0.2.5                        | -     | REST connection |

DEPENDENCIES

@@ -306,12 +306,12 @@ maven/mavencentral/org.eclipse.tractusx.edc/core-spi/0.6.0, Apache-2.0, approved
 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-api/0.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.irs/irs-common/2.1.16, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/2.1.16, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.irs/irs-models/2.1.16, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-common/2.1.17, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/2.1.17, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-models/2.1.17, Apache-2.0, approved, automotive.tractusx
 maven/mavencentral/org.eclipse.tractusx.irs/irs-policy-store/0.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/2.1.16, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.irs/irs-testing/2.1.16, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/2.1.17, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-testing/2.1.17, Apache-2.0, approved, automotive.tractusx
 maven/mavencentral/org.glassfish/jakarta.json/2.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonp
 maven/mavencentral/org.hamcrest/hamcrest-core/2.2, BSD-3-Clause, approved, clearlydefined
 maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, #17677

charts/item-relationship-service/CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres 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.**_
+
 ## [Unreleased]
 
 ### Changed

charts/item-relationship-service/values-umbrella.yaml

@@ -119,7 +119,7 @@ edc:
 minio:
   resources:
     requests:
-      cpu: 0.25
+      cpu: 150m
       memory: 1Gi
   rootUser: "minio"  # <minio-username>
   rootPassword: "minioPass"  # <minio-password>