New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/trx xxx upstream contribution #1385

Merged

ds-mwesener merged 156 commits into eclipse-tractusx:main from Cofinity-X:feature/TRX-XXX-upstream-contribution

Feb 7, 2025

Contributor

ds-lcapellino commented Feb 3, 2025 •

edited by ds-mwesener

Loading

Description

This PR introduces several contributions from Cofinity-X. A full List of contributions will follow.

Pre-review checks

Please ensure to do as many of the following checks as possible, before asking for committer review:

DEPENDENCIES are up-to-date. Dash license tool. Committers can open IP issues for restricted libs.
Copyright and license header are present on all affected files

bmunguli and others added 30 commits

September 2, 2024 14:56


          chore: Initial repository setup

bee3732


          chore: [TRX-38] Add local setup with Keycloak and WireMock (#7)

67f96e1

Co-authored-by: Pooja Patel <[email protected]>
(cherry picked from commit ba3ddd9968cb5f6315df6052969b9bb5f019d9b5)


          test: TRX 46 try to reuse cfx integrationtests (#9)

ffa6951

(cherry picked from commit 32191755c2b6cedfcb0fb036dd0f1944de9f2652)


          chore: [TRX-17] Add cfx frontend to repo (#10)

ac6a6e2

(cherry picked from commit b543c7c5bd4ba8fd30e2d42d11e8841cfd0db351)


          feat: [TRX-48] need to add cfx testdata (eclipse-tractusx#11)

c3af154

(cherry picked from commit ed0d8c3c49218e015c0e273e8cacb8c47bc8c321)


          feat: [TRX-51] Need to add insomnia collection from old cofinity-X (e…

295b516

…clipse-tractusx#19)

(cherry picked from commit 5632b68e94c5a43b73aeeea856ed74ad819e6688)


          chore: [TRX-17] Add correct cfx frontend to repo (eclipse-tractusx#21)

17f9247

(cherry picked from commit 7c2c2c2d71ad23085239137688139563e607895d)


          chore: [TRX-19] migrate upstream GitHub workflows and configs (#8)

d2e4c53

(cherry picked from commit 0085e72e0599e16b14d3e7e29e69161743e9e666)


          chore: [TRX-19] fix workflows (eclipse-tractusx#42)

5ded9fe


          feat: Feature/trx 68 search backend api functionality (eclipse-tractu…

42e000a

…sx#43)

Co-authored-by: ds-awahl <[email protected]>
Co-authored-by: Pooja Patel <[email protected]>


          chore: [TRX-50] create docker image build workflow for cofinity image (…

967dcbe

…eclipse-tractusx#44)

Co-authored-by: Maximilian Wesener <[email protected]>


          Chore/trx 50 cofinity docker image workflow (eclipse-tractusx#49)

28fdf6a

Co-authored-by: ds-jhartmann <[email protected]>


          feat: Feature/trx 100 tailwind configuration (eclipse-tractusx#48)

dac0e02


          chore: Fix image tag for dispatch (eclipse-tractusx#51)

Co-authored-by: ds-jhartmann <[email protected]>


          chore: chore/trx 96 adapt discovery flow bpnl (eclipse-tractusx#50)

26b591f


          fix: [TRX-328] add distinct environment variable to configure provide…

…r EDC API key (eclipse-tractusx#55)


          chore: [TRX-105] secure edc callback urls (eclipse-tractusx#53)

e7e8a3a


          chore: [TRX-105] secure edc callback urls (eclipse-tractusx#57)

e967517


          chore: [TRX-30] removed api key logic. (eclipse-tractusx#58)

494a1bc


          fix: [TRX-30] add data seeding on startup (eclipse-tractusx#59)

cfa745e


          Fix/trx 30 add inital asset (eclipse-tractusx#60)

5ae958e


          fix: [TRX-30] switch from camelCase to snake_case (eclipse-tractusx#61)

96db9bc


          Release/13.0.2 cfx 4 (eclipse-tractusx#63)

a04eee3

Co-authored-by: Jaro Hartmann <[email protected]>


          chore:[TRX-344]- updating the irs-client version (2.1.14) (eclipse-tr…

328f90b

…actusx#64)


          chore: [TRX-XX] add discoverytype for registryClient. (eclipse-tractu…

b8c649e

…sx#65)


          chore: [TRX-350] add properties for authentication dtr / submodel ser…

a8f971d

…vices (eclipse-tractusx#67)


          chore: [TRX-341] - Fixed Dynamic AssertRefreshCron parameter (eclipse…

7f1d887

…-tractusx#62)

Co-authored-by: Jaro Hartmann <[email protected]>


          chore: [TRX-105] Upgrading library of irs to 2.1.15 (eclipse-tractusx#72

da89ecf

)

Co-authored-by: Alexander Wahl <[email protected]>


          feat: trx 349 authentication of enablement services (eclipse-tractusx#71

5b4560c

)

Co-authored-by: Maximilian Wesener <[email protected]>


          [TRX-30] Submodel Client Adaption for DOS (eclipse-tractusx#74)

0d0a572

ds-mwesener and others added 7 commits

January 24, 2025 09:42


          feat(TRACEX-205): impl-orderapi (eclipse-tractusx#206)

b28c35d


          fix: [TRX-454] Restrict Supervisor from modifying policies (eclipse-t…

ea549a6

…ractusx#221)


          chore: upstream ready submodel integration (eclipse-tractusx#204)

e044fbc


          chore: [TRX-203] Twin lookup process (eclipse-tractusx#216)

2d5ab55

Co-authored-by: Lucas Capellino <[email protected]>


          fix: [TRX-420] Allow to Sync child supplier parts for Admin in Trace X (

c274084

eclipse-tractusx#218)

Co-authored-by: Maximilian Wesener <[email protected]>


          chore: tracex-385 remove custom logic (eclipse-tractusx#224)

6e240ce


          Merge branch 'main' into feature/TRX-XXX-upstream-contribution

3933d75

# Conflicts:
#	.github/workflows/pull-request_backend.yml
#	CHANGELOG.md
#	docs/api/traceability-foss-backend.json

github-advanced-security bot found potential problems

View reviewed changes

cfx-frontend/cypress/Dockerfile Fixed Show fixed Hide fixed

github-advanced-security bot found potential problems

View reviewed changes

tx-backend/docker/docker-compose.yml

    
                  networks:

                    - tracex-net

                keycloak:

Check warning

Code scanning / KICS

Container Capabilities Unrestricted Warning

Docker compose file doesn't have 'cap_drop' attribute. Make sure your container only has necessary capabilities.

tx-backend/docker/docker-compose.yml

    
                  networks:

                    - tracex-net

                keycloak:

Check warning

Code scanning / KICS

Healthcheck Not Set Warning

Healthcheck is not defined.

tx-backend/docker/docker-compose.yml

    
                  networks:

                    - tracex-net

                keycloak:

Check warning

Code scanning / KICS

Security Opt Not Set Warning

Docker compose file does not have 'security_opt' attribute

tx-backend/docker/docker-compose.yml

    
                  volumes:

                    # Mount path can be customized according to the project folder structure

                    - ./cx_keycloak_realm/cx-realm.json:/opt/keycloak/data/import/realm.json

                  ports:

Check warning

Code scanning / KICS

Container Traffic Not Bound To Host Interface Warning

Docker compose file doesn't have 'ports' attribute bound to a specific host interface

tx-backend/docker/docker-compose.yml

    
                  networks:

                    - tracex-net

                wiremock:

Check warning

Code scanning / KICS

Container Capabilities Unrestricted Warning

Docker compose file doesn't have 'cap_drop' attribute. Make sure your container only has necessary capabilities.

tx-backend/docker/docker-compose.yml

    
                  networks:

                    - tracex-net

                wiremock:

Check warning

Code scanning / KICS

Healthcheck Not Set Warning

Healthcheck is not defined.

tx-backend/docker/docker-compose.yml

    
                  networks:

                    - tracex-net

                wiremock:

Check warning

Code scanning / KICS

Security Opt Not Set Warning

Docker compose file does not have 'security_opt' attribute

tx-backend/docker/docker-compose.yml

    
                  image: wiremock/wiremock:3.4.2

                  volumes:

                    - ./wiremock:/home/wiremock

                  ports:

Check warning

Code scanning / KICS

Container Traffic Not Bound To Host Interface Warning

Docker compose file doesn't have 'ports' attribute bound to a specific host interface

github-advanced-security bot found potential problems

View reviewed changes

cfx-frontend/src/app/mocks/services/otherParts-mock/otherParts.handler.ts Fixed Show fixed Hide fixed

cfx-frontend/src/app/modules/page/admin/admin.routing.ts Fixed Show fixed Hide fixed

...d/src/app/modules/page/other-parts/presentation/supplier-parts/supplier-parts.component.html Fixed Show fixed Hide fixed

...d/src/app/modules/page/other-parts/presentation/supplier-parts/supplier-parts.component.html Fixed Show fixed Hide fixed

...d/src/app/modules/page/other-parts/presentation/supplier-parts/supplier-parts.component.html Fixed Show fixed Hide fixed

cfx-frontend/src/mockServiceWorker.js Fixed Show fixed Hide fixed

cfx-frontend/src/tests/test-render.utils.ts Fixed Show fixed Hide fixed

cfx-frontend/src/tests/test-render.utils.ts Fixed Show fixed Hide fixed

cfx-frontend/src/tests/test-render.utils.ts Fixed Show fixed Hide fixed

tx-backend/src/main/resources/application-localenv.yml Dismissed Show dismissed Hide dismissed

ds-lcapellino and others added 6 commits

February 3, 2025 11:04


          chore: tracex-385 remove custom logic

80c46f8


          chore: tracex-385 remove custom logic

075ca71


          fix(TRX-278): Enable cfx-frontend build (eclipse-tractusx#220)

40cd39d


          fix: TRX-420: reverting frontend changes (eclipse-tractusx#227)

2721db7


          Merge remote-tracking branch 'origin/feature/TRX-XXX-upstream-contrib…

dc01d3e

…ution' into feature/TRX-XXX-upstream-contribution


          chore: tracex-385 remove custom logic

22376e7

ds-lcapellino force-pushed the feature/TRX-XXX-upstream-contribution branch from d64061b to 22376e7 Compare

February 4, 2025 09:01

ds-lcapellino and others added 9 commits

February 4, 2025 10:07


          chore: tracex-385 remove custom logic


          Feature/tracex 353 sync job configurable (eclipse-tractusx#226)

0a1deb9


          fix: TRX-384: Remove null check for manufacturerName in findByBpn (ec…

0f9bc7d

…lipse-tractusx#222)


          fix(TRX-362): Fix vulnerability CVE-2024-50379 (eclipse-tractusx#209)

eb99337

Co-authored-by: Jaro Hartmann <[email protected]>


          fix: bump dependencies to fix CVEs (eclipse-tractusx#212)

6dd8ce4

Co-authored-by: Maximilian Wesener <[email protected]>


          chore:[TRACEX-357] BPDM Lookup Handling in UI and regarding Updates o…

1001bba

…f BPDM information (eclipse-tractusx#225)


          chore(TRACEX-278): Use nginx proxy for cfx-frontend (eclipse-tractusx…

b80f46c

…#228)


          chore: [TRX-433] fix typo in folder name (eclipse-tractusx#229)

61079fa


          Merge branch 'main' into feature/TRX-XXX-upstream-contribution

da61994

# Conflicts:
#	.github/workflows/_cfx-docker-image.yml
#	CFX-CHANGELOG.md
#	cfx-frontend/Dockerfile
#	cfx-frontend/build/nginx.conf
#	cfx-frontend/scripts/add-license-header.js
#	cfx-frontend/scripts/custom-injector.sh
#	cfx-frontend/scripts/eclipse_dash.sh
#	cfx-frontend/scripts/inject-dynamic-env.js
#	cfx-frontend/scripts/replace-base-href.js
#	cfx-frontend/scripts/xray-download-feature-files.sh
#	cfx-frontend/scripts/xray-push-test-results.sh

github-advanced-security bot found potential problems

View reviewed changes

.../org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/IrsCallbackController.java Dismissed Show dismissed Hide dismissed

.../org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/IrsCallbackController.java Dismissed Show dismissed Hide dismissed

.../org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/IrsCallbackController.java Dismissed Show dismissed Hide dismissed

.../org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/IrsCallbackController.java Dismissed Show dismissed Hide dismissed

...va/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/OrderRepositoryImpl.java Dismissed Show dismissed Hide dismissed

...va/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/OrderRepositoryImpl.java Dismissed Show dismissed Hide dismissed

...ckend/src/main/java/org/eclipse/tractusx/traceability/bpn/domain/service/BpnServiceImpl.java

    
                      }

                      return manufacturerName;

                      String manufacturerName = bpnRepository.findManufacturerName(bpn);

Check notice

Code scanning / CodeQL

Unread local variable Note

Variable 'String manufacturerName' is never read.

.../java/org/eclipse/tractusx/traceability/bpn/infrastructure/repository/BpnRepositoryImpl.java

    
                                  .build();

                      }

                      log.info("Saving BpnEntity: {}", entity);

Check notice

Code scanning / CodeQL

Use of default toString() Note

Default toString(): BpnEntity inherits toString() from Object, and so is not suitable for printing.

...ractusx/traceability/notification/domain/notification/repository/NotificationRepository.java

    
            @@ -58,4 +59,5 @@
          
                  void deleteByIdIn(List<String> messageIds);

                  long countPartsByStatusAndOwnershipAndTypeAndNotificationType(List<NotificationStatus> received, Owner owner, NotificationType notificationType);

Check notice

Code scanning / CodeQL

Useless parameter Note

The parameter 'notificationType' is never used.

...se/tractusx/traceability/integration/assets/infrastructure/base/IrsCallbackControllerIT.java

    
                      String jobState = "COMPLETED";

                      irsApiSupport.irsApiReturnsOrderAndBatchDetailsAsPlanned();

                      String orderId = "ebb79c45-7bba-4169-bf17-3e719989ab57";

                      String batchId = "ebb79c45-7bba-4169-bf17-3e719989ab58";

Check notice

Code scanning / CodeQL

Unread local variable Note test

Variable 'String batchId' is never read.

Contributor Author

ds-lcapellino commented Feb 7, 2025

Eclipse IP Issue: https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/19308

ds-mwesener approved these changes

View reviewed changes

Contributor

ds-mwesener left a comment

LGTM, IP Check approved: https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/19308#note_2967100

ds-mwesener merged commit 074fd3b into eclipse-tractusx:main

19 of 27 checks passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet