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

feat: Include EPSS in JSON and CSV output #3211

Merged
merged 20 commits into from
Aug 10, 2023
Merged

Conversation

Rexbeast2
Copy link
Contributor

fixes #3209
closes #3208

@terriko terriko changed the title Feat: JSON and CSV output feat: JSON and CSV output Aug 8, 2023
@terriko terriko changed the title feat: JSON and CSV output feat: Include EPSS in JSON and CSV output Aug 8, 2023
@terriko
Copy link
Contributor

terriko commented Aug 8, 2023

I tweaked the PR title to make a slightly more clear commit message: I know it's obvious to you that this is EPSS related but the original message sounded like "I've added a feature that is JSON and CSV output" rather than "I've modified our existing CSV and JSON output to include EPSS"

I'm also going to re-run the failing tests. I think the failures are related to JSON issues on NVD's end and not something you changed, but I need the tests passing either way.

@Rexbeast2
Copy link
Contributor Author

@terriko I think the same test failing here but are passing on my own local and also on my fork. And for then name of PR I apologize. Next time I will keep that in mind.

Copy link
Contributor

@terriko terriko left a comment

Choose a reason for hiding this comment

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

This one's got tests! But I'd still like docs and we might need to consider error handling if metrics aren't populated. (maybe the if key != "metric": is enough here, though)

@codecov-commenter
Copy link

codecov-commenter commented Aug 8, 2023

Codecov Report

Merging #3211 (212ed3e) into main (06b55f7) will decrease coverage by 0.08%.
The diff coverage is 87.50%.

@@            Coverage Diff             @@
##             main    #3211      +/-   ##
==========================================
- Coverage   81.01%   80.94%   -0.08%     
==========================================
  Files         716      716              
  Lines       11163    11170       +7     
  Branches     1497     1500       +3     
==========================================
- Hits         9044     9041       -3     
- Misses       1719     1724       +5     
- Partials      400      405       +5     
Flag Coverage Δ
longtests 75.51% <87.50%> (-4.98%) ⬇️
win-longtests 78.86% <87.50%> (+0.08%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
test/test_available_fix.py 76.47% <ø> (ø)
test/test_output_engine.py 96.66% <ø> (ø)
cve_bin_tool/output_engine/__init__.py 60.47% <50.00%> (-0.19%) ⬇️
cve_bin_tool/output_engine/util.py 87.95% <100.00%> (+0.93%) ⬆️

... and 5 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@Rexbeast2
Copy link
Contributor Author

@terriko, I think it would handle the error now pretty well. And I have also added a test case where the metrics field is empty to check it. And it works. Is there anything more left to add?

Copy link
Contributor

@terriko terriko left a comment

Choose a reason for hiding this comment

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

Okay, this looks like it's ready to go. Thank you! Let's get it merged.

@terriko terriko merged commit 9d9e791 into intel:main Aug 10, 2023
21 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.

Feat: Include EPSS in CSV Output Feat: Including EPSS in Json Output
3 participants