Assets Api changes to support bom lifecycles

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

@@ -101,7 +101,7 @@ jobs:
           node-version: 18.x
 
       - name: Cypress run all tests
-        uses: cypress-io/github-action@v5.8.4 # use the explicit version number
+        uses: cypress-io/github-action@v6.0.0 # use the explicit version number
         with:
           start: npm start
           wait-on: "http://localhost:4200"
@@ -156,7 +156,7 @@ jobs:
           node-version: 18.x
 
       - name: Cypress run all tests
-        uses: cypress-io/github-action@v5.8.4 # use the explicit version number
+        uses: cypress-io/github-action@v6.0.0 # use the explicit version number
         with:
           start: npm start
           wait-on: "http://localhost:4200"
@@ -219,7 +219,7 @@ jobs:
         run: npx playwright install --with-deps webkit
 
       - name: Cypress run all tests
-        uses: cypress-io/github-action@v5.8.4 # use the explicit version number
+        uses: cypress-io/github-action@v6.0.0 # use the explicit version number
         with:
           start: npm start
           wait-on: "http://localhost:4200"

.github/workflows/kics.yml

@@ -65,6 +65,7 @@ jobs:
           # - results-dir/results.json
           # - results-dir/results.sarif
           output_path: kicsResults/
+          enable_comments: true
           output_formats: "json,sarif"
           # If you want KICS to ignore the results and return exit status code 0 unless a KICS engine error happens
           # ignore_on_exit: results
@@ -98,7 +99,8 @@ jobs:
         with:
           # Scanning directory .
           path: "./tx-backend"
-
+          exclude_queries: 9f88c88d-824d-4d9a-b985-e22977046042,8c8261c2-19a9-4ef7-ad37-b8bc7bdd4d85,181bd815-767e-4e95-a24d-bb3c87328e19,00b78adf-b83f-419c-8ed8-c6018441dd3a
+          enable_comments: true
           # Fail on HIGH severity results
           fail_on: high
           # Disable secrets detection - we use GitGuardian

.github/workflows/release.yaml

@@ -26,6 +26,41 @@ jobs:
         with:
           cmd: yq -i eval '.version = "${{ env.HELM_VERSION }}"' charts/traceability-foss/Chart.yaml
 
+      - name: Update frontend dependency version in Chart.yaml
+        uses: mikefarah/yq@v4.34.2
+        with:
+          cmd: yq -i eval '.dependencies[0].version = "${{ env.HELM_VERSION }}"' charts/traceability-foss/Chart.yaml
+
+      - name: Update backend dependency version in Chart.yaml
+        uses: mikefarah/yq@v4.34.2
+        with:
+          cmd: yq -i eval '.dependencies[1].version = "${{ env.HELM_VERSION }}"' charts/traceability-foss/Chart.yaml
+
+      - name: Update frontend version in frontend/Chart.yaml
+        uses: mikefarah/yq@v4.34.2
+        with:
+          cmd: yq -i eval '.version = "${{ env.HELM_VERSION }}"' charts/traceability-foss/charts/frontend/Chart.yaml
+
+      - name: Update frontend appVersion in frontend/Chart.yaml
+        uses: mikefarah/yq@v4.34.2
+        with:
+          cmd: yq -i eval '.appVersion = "${{ github.ref_name }}"' charts/traceability-foss/charts/frontend/Chart.yaml
+
+      - name: Update backend version in backend/Chart.yaml
+        uses: mikefarah/yq@v4.34.2
+        with:
+          cmd: yq -i eval '.version = "${{ env.HELM_VERSION }}"' charts/traceability-foss/charts/backend/Chart.yaml
+
+      - name: Update backend appVersion in frontend/Chart.yaml
+        uses: mikefarah/yq@v4.34.2
+        with:
+          cmd: yq -i eval '.appVersion = "${{ github.ref_name }}"' charts/traceability-foss/charts/backend/Chart.yaml
+
+      - name: Update the frontend package.json appVersion
+        run: |
+          npm install -g json
+          json -I -f frontend/package.json -e "this.version='${{ github.ref_name }}'"
+
       - name: Prepare Helm release
         uses: peter-evans/create-pull-request@v5
         with:

CHANGELOG.md

@@ -14,9 +14,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - ErrorMessage field to investigation and alerts
 - Cucumber tests for quality investigations
 - Refactored asset structure to allow new API for assets-as-planned
+- Optional parameter "receiverBpn" to /investigations endpoint
+- NEW API /api/assets/as-planned
+- NEW API DELETE /api/registry
 
 ### Changed
-
+- API BREAKING CHANGE: /api/assets changed to /api/assets/as-built
 - Changed digitalTwinRegistryRestTemplate to use token in requests
 - Update asBuild test data to 1.5.3 and asPlanned to 1.5.1
 - Changed transfer notification logic not to break iteration loop when sending notifications to bpn with more than 1 connector endpoints
@@ -25,6 +28,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Readme / Docker Notice information as required in TRGs
 - Removed references to GitHub registry and added docker hub for tractusx instead
 - Removed UX breaking black status box
+- Updated cypress-io/github-action from 5.8.4 to 6.0.0
+- Updated asciidoctor-maven-plugin from 2.2.3 to 2.2.4
+- 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
 
 ### Removed
 

DEPENDENCIES_BACKEND

@@ -28,7 +28,7 @@ maven/mavencentral/com.squareup.okhttp3/okhttp/4.10.0, Apache-2.0 AND MPL-2.0, a
 maven/mavencentral/com.squareup.okio/okio-jvm/3.0.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.zaxxer/HikariCP/5.0.1, Apache-2.0, approved, clearlydefined
 maven/mavencentral/commons-fileupload/commons-fileupload/1.5, Apache-2.0, approved, #7109
-maven/mavencentral/commons-io/commons-io/2.11.0, Apache-2.0, approved, CQ23745
+maven/mavencentral/commons-io/commons-io/2.13.0, Apache-2.0, approved, #8717
 maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162
 maven/mavencentral/dev.failsafe/failsafe-okhttp/3.3.2, Apache-2.0, approved, #9178
 maven/mavencentral/dev.failsafe/failsafe/3.3.2, Apache-2.0, approved, #9268
@@ -220,4 +220,4 @@ maven/mavencentral/org.thymeleaf/thymeleaf/3.1.1.RELEASE, Apache-2.0, approved,
 maven/mavencentral/org.unbescape/unbescape/1.1.6.RELEASE, Apache-2.0, approved, CQ18904
 maven/mavencentral/org.webjars/swagger-ui/4.18.1, Apache-2.0, approved, #7850
 maven/mavencentral/org.webjars/webjars-locator-core/0.52, MIT, approved, clearlydefined
-maven/mavencentral/org.yaml/snakeyaml/2.0, Apache-2.0 AND (Apache-2.0 OR BSD-3-Clause OR EPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later), approved, #7275
+maven/mavencentral/org.yaml/snakeyaml/2.1, Apache-2.0, approved, #9847

charts/traceability-foss/CHANGELOG.md

@@ -13,9 +13,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Removed
 
-## [6.0.2] - 2023-08-22
+## [1.3.13] - 2023-08-22
+### Added
+- THIS IS A TEST
+
 ### Changed
-- This is a test changelog entry
 
-## [6.0.0] - 2023-08-21
+
+### Removed
+
+## [1.3.12] - 2023-08-22
+
+### Added
+- Initialization of chart changelogs
+
 

charts/traceability-foss/charts/backend/templates/deployment.yaml

@@ -37,6 +37,7 @@ spec:
       namespace: {{ .Values.namespace | default .Release.Namespace }}
       {{- with .Values.podAnnotations }}
       annotations:
+        seccomp.security.alpha.kubernetes.io/pod: 'runtime/default'
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:

frontend/src/app/mocks/services/otherParts-mock/otherParts.handler.ts

@@ -26,7 +26,7 @@ import { otherPartsAssets } from './otherParts.model';
 import { mockCustomerAssets, mockSupplierAssets } from './otherParts.test.model';
 
 export const otherPartsHandlers = [
-  rest.get(`*${environment.apiUrl}/assets`, (req, res, ctx) => {
+  rest.get(`*${environment.apiUrl}/assets/as-built`, (req, res, ctx) => {
     const pagination = extractPagination(req);
     const owner = req.url.searchParams.get('owner');
 
@@ -42,7 +42,7 @@ export const otherPartsHandlers = [
 ];
 
 export const otherPartsHandlersTest = [
-  rest.get(`*${environment.apiUrl}/assets`, (req, res, ctx) => {
+  rest.get(`*${environment.apiUrl}/assets/as-built`, (req, res, ctx) => {
     const owner = req.url.searchParams.get('owner');
 
     switch (owner) {

frontend/src/app/mocks/services/parts-mock/parts.handler.ts

@@ -26,68 +26,68 @@ import { getAssetById, mockBmwAssets } from './parts.model';
 import { mockAssetList, mockAssets } from './parts.test.model';
 
 export const partsHandlers = [
-  rest.get(`*${environment.apiUrl}/assets`, (req, res, ctx) => {
+  rest.get(`*${environment.apiUrl}/assets/as-built`, (req, res, ctx) => {
     const pagination = extractPagination(req);
 
     return res(ctx.status(200), ctx.json(applyPagination(mockBmwAssets, pagination)));
   }),
 
 
-  rest.post(`*${environment.apiUrl}/assets/detail-information`, async (req, res, ctx) => {
+  rest.post(`*${environment.apiUrl}/assets/as-built/detail-information`, async (req, res, ctx) => {
     const { assetIds } = await req.json();
 
     const response = assetIds.map(id => getAssetById(id));
     return res(ctx.status(200), ctx.json(response.filter(data => !!data)));
   }),
 
-  rest.get(`*${environment.apiUrl}/assets/:partId`, (req, res, ctx) => {
+  rest.get(`*${environment.apiUrl}/assets/as-built/:partId`, (req, res, ctx) => {
     const { partId } = req.params;
     const currentAsset = getAssetById(partId as string);
     return res(ctx.status(200), ctx.json(currentAsset));
   }),
 
-  rest.patch(`*${environment.apiUrl}/assets/:partId`, (req, res, ctx) => {
+  rest.patch(`*${environment.apiUrl}/assets/as-built/:partId`, (req, res, ctx) => {
     const { partId } = req.params;
     const currentPart = getAssetById(partId as string);
     return res(ctx.status(200), ctx.json({ ...currentPart, ...req.json() }));
   }),
 
-  rest.get(`*${environment.apiUrl}/assets/:assetId/children/:childId`, (req, res, ctx) => {
+  rest.get(`*${environment.apiUrl}/assets/as-built/:assetId/children/:childId`, (req, res, ctx) => {
     const { childId } = req.params;
     const currentAsset = getAssetById(childId as string);
     return res(ctx.status(200), ctx.json(currentAsset));
   }),
 ];
 
 export const partsHandlersTest = [
-  rest.get(`*${environment.apiUrl}/assets`, (req, res, ctx) => {
+  rest.get(`*${environment.apiUrl}/assets/as-built`, (req, res, ctx) => {
     return res(ctx.status(200), ctx.json(mockAssets));
   }),
 
-  rest.get(`*${environment.apiUrl}/assets/my`, (req, res, ctx) => {
+  rest.get(`*${environment.apiUrl}/assets/as-built/my`, (req, res, ctx) => {
     return res(ctx.status(200), ctx.json(mockAssets));
   }),
 
-  rest.post(`*${environment.apiUrl}/assets/detail-information`, async (req, res, ctx) => {
+  rest.post(`*${environment.apiUrl}/assets/as-built/detail-information`, async (req, res, ctx) => {
     const { assetIds } = await req.json();
 
     const response = assetIds.map(id => mockAssetList[id] || getAssetById(id));
     return res(ctx.status(200), ctx.json(response.filter(data => !!data)));
   }),
 
-  rest.get(`*${environment.apiUrl}/assets/:partId`, (req, res, ctx) => {
+  rest.get(`*${environment.apiUrl}/assets/as-built/:partId`, (req, res, ctx) => {
     const { partId } = req.params;
     const currentAsset = mockAssetList[partId as string];
     return res(ctx.status(200), ctx.json(currentAsset));
   }),
 
-  rest.patch(`*${environment.apiUrl}/assets/:partId`, (req, res, ctx) => {
+  rest.patch(`*${environment.apiUrl}/assets/as-built/:partId`, (req, res, ctx) => {
     const { partId } = req.params;
     const currentPart = mockAssetList[partId as string];
     return res(ctx.status(200), ctx.json({ ...currentPart, ...req.json() }));
   }),
 
-  rest.get(`*${environment.apiUrl}/assets/:assetId/children/:childId`, (req, res, ctx) => {
+  rest.get(`*${environment.apiUrl}/assets/as-built/:assetId/children/:childId`, (req, res, ctx) => {
     const { childId } = req.params;
     const currentAsset = mockAssetList[childId as string];
     return res(ctx.status(200), ctx.json(currentAsset));

frontend/src/app/modules/page/other-parts/core/other-parts.service.ts

@@ -45,7 +45,7 @@ export class OtherPartsService {
       .set('owner', 'SUPPLIER');
 
     return this.apiService
-      .getBy<PartsResponse>(`${this.url}/assets`, params)
+      .getBy<PartsResponse>(`${this.url}/assets/as-built`, params)
       .pipe(map(parts => PartsAssembler.assembleOtherParts(parts)));
   }
 
@@ -58,7 +58,7 @@ export class OtherPartsService {
       .set('owner', 'CUSTOMER');
 
     return this.apiService
-      .getBy<PartsResponse>(`${this.url}/assets`, params)
+      .getBy<PartsResponse>(`${this.url}/assets/as-built`, params)
       .pipe(map(parts => PartsAssembler.assembleOtherParts(parts)));
   }
 }

frontend/src/app/modules/shared/service/parts.service.ts

@@ -47,25 +47,25 @@ export class PartsService {
       .set('owner', 'OWN');
 
     return this.apiService
-      .getBy<PartsResponse>(`${this.url}/assets`, params)
+      .getBy<PartsResponse>(`${this.url}/assets/as-built`, params)
       .pipe(map(parts => PartsAssembler.assembleParts(parts)));
   }
 
   public getPart(id: string): Observable<Part> {
     return this.apiService
-      .get<PartResponse>(`${this.url}/assets/${id}`)
+      .get<PartResponse>(`${this.url}/assets/as-built/${id}`)
       .pipe(map(part => PartsAssembler.assemblePart(part)));
   }
 
   public patchPart({ qualityType, id }: Part): Observable<Part> {
     const patchBody = { qualityType };
 
-    return this.apiService.patch<Part>(`${this.url}/assets/${id}`, patchBody);
+    return this.apiService.patch<Part>(`${this.url}/assets/as-built/${id}`, patchBody);
   }
 
   public getPartDetailOfIds(assetIds: string[]): Observable<Part[]> {
     return this.apiService
-      .post<PartResponse[]>(`${this.url}/assets/detail-information`, { assetIds })
+      .post<PartResponse[]>(`${this.url}/assets/as-built/detail-information`, { assetIds })
       .pipe(map(parts => PartsAssembler.assemblePartList(parts)));
   }
 

pom.xml

@@ -47,15 +47,15 @@ SPDX-License-Identifier: Apache-2.0
         <start-class>org.eclipse.tractusx.traceability.TraceabilityApplication</start-class>
 
         <!-- versions for Maven plugin -->
-        <ascii-doctor.maven.plugin.version>2.2.3</ascii-doctor.maven.plugin.version>
+        <ascii-doctor.maven.plugin.version>2.2.4</ascii-doctor.maven.plugin.version>
         <checkstyle-plugin.version>3.2.1</checkstyle-plugin.version>
         <compiler-plugin.version>3.10.1</compiler-plugin.version>
         <findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version>
         <gmavenplus-plugin.version>2.1.0</gmavenplus-plugin.version>
         <install-plugin.version>3.0.1</install-plugin.version>
         <jacoco-plugin.version>0.8.8</jacoco-plugin.version>
         <jar-plugin.version>3.3.0</jar-plugin.version>
-        <owasp-plugin.version>8.3.1</owasp-plugin.version>
+        <owasp-plugin.version>8.4.0</owasp-plugin.version>
         <spotbugs-plugin.version>4.7.3.0</spotbugs-plugin.version>
         <spring-boot-maven-plugin.version>3.0.2</spring-boot-maven-plugin.version>
         <apache-groovy.version>4.0.11</apache-groovy.version>
@@ -84,7 +84,7 @@ SPDX-License-Identifier: Apache-2.0
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
         <swagger-annotation.version>1.6.10</swagger-annotation.version>
         <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
-        <commons-io.version>2.11.0</commons-io.version>
+        <commons-io.version>2.13.0</commons-io.version>
         <jose4j.version>0.9.3</jose4j.version>
         <restito.version>1.1.0</restito.version>
         <testcontainer-postgresql.version>1.17.6</testcontainer-postgresql.version>
@@ -97,7 +97,7 @@ SPDX-License-Identifier: Apache-2.0
         <lombok.version>1.18.28</lombok.version>
         <json-unit-assertj.version>2.38.0</json-unit-assertj.version>
         <cucumber.version>7.12.1</cucumber.version>
-        <org-snakeyaml.version>2.0</org-snakeyaml.version>
+        <org-snakeyaml.version>2.1</org-snakeyaml.version>
         <jackson.version>2.15.1</jackson.version>
         <junit-bom.version>5.9.3</junit-bom.version>
         <awaitility.version>3.0.0</awaitility.version>

tx-backend/src/integration/groovy/org/eclipse/tractusx/traceability/common/support/AssetTestData.groovy

@@ -20,7 +20,7 @@ package org.eclipse.tractusx.traceability.common.support
 
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
-import org.eclipse.tractusx.traceability.assets.domain.asbuilt.model.Asset
+import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase
 import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.JobDetailResponse
 
 class AssetTestData {
@@ -29,7 +29,7 @@ class AssetTestData {
             .configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE, false)
             .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
 
-    List<Asset> readAndConvertAssetsForTests() {
+    List<AssetBase> readAndConvertAssetsForTests() {
         try {
             InputStream file = AssetTestData.class.getResourceAsStream("/data/irs_assets_v4.json")
             JobDetailResponse response = mapper.readValue(file, JobDetailResponse.class)

tx-backend/src/integration/groovy/org/eclipse/tractusx/traceability/qualitynotification/alert/rest/PublisherAlertsControllerIT.groovy

@@ -22,7 +22,7 @@ package org.eclipse.tractusx.traceability.qualitynotification.alert.rest
 import io.restassured.http.ContentType
 import org.apache.commons.lang3.RandomStringUtils
 import org.eclipse.tractusx.traceability.IntegrationSpecification
-import org.eclipse.tractusx.traceability.assets.domain.asbuilt.model.Asset
+import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase
 import org.eclipse.tractusx.traceability.common.security.JwtRole
 import org.eclipse.tractusx.traceability.common.support.*
 import org.eclipse.tractusx.traceability.infrastructure.edc.blackbox.model.EDCNotification
@@ -110,7 +110,7 @@ class PublisherAlertsControllerIT extends IntegrationSpecification implements Ir
 
         then:
         partIds.each { partId ->
-            Asset asset = assetAsBuiltRepository().getAssetById(partId)
+            AssetBase asset = assetAsBuiltRepository().getAssetById(partId)
             assert asset
             assert asset.isActiveAlert()
         }
@@ -498,7 +498,7 @@ class PublisherAlertsControllerIT extends IntegrationSpecification implements Ir
                 .body("id", Matchers.isA(Number.class))
         then:
         partIds.each { partId ->
-            Asset asset = assetAsBuiltRepository().getAssetById(partId)
+            AssetBase asset = assetAsBuiltRepository().getAssetById(partId)
             assert asset
             assert asset.isActiveAlert()
         }