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

Use CVEorg keywords from ps-constants #850

Merged
merged 4 commits into from
Dec 11, 2024
Merged

Use CVEorg keywords from ps-constants #850

merged 4 commits into from
Dec 11, 2024

Conversation

jobselko
Copy link
Contributor

@jobselko jobselko commented Dec 5, 2024

This PR changes the CVEorg collector to use keywords from the ps-constants repository instead of the ones hardcoded in the osidb repository. Also, it renames blacklist and whitelist to blocklist and allowlist.

Closes OSIDB-3694

@jobselko jobselko self-assigned this Dec 5, 2024
@jobselko jobselko marked this pull request as ready for review December 5, 2024 12:32
@jobselko jobselko requested a review from a team December 5, 2024 12:33
JakubFrejlach
JakubFrejlach requested changes Dec 5, 2024
View reviewed changes
Copy link
Contributor

@JakubFrejlach JakubFrejlach left a comment

Choose a reason for hiding this comment

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

Requesting changes to follow the PS Constants collector logic.

collectors/cveorg/keywords.py Outdated Show resolved Hide resolved
osoukup
osoukup requested changes Dec 6, 2024
View reviewed changes
Copy link
Contributor

@osoukup osoukup left a comment

Choose a reason for hiding this comment

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

I totally agree with @JakubFrejlach. This is not the way PS constants should be used. There are existing examples which can serve as an inspiration

@jobselko jobselko marked this pull request as draft December 6, 2024 12:23
@jobselko jobselko force-pushed the remove_keywords branch 3 times, most recently from 6730a2f to 11d320a Compare December 9, 2024 15:28
@jobselko jobselko marked this pull request as ready for review December 9, 2024 15:40
JakubFrejlach
JakubFrejlach reviewed Dec 10, 2024
View reviewed changes
Copy link
Contributor

@JakubFrejlach JakubFrejlach 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 for reworking that logic to comply with the ps-constants. I have couple of other objections.

collectors/cveorg/models.py Outdated Show resolved Hide resolved
collectors/ps_constants/core.py Outdated Show resolved Hide resolved
@jobselko jobselko marked this pull request as draft December 10, 2024 13:57
@jobselko jobselko marked this pull request as ready for review December 10, 2024 15:27
JakubFrejlach
JakubFrejlach approved these changes Dec 11, 2024
View reviewed changes
Copy link
Contributor

@JakubFrejlach JakubFrejlach left a comment

Choose a reason for hiding this comment

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

LGTM now! Thanks for addressing everything. Good job.

osoukup
osoukup approved these changes Dec 11, 2024
View reviewed changes
Copy link
Contributor

@osoukup osoukup left a comment

Choose a reason for hiding this comment

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

LGTM

@jobselko jobselko added this pull request to the merge queue Dec 11, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 11, 2024
@jobselko jobselko added this pull request to the merge queue Dec 11, 2024
Merged via the queue into master with commit 7bc59d2 Dec 11, 2024
11 checks passed
@jobselko jobselko deleted the remove_keywords branch December 11, 2024 12:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@osoukup osoukup osoukup approved these changes

@JakubFrejlach JakubFrejlach JakubFrejlach approved these changes

Assignees

@jobselko jobselko

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jobselko @JakubFrejlach @osoukup