feat(azure): Add Azure Linux support #409
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Azure Linux is a rebranding of CBL-Mariner, starting at version 3.0, so this reuses the existing Mariner parsing function.
DmitriyLewen
reviewed
Jul 2, 2024
pkg/vulnsrc/mariner/mariner.go
Outdated
| @@ -36,21 27,31 @@ type resolvedTest struct { | |||
| } | |||
|
|
|||
| type VulnSrc struct { | |||
| dbc db.Operation | |||
| Dbc db.Operation | |||
| VulnListDir string | |||
There was a problem hiding this comment.
VulnListDir is usually vuln-list dir.
Let's use more obvious name
Suggested change
| VulnListDir string | |
| MarinerDir string |
There was a problem hiding this comment.
I renamed. (I called it vulnListDir as that's the variable used in the redhat and nvd vuln srcs)
There was a problem hiding this comment.
azure is a renamed mariner.
So I think we can use one package for them:
➜ trivy-db git:(azure-linux) ✗ ls -hl ./pkg/vulnsrc/azure
total 36K
-rw-rw-r-- 1 dmitriy dmitriy 690 июл 2 13:12 azure.go
-rw-rw-r-- 1 dmitriy dmitriy 2,4K июл 2 13:12 azure_test.go
-rw-rw-r-- 1 dmitriy dmitriy 6,9K июл 2 13:39 mariner.go
-rw-rw-r-- 1 dmitriy dmitriy 6,1K июн 20 10:12 mariner_test.go
drwxrwxr-x 2 dmitriy dmitriy 4,0K июл 2 13:57 oval
drwxrwxr-x 4 dmitriy dmitriy 4,0K июл 2 13:12 testdata
-rw-rw-r-- 1 dmitriy dmitriy 206 окт 25 2022 types.go
I suggest the following refactoring:
- move logic from
mariner.gotoazure.go - create only
NewMarinerVulnSrc()function inmariner.go
There was a problem hiding this comment.
I've done this refactoring. Happy to rebase and git mv the mariner package if it makes reviewing easier.
pkg/vulnsrc/azure/azure.go
Outdated
| ErrNotSupported = xerrors.New("format not supported") | ||
| ) | ||
|
|
||
| func NewVulnSrc() mariner.VulnSrc { |
There was a problem hiding this comment.
You need to add this function to this map
| { | ||
| name: "happy path", | ||
| dir: filepath.Join("testdata", "happy"), | ||
| wantValues: []vulnsrctest.WantValues{ |
There was a problem hiding this comment.
what about vulnerability-detail?
|
@tofay I did some refactoring. |
LGTM, thanks. (I noted that the mariner URL changed from https://github.com/microsoft/CBL-MarinerVulnerabilityData to https://github.com/microsoft/AzureLinuxVulnerabilityData, which should be fine as the former repo was renamed to the latter) |
|
Cool 👍 You can use |
|
LGTM. As @DmitriyLewen suggested, we need to test this change with Trivy before merging it.
|
6 tasks
|
I've tested this changes with aquasecurity/trivy#7186. Testing setup:
Testing
|
knqyf263
approved these changes
Jul 18, 2024
|
Thanks! |
9 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Another part of aquasecurity/trivy#6673, along with aquasecurity/vuln-list-update#294.
Azure Linux is a rebranding of CBL-Mariner, starting at version 3.0, so this updates the existing Mariner parsing code to be used by both azure linux/cbl-mariner vulnsrcs.