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

Replace json string with proto in Version Distance Cel Policy #580

Merged
merged 5 commits into from
Feb 26, 2024
Merged

Replace json string with proto in Version Distance Cel Policy #580

merged 5 commits into from
Feb 26, 2024

Conversation

VithikaS
Copy link
Collaborator

@VithikaS VithikaS commented Feb 16, 2024 •
edited
Loading

Description

PR is to replace json string with a proto in Version Distance cel policy

Addressed Issue

This PR addresses issue DependencyTrack/hyades#931

Additional Details

Checklist

  • I have read and understand the contributing guidelines
  • This PR fixes a defect, and I have provided tests to verify that the fix is effective
  • This PR implements an enhancement, and I have provided tests to verify that it works as intended
  • This PR introduces changes to the database model, and I have added corresponding update logic
  • This PR introduces new or alters existing behavior, and I have updated the documentation accordingly

replace json string with proto
a0a43c7 
Signed-off-by: vithikashukla <[email protected]>
@VithikaS VithikaS changed the title Replace json string with proto in Version Distance Calculator Replace json string with proto in Version Distance Cel Policy Feb 16, 2024
@VithikaS VithikaS added the enhancement New feature or request label Feb 16, 2024
vithikashukla added 2 commits February 18, 2024 14:04
tidy up
1fe27fa 
Signed-off-by: vithikashukla <[email protected]>
Fix test
93b2ec3 
Signed-off-by: vithikashukla <[email protected]>
@VithikaS VithikaS marked this pull request as ready for review February 19, 2024 00:25
rename method
a944a91 
Signed-off-by: vithikashukla <[email protected]>
@nscuro nscuro added this to the 5.4.0 milestone Feb 19, 2024
nscuro
nscuro requested changes Feb 21, 2024
View reviewed changes
Copy link
Member

@nscuro nscuro left a comment

Choose a reason for hiding this comment

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

Looks good overall, just need an additional mapping step to ensure we're staying compatible with legacy policy conditions.

src/main/java/org/dependencytrack/policy/cel/compat/VersionDistanceCelScriptBuilder.java Outdated Show resolved Hide resolved
map json to proto in builder
503a0aa 
Signed-off-by: vithikashukla <[email protected]>
@nscuro nscuro merged commit 55f9850 into main Feb 26, 2024
6 checks passed
@nscuro nscuro deleted the use-proto-instead-of-json-string branch February 26, 2024 11:16
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 28, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@nscuro nscuro nscuro approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
5.4.0
Development

Successfully merging this pull request may close these issues.
2 participants
@VithikaS @nscuro