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(azure): add support for azurelinux OVAL #294

Merged
merged 7 commits into from
Jul 1, 2024

Conversation

tofay
Copy link
Contributor

@tofay tofay commented Jun 5, 2024

As part of aquasecurity/trivy#6673, add support for reading the azure linux 3.0 OVAL which resides alongside the cbl-mariner 1.0 and 2.0 OVAL.

I thought it sensible to use the same package in this repo for mariner and azure linux since the OVAL parsing is the same for both.

@knqyf263
Copy link
Collaborator

knqyf263 commented Jun 5, 2024

Thanks for your contribution! While it looks good, we also need to update trivy-db before merging this PR. Otherwise, it also inserts Azure Linux 3.0 into trivy-db as CBL-Mariner 3.0.

@tofay
Copy link
Contributor Author

tofay commented Jun 5, 2024

It sounds like separating mariner and azure info in the vuln-list directory will make compatibility between the trivy repos simpler, and potentially allow easier removal of CBL-Mariner in future when 2.0 is EOL?

@tofay
Copy link
Contributor Author

tofay commented Jun 5, 2024

I've done that separation now, but happy to revert and update trivy-db to rename mariner/3.0 to azurelinux if you prefer that approach.

@knqyf263
Copy link
Collaborator

knqyf263 commented Jun 6, 2024

It sounds like separating mariner and azure info in the vuln-list directory will make compatibility between the trivy repos simpler, and potentially allow easier removal of CBL-Mariner in future when 2.0 is EOL?

Sounds like a plan.

@tofay tofay changed the title add support for azurelinux OVAL feat(azure): add support for azurelinux OVAL Jun 6, 2024
@knqyf263 knqyf263 requested a review from DmitriyLewen June 6, 2024 17:34
Copy link
Contributor

@DmitriyLewen DmitriyLewen left a comment

Choose a reason for hiding this comment

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

Hello @tofay
Thanks for your work.

I left some comments on the refactoring.

I also think we can start using Azure Linux in GH action:

- if: always()
name: CBL-Mariner Vulnerability Data
run: ./scripts/update.sh mariner "CBL-Mariner Vulnerability Data"

mariner/mariner.go Outdated Show resolved Hide resolved
mariner/mariner.go Outdated Show resolved Hide resolved
mariner/mariner.go Outdated Show resolved Hide resolved
mariner/mariner.go Outdated Show resolved Hide resolved
mariner/mariner.go Outdated Show resolved Hide resolved
Copy link
Contributor

@DmitriyLewen DmitriyLewen left a comment

Choose a reason for hiding this comment

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

LGTM

@knqyf263 take a look, when you have time, please.

@knqyf263
Copy link
Collaborator

knqyf263 commented Jul 1, 2024

Sorry to be late. We're now targeting this support for v0.54.0. I'll review it shortly.
aquasecurity/trivy#6673

@knqyf263 knqyf263 merged commit b6d89da into aquasecurity:main Jul 1, 2024
2 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.

3 participants