Skip to content

extractor/os/rpm: trim AlmaLinux ecosystem suffix to major version #2198

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

Closed
histrio wants to merge 1 commit into from
Closed

extractor/os/rpm: trim AlmaLinux ecosystem suffix to major version #2198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion extractor/filesystem/os/ecosystem/ecosystem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,11 @@ func MakeEcosystem(metadata any) osvecosystem.Parsed {
return osvecosystem.Parsed{Ecosystem: osvconstants.EcosystemOpenEuler, Suffix: m.OpenEulerEcosystemSuffix()}
}
if m.OSID == "almalinux" {
return osvecosystem.Parsed{Ecosystem: osvconstants.EcosystemAlmaLinux, Suffix: m.OSVersionID}
// OSV.dev keys AlmaLinux advisories by major version only (e.g.
// "AlmaLinux:9"), so trim any point-release portion of VERSION_ID
// (e.g. "9.8" -> "9"). A bare major like "9" is returned unchanged.
major, _, _ := strings.Cut(m.OSVersionID, ".")
return osvecosystem.Parsed{Ecosystem: osvconstants.EcosystemAlmaLinux, Suffix: major}
}

case *snapmeta.Metadata:
Expand Down
10 changes: 9 additions & 1 deletion extractor/filesystem/os/ecosystem/ecosystem_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,15 @@ func TestEcosystemRPM(t *testing.T) {
want: "openEuler",
},
{
desc: "AlmaLinux_9",
desc: "AlmaLinux_point_release_trimmed_to_major",
metadata: &rpmmeta.Metadata{
OSID: "almalinux",
OSVersionID: "9.8",
},
want: "AlmaLinux:9",
},
{
desc: "AlmaLinux_bare_major",
metadata: &rpmmeta.Metadata{
OSID: "almalinux",
OSVersionID: "9",
Expand Down
Loading