Merge pull request #277 from catenax-ng/main

New shell descriptors API and replacing implementation of sending notification negotiation to irs-client-library

.github/workflows/codeql.yml

@@ -26,7 +26,7 @@
 # the `language` matrix defined below to confirm you have the correct set of
 # supported CodeQL languages.
 #
-name: "CodeQL code analysis"
+name: "[BE][SECURITY] CodeQL"
 
 on:
   push:

.github/workflows/dependencies.yaml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: "Dependencies Backend Update"
+name: "[BE][FE][SECURITY] Update DEPENDENCIES files"
 
 on:
   push:

.github/workflows/docker-image-branch_frontend.yml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: Frontend Build&Push Docker image for branch
+name: "[FE][BUILT][RELEASE] Docker Image on Branch"
 on:
   pull_request:
 

.github/workflows/docker-image-main_backend.yml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: Backend Build&Push Docker image on main
+name: "[BE][BUILT][RELEASE] Docker Image on Main"
 
 on:
   push:

.github/workflows/docker-image-main_frontend.yml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: Frontend Build&Push Docker image on main
+name: "[FE][BUILT][RELEASE] Docker Image on Main"
 
 on:
   push:

.github/workflows/docker-image-tag-release.yaml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: Release Frontend&Backend on Tag
+name: "[BE][FE][RELEASE] Release Tag"
 
 on:
   workflow_dispatch:

.github/workflows/e2e-tests-xray_frontend.yml

@@ -18,7 +18,7 @@
 # Require to set secrets:
 #  - ORG_IRS_JIRA_USERNAME
 #  - ORG_IRS_JIRA_PASSWORD
-name: E2E Tests - Xray
+name: "[FE][TEST][E2E]- Cypress"
 
 on:
   # triggered manually by Test Manager

.github/workflows/eclipse-dash.yml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: "Eclipse DASH IP Check"
+name: "[BE][FE][SECURITY] Eclipse DASH IP"
 
 on:
   workflow_dispatch: # Trigger manually

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

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: Release Helm Charts
+name: "[BE][FE][RELEASE][HELM] Release Helm Charts"
 
 on:
   workflow_dispatch: # Trigger manually

.github/workflows/helm-test-backwards-compatability.yaml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: Test k8s version compatability
+name: "[BE][FE][HELM] Test Backward Compatability"
 
 on:
   workflow_dispatch:

.github/workflows/helm-test.yaml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: Lint and Test Charts
+name: "[BE][FE][HELM] Lint and Test"
 
 on:
   pull_request:

.github/workflows/helm-upgrade.yaml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: Upgrade Charts
+name: "[BE][FE][HELM] Upgrade Charts"
 
 on:
   pull_request:

.github/workflows/jira-publish-release.yaml

@@ -1,4 +1,20 @@
-name: Jira release publishing
+#    Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#    See the NOTICE file(s) distributed with this work for additional
+#    information regarding copyright ownership.
+#
+#    This program and the accompanying materials are made available under the
+#    terms of the Apache License, Version 2.0 which is available at
+#    https://www.apache.org/licenses/LICENSE-2.0.
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+name: "[BE][FE][RELEASE] Jira release publishing"
 
 on:
   workflow_dispatch: # Trigger manually

.github/workflows/kics.yml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: "KICS"
+name: "[BE][FE][SECURITY] Kics"
 
 on:
   push:

.github/workflows/publish-documentation.yaml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: Publish documentation
+name: "[BE][FE][DOCUMENTATION] Publish documentation"
 
 on:
   workflow_dispatch: # Trigger manually

.github/workflows/pull-request_backend.yml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: "Pull request Backend"
+name: "[BE][BUILT][DEPLOYMENT] Pull request"
 
 on:
   workflow_dispatch: # Trigger manually

.github/workflows/quality-checks.yaml

@@ -15,16 +15,13 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: "Quality Checks (Release Guidelines)"
+name: "[BE][FE][SECURITY] TRG Checks"
 
 on:
   workflow_dispatch: # Trigger manually
   push:
     branches:
       - main
-  pull_request:
-    branches:
-      - main
 
 jobs:
   check-quality:

.github/workflows/release.yaml

@@ -1,4 +1,4 @@
-name: Release Trace-X
+name: "[BE][FE] Release"
 
 on:
   workflow_dispatch:

.github/workflows/sonar-scan-backend.yml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: "Sonar Cloud Analyze"
+name: "[BE][SECURITY] Sonar"
 on:
   workflow_dispatch:
   push:

.github/workflows/sonar-scan-frontend.yml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: Sonar Frontend
+name: "[FE][SECURITY] Sonar"
 
 on:
   push:

.github/workflows/spotbugs.yml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: "Spotbugs bug detection"
+name: "[BE][SECURITY] Spotbugs"
 
 on:
   push:

.github/workflows/trivy.yml

@@ -20,7 +20,7 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Trivy
+name: "[BE][FE][SECURITY] Trivy"
 
 on:
   pull_request:

.github/workflows/unit-test_frontend.yml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: Unit Tests Frontend
+name: "[FE][TEST] Unit Tests"
 
 on:
   push:

.github/workflows/update-helm-environment.yml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: Update helm environments branch
+name: "[BE][FE][DEPLOYMENT] Update helm environments branch"
 on:
   push:
     branches: main

.github/workflows/veracode_backend.yml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: "Veracode upload and scan"
+name: "[BE][SECURITY] Trivy"
 
 on:
   workflow_dispatch:

.github/workflows/veracode_frontend.yml

@@ -15,7 +15,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: "Veracode upload and scan - Frontend"
+name: "[FE][SECURITY] Trivy"
 
 on:
   workflow_dispatch:

.github/workflows/xray-cucumber.yaml

@@ -15,15 +15,12 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 
-name: Trace-X Cucumber Xray execution
+name: "[BE][TEST][E2E] Cucumber"
 
 on:
   workflow_dispatch: # Trigger manually
-  push:
-    branches: main
-    paths-ignore:
-      - '**/*.md'
-      - '**/*.txt'
+  schedule:
+    - cron: "0 0 * * *"
 
 jobs:
   build:

CHANGELOG.md

@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Optional parameter "receiverBpn" to /investigations endpoint
 - NEW API /api/assets/as-planned
 - NEW API DELETE /api/registry
+- NEW API GET /api/shelldescriptors
 
 ### Changed
 - API BREAKING CHANGE: /api/assets changed to /api/assets/as-built
@@ -33,6 +34,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Updated owasp:dependency-check from 8.3.1 to 8.4.0
 - Updated commons-io from 2.11.0 to 2.13.0
 - Updated snakeyaml from 2.0 to 2.1
+- Replaced own implementation of getCatalog, negotiateAgreement, and validatePolicy with irs-client-library implementation.
+- Updated irs-registry-client from 1.1.0-SNAPSHOT to 1.1.1-SNAPSHOT
 
 ### Removed
 

DEPENDENCIES_BACKEND

@@ -140,7 +140,7 @@ maven/mavencentral/org.eclipse.edc/transfer-spi/0.1.3, Apache-2.0, approved, tec
 maven/mavencentral/org.eclipse.edc/transform-spi/0.1.3, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/validator-spi/0.1.3, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/web-spi/0.1.3, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/1.1.0-20230824.091723-4, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/1.1.1-20230825.093801-1, 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.16.3, Apache-2.0, approved, #7935

charts/traceability-foss/CHANGELOG.md

@@ -13,14 +13,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Removed
 
-## [1.3.13] - 2023-08-22
-### Added
-- THIS IS A TEST
-
-### Changed
-
-
-### Removed
 
 ## [1.3.12] - 2023-08-22
 

docs/RELEASE.md

@@ -13,11 +13,12 @@ Please update the [CHANGELOG.md](https://github.com/eclipse-tractusx/traceabilit
 ## Release helm charts
 Hint: You need to stricly follow this guide to make sure the helm chart releaser will be able to detect a new helm chart version!
 1) Create a GIT Tag with the release version of the application.
-2) Afterwards update the properties in the Chart.yamls as described down below:
-   - Update helm charts *version* & *appVersion* property from
+2) A Release Action ( Release Trace-X ) will bump the helm versions and create a Pull request that needs to be merged.
+3) Check if the Action ran successfully and the following properties in the Chart.yamls and package.json were updated with the corresponding new versions from your created tag and the latest version entry from the [charts/CHANGELOG.md](https://github.com/catenax-ng/tx-traceability-foss/blob/main/charts/traceability-foss/CHANGELOG.md) file:
+   - *version* & *appVersion* property from
      - [backend Chart.yaml file](https://github.com/eclipse-tractusx/traceability-foss/blob/main/charts/traceability-foss/charts/backend/Chart.yaml) and from
      - [frontend Chart.yaml file](https://github.com/eclipse-tractusx/traceability-foss/blob/main/charts/traceability-foss/charts/frontend/Chart.yaml).
      - [Umbrella Helm Chart.yaml file](https://github.com/eclipse-tractusx/traceability-foss/blob/main/charts/traceability-foss/Chart.yaml).
-
+     - [frontend package.json file](https://github.com/eclipse-tractusx/traceability-foss/blob/main/frontend/package.json)
 3) Proceed with merging into the main branch and check the [Release Charts workflow](https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/helm-chart-release.yaml)
    - It should trigger automatically, if not invoke the workflow manually for the *main* branch. The workflow will compare previously stored helm charts version and if it detects new version, it will release it in GitHub and will create an appropriate git tag.

tx-backend/pom.xml

@@ -54,7 +54,7 @@ SPDX-License-Identifier: Apache-2.0
         <dependency>
             <groupId>org.eclipse.tractusx.irs</groupId>
             <artifactId>irs-registry-client</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
 
         <!-- tx-application modules -->

tx-backend/src/integration/groovy/org/eclipse/tractusx/traceability/IntegrationSpecification.groovy

@@ -23,6 +23,7 @@ package org.eclipse.tractusx.traceability
 
 import com.xebialabs.restito.server.StubServer
 import groovy.json.JsonBuilder
+import org.eclipse.tractusx.irs.edc.client.EDCCatalogFacade
 import org.eclipse.tractusx.traceability.assets.domain.asbuilt.repository.AssetAsBuiltRepository
 import org.eclipse.tractusx.traceability.assets.domain.asplanned.repository.AssetAsPlannedRepository
 import org.eclipse.tractusx.traceability.assets.domain.base.BpnRepository
@@ -89,6 +90,9 @@ abstract class IntegrationSpecification extends Specification
     @Autowired
     private JdbcTemplate jdbcTemplate
 
+    @Autowired
+    private EDCCatalogFacade edcCatalogFacade
+
 
     def setup() {
         oauth2ApiReturnsJwkCerts(jwk())