Merge pull request eclipse-tractusx#630 from eclipse-tractusx/main

Sync with upstream

.github/workflows/helm-test.yaml

@@ -52,7 +52,7 @@ jobs:
           check-latest: true
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.4.0
+        uses: helm/chart-testing-action@v2.6.1
 
       - name: Run chart-testing (list-changed)
         id: list-changed

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.0.1] - 2023-11-10
+### Changed
+- Added state `STARTED` as acceptable state to complete the EDC transfer process to be compatible with EDC 0.5.1
+
 ## [4.0.0] - 2023-10-27
 ### Added
 - Introduced new API endpoint to register ESS Jobs in Batch - POST {{IRS_HOST}}/irs/ess/orders
@@ -401,7 +405,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Unresolved
 - **Select Aspects you need**  You are able to select the needed aspects for which you want to collect the correct endpoint information.
 
-[Unreleased]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.0.0...HEAD
+[Unreleased]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.0.1...HEAD
+[4.0.1]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.0.0...4.0.1
 [4.0.0]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.5.4...4.0.0
 [3.5.4]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.5.3...3.5.4
 [3.5.3]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.5.2...3.5.3

charts/irs-helm/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [6.9.1]
+### Changed
+- Update IRS version to 4.0.1
+
 ## [6.9.0]
 ### Changed
 - Update IRS version to 4.0.0

charts/irs-helm/Chart.yaml

@@ -35,12 +35,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 6.9.0
+version: 6.9.1
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "4.0.0"
+appVersion: "4.0.1"
 dependencies:
   - name: common
     repository: https://charts.bitnami.com/bitnami

docs/src/docs/security/security-assessment.md

@@ -0,0 +1,54 @@
+# Security Assessment
+
+## Data Flow Diagram
+
+```mermaid
+C4Context
+title Item Relationship Service
+
+Person_Ext(user, "Other services (User)")
+
+System_Ext(DAPS, "DAPS / SSI MIW")
+System_Ext(EDC, "EDC")
+System_Ext(EDC-DS, "EDC Discovery Service")
+System_Ext(DF, "Discovery Finder")
+System_Ext(DTR, "Digital Twin Registry")
+System_Ext(KC, "Keycloak")
+System_Ext(BPDM, "BPDM")
+System_Ext(SH, "Semantic Hub")
+
+System_Ext(V, "Vault")
+
+Boundary(IRSBoundary, "IRS") {
+    System(IC, "Ingress Controller")
+    System(IRS-API, "IRS-API", "REST")
+    System(IRS-App, "IRS App")
+    SystemDb(Min, "MinIO")
+    SystemDb(ConfigH, "Config", "Helm")
+    System(G, "Grafana")
+    SystemDb(P, "Prometheus")
+}
+
+BiRel(IC, IRS-API, "https")
+Rel(ConfigH, IRS-API, "")
+Rel(ConfigH, Min, "")
+Rel(IRS-App, Min, "")
+BiRel(IRS-API, IRS-App, "")
+Rel(IRS-App, P, "Performance logging")
+Rel(G, P, "Get logs")
+Rel(ConfigH, G, "")
+Rel(ConfigH, P, "")
+
+Rel(IRS-App, V, "Get secrets")
+
+Rel(user, IC, "https, access token,request parameters, trigger events")
+Rel(IRS-App, EDC, "https, access token")
+Rel(IRS-App, EDC-DS, "Find decentral DTs, https, access token")
+Rel(IRS-App, DF, "Get EDC Discovery Service URL, https, access token")
+Rel(IRS-App, DTR, "https, access token")
+Rel(IRS-App, KC, "https, clientID, clientSecret, Get tokens to access DTR")
+Rel(IRS-App, BPDM, "https, access token, Get BPN")
+Rel(IRS-App, SH, "Get schemas to validate response from EDC, https, access token")
+
+Rel(DAPS, EDC, "")
+```

irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/EdcControlPlaneClient.java

@@ -59,6 +59,7 @@ public class EdcControlPlaneClient {
 
     public static final String STATUS_FINALIZED = "FINALIZED";
     public static final String STATUS_COMPLETED = "COMPLETED";
+    public static final String STATUS_STARTED = "STARTED";
     public static final String STATUS_ERROR = "ERROR";
     public static final String DATASPACE_PROTOCOL_HTTP = "dataspace-protocol-http";
     public static final String STATUS_TERMINATED = "TERMINATED";
@@ -209,7 +210,7 @@ private NegotiationResponse getContractNegotiationResponse(final Response negoti
 
                                  if (transferProcessState != null) {
                                      return switch (transferProcessState.getState()) {
-                                         case STATUS_COMPLETED -> Optional.of(
+                                         case STATUS_COMPLETED, STATUS_STARTED -> Optional.of(
                                                  getTransferProcessResponse(transferProcessId, objectHttpEntity));
                                          case STATUS_ERROR -> throw new IllegalStateException(
                                                  "TransferProcessResponse with id " + getTransferProcessResponse(