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.

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

Chore: Migrate to EDC 0.7.0 #359

Merged
merged 26 commits into from
May 21, 2024
Merged

Chore: Migrate to EDC 0.7.0 #359

merged 26 commits into from
May 21, 2024

Conversation

tom-rm-meyer-ISST
Copy link
Contributor

@tom-rm-meyer-ISST tom-rm-meyer-ISST commented May 7, 2024 •
edited
Loading

Description

Adoption of EDC to version to 0.7.0 (please only focus on backend and frontend folder during review):

  • EdcAdapterService now uses the /v2/edrs api to obtain an EDR token
    • token is stored via EndpointDataReferenceService
    • token found via EndpointDataReferenceService renewal is only triggered, if token is not yet or does not expire in 5 seconds
    • transfer is terminated (new feature) after failure / being successful
  • Update of EdcRequestBodyBuilder
    • to include new requests
    • to use better formulated context handling based on Json-Ld (still not perfect, but better)
  • added debug logs for payloads (log level default not changed)
  • refactored policy building
  • added java docs
  • adoption of EDC frontend interface and frontend classes
  • adoption of framework policy to new structure
  • fixed that the dspUrl of submodel was not used for negotiation

This branch builds on chore/edc-0.7.0 (PR#351), a git diff --stat -w on that branch results in a delta of 951 lines.

ATTENTION: PLEASE DO NOT FORK FROM THIS BRANCH. THIS BRANCH WILL BE MERGED SOMEHOW PRIOR TO INT TEST.

Pre-review checks

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

github-advanced-security[bot]
github-advanced-security bot found potential problems May 7, 2024
View reviewed changes
Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

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

KICS found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

@tom-rm-meyer-ISST
Copy link
Contributor Author

@eschrewe : please focus on the backend part
@ReneSchroederLJ : please focus on the frontend part

Feel invited to check also the each other's part. Please ignore the overall changes regarding infrastructure. I'll need to cherry pick and rewrite the branch as the infrastructure has some open IP checks and we need the working EDC separately.
@ReneSchroederLJ: please don't wait for the EDC 0.7.0 changes, I'll later merge things.

This was linked to issues May 10, 2024
Migrate Tractus EDC to 0.6.x #184
Closed
Add Purpose Policy #323
Closed
eschrewe
eschrewe suggested changes May 13, 2024
View reviewed changes
Copy link
Contributor

@eschrewe eschrewe left a comment

Choose a reason for hiding this comment

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

Wow, really a major update. Thanks for your great contribution. :)
Please see my remarks for some (mostly minor) details.

...main/java/org/eclipse/tractusx/puris/backend/common/edc/logic/service/EdcAdapterService.java Outdated Show resolved Hide resolved
backend/pom.xml Outdated Show resolved Hide resolved
...c/main/java/org/eclipse/tractusx/puris/backend/common/edc/logic/dto/PolicyConstraintDto.java Outdated Show resolved Hide resolved
...main/java/org/eclipse/tractusx/puris/backend/common/edc/logic/service/EdcAdapterService.java Show resolved Hide resolved
...main/java/org/eclipse/tractusx/puris/backend/common/edc/logic/service/EdcAdapterService.java Outdated Show resolved Hide resolved
...main/java/org/eclipse/tractusx/puris/backend/common/edc/logic/service/EdcAdapterService.java Show resolved Hide resolved
local/seed-bdrs.sh Outdated Show resolved Hide resolved
local/tractus-x-edc/config/customer/data-plane.properties Outdated Show resolved Hide resolved
local/tractus-x-edc/config/customer/puris-backend.properties Outdated Show resolved Hide resolved
local/tractus-x-edc/config/supplier/puris-backend.properties Outdated Show resolved Hide resolved
@tom-rm-meyer-ISST
chore(Tractusx-Edc): bump version to 0.7.1
bcb04e8
@tom-rm-meyer-ISST
chore(edc-0.7.0): migrated backend to version 0.7.0
d3dd47c
@tom-rm-meyer-ISST
feat(EdcAdapterService): terminate transfers
8575873
@tom-rm-meyer-ISST
feat: updated edc request and frontend to edc 0.7.0
411435c
@tom-rm-meyer-ISST
feat(EdcRequestBodyBuilder): adjust context for policy creation and a…
d1c0b52 
…dd odrl-profile
@tom-rm-meyer-ISST
fix(EdcAdapterService): use dspUrl of the SubmodelDescriptor for nego…
50b346c 
…tiation
@tom-rm-meyer-ISST
fix(EdcAdapterService): check constraints for >=1 submodel offers and…
ca2465b 
… take the first fulfilled
@tom-rm-meyer-ISST
feat(EdcRequestBodyBuilder): introduced cx-policy framework agreement…
7b2aed1 
… definition
@tom-rm-meyer-ISST
chore(chart): increased chart version
4e36df9
@tom-rm-meyer-ISST
feat(EdcAdapterService): introduced cx-policy usage purpose policy
76719e2
@tom-rm-meyer-ISST
refactor(EdcRequestBodyBuilder): make PolicyConstraintDto a private r…
cd17779 
…ecord
@tom-rm-meyer-ISST
refactor(EdcAdapterService): improved null value handling
517a2c7
@tom-rm-meyer-ISST
refactor(EdcAdapterService): remove storing of edr and expiry check
65178bc
@tom-rm-meyer-ISST
Revert "chore(Tractusx-Edc): bump version to 0.7.1"
fbf0831 
This reverts commit bcb04e8.
@tom-rm-meyer-ISST
Merge branch 'main' into chore/edc-0.7.0
6d63c8d 
# Conflicts:
#	backend/src/main/java/org/eclipse/tractusx/puris/backend/common/edc/logic/service/EdcAdapterService.java
#	local/docker-compose.yaml
@tom-rm-meyer-ISST
chore: updated frontend dependencies
3a71a70
@tom-rm-meyer-ISST tom-rm-meyer-ISST marked this pull request as ready for review May 15, 2024 14:02
eschrewe
eschrewe suggested changes May 16, 2024
View reviewed changes
Copy link
Contributor

@eschrewe eschrewe left a comment

Choose a reason for hiding this comment

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

Well done, thank you. Just some very minor remarks left :)

...main/java/org/eclipse/tractusx/puris/backend/common/edc/logic/service/EdcAdapterService.java Show resolved Hide resolved
...main/java/org/eclipse/tractusx/puris/backend/common/edc/logic/service/EdcAdapterService.java Outdated Show resolved Hide resolved
local/.gitignore Outdated Show resolved Hide resolved
local/INSTALL.md Outdated Show resolved Hide resolved
local/generate-keys.sh Outdated Show resolved Hide resolved
eschrewe
eschrewe approved these changes May 16, 2024
View reviewed changes
Copy link
Contributor

@eschrewe eschrewe left a comment

Choose a reason for hiding this comment

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

Thank you very much :)

@mhellmeier mhellmeier merged commit 36c28aa into eclipse-tractusx:main May 21, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eschrewe eschrewe eschrewe approved these changes

@mhellmeier mhellmeier mhellmeier approved these changes

@ReneSchroederLJ ReneSchroederLJ Awaiting requested review from ReneSchroederLJ

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add Purpose Policy Migrate Tractus EDC to 0.6.x
3 participants
@tom-rm-meyer-ISST @mhellmeier @eschrewe