Skip to content
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.

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

Merge from CatenaX #413

Merged
merged 152 commits into from
Feb 7, 2024
Merged

Merge from CatenaX #413

merged 152 commits into from
Feb 7, 2024

Conversation

ds-psosnowski
Copy link
Contributor

@ds-psosnowski ds-psosnowski commented Feb 6, 2024

Description

Added

  • Added helper script for building documentation locally.
  • Added new job parameter flag "auditContractNegotiation" which toggles setting contractAgreementId in Shells and Submodels
  • Added "contractAgreementId" field to Submodel model
  • Added Integration Tests for the entire IRS flow using stubbed responses of Discovery Service, Semantic Hub, EDC, Digital Twin Registry and BPDM Pool

Changed

  • Dataspace Discovery Service handles multiple EDC-Urls received for BPN now
  • Updated license header to "Copyright (c) 2021,2024 Contributors to the Eclipse Foundation"
  • Changed lookupGlobalAssetIds to lookupShellsByBPN, which provides full object.
  • Suppressed CVE-2024-20932 from graal-sdk-21.2.0.jar because this is not applicable for IRS.
  • Redesigned Shell object - wrapped payload and added "contractAgreementId" field
  • Changed structure of Policy creation to match EDC format

Pre-review checks

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

…stest non-failing result while ignoring the others
reason: returning Optional requires too many changes in existing code when ResultFinder is used later
…istryService

- EndpointDataForConnectorsService returns multiple EndpointDataReferences now
- These are handled in DecentralDigitalTwinRegistryService.fetchShellDescriptors and by selecting the results of the fastest
…scovery-Service-handle-multiple-EDC-Urls-received-for-BPN
…rAsset in combination with the actual data request
…scovery-Service-handle-multiple-EDC-Urls-received-for-BPN
…scovery-Service-handle-multiple-EDC-Urls-received-for-BPN

# Conflicts:
#	irs-registry-client/src/test/java/org/eclipse/tractusx/irs/registryclient/DefaultConfigurationTest.java
dsmf and others added 18 commits February 2, 2024 15:49
…scovery-Service-handle-multiple-EDC-Urls-received-for-BPN
The TODOs concerning #405 are resolved by #214.
Also removed the type of exception from the method name because this information is in the assert which is sufficient. No need to duplicate this.
…Service-handle-multiple-EDC-Urls-received-for-BPN

Feat/214 dataspace discovery service handle multiple edc urls received for bpn
…act-agreement-id

feat(impl):[#370] impl adding contract agreement id
…structure

Feature/#249 policy controller enchancements
…ng-to-google-style-guide

Chore/change test method naming to google style guide
…sed-in-summary-inside-job-response

COCNEPT: #207 prepare concept for redisign metrics used in summary inside job response
Copy link

gitguardian bot commented Feb 6, 2024

⚠️ GitGuardian has uncovered 2 secrets following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secrets in your pull request
GitGuardian id GitGuardian status Secret Commit Filename
9383100 Ignored Generic High Entropy Secret 4317ccc irs-api/src/test/java/org/eclipse/tractusx/irs/WiremockSupport.java View secret
9383100 Ignored Generic High Entropy Secret 4317ccc irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/SubmodelFacadeWiremockTest.java View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secrets safely. Learn here the best practices.
  3. Revoke and rotate these secrets.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Our GitHub checks need improvements? Share your feedbacks!

/**
* Payload representation for get all policies response
*/
@Builder

Check notice

Code scanning / CodeQL

Use of default toString() Note

Default toString(): Policy inherits toString() from Object, and so is not suitable for printing.
@ds-jhartmann
Copy link
Contributor

Created IP Lab content review issue https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/13167

ds-jhartmann and others added 7 commits February 6, 2024 10:43
…/378-separate-credentials-config

Revert "Revert "feat(impl):[#378] separate credentials config""
…737-feature/378-separate-credentials-config

Revert "Revert "Revert "feat(impl):[#378] separate credentials config"""
…-for-auditContractNegotiation

feat(testing):#370 added tavern tests for auditContractNegotiation
Add contact section to Update README.md
Copy link
Contributor

@ds-jhartmann ds-jhartmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ds-jhartmann ds-jhartmann merged commit 1ceb1fa into eclipse-tractusx:main Feb 7, 2024
17 of 20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants