Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion docs/supported_inventory_types.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ See the docs on [how to add a new Extractor](/docs/new_extractor.md).
| Chisel | | `os/chisel` |
| Nix | | `os/nix` |
| OPKG | e.g. OpenWrt | `os/dpkg` |
| RPM | e.g. RHEL, CentOS, Rocky Linux, AlmaLinux | `os/rpm` |
| RPM | e.g. RHEL, CentOS, Rocky Linux, AlmaLinux, Mageia | `os/rpm` |
| Zypper | e.g. openSUSE | `os/rpm` |
| Pacman | e.g. Arch Linux | `os/pacman` |
| Kernel modules | .ko | `os/kernel/module` |
Expand Down
3 changes: 3 additions & 0 deletions extractor/filesystem/os/ecosystem/ecosystem.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ func MakeEcosystem(metadata any) osvecosystem.Parsed {
majorVersion, _, _ := strings.Cut(m.OSVersionID, ".")
return osvecosystem.Parsed{Ecosystem: osvconstants.EcosystemAlmaLinux, Suffix: majorVersion}
}
if m.OSID == "mageia" {
return osvecosystem.Parsed{Ecosystem: osvconstants.EcosystemMageia, Suffix: m.OSVersionID}
}

case *snapmeta.Metadata:
if m.OSID == "ubuntu" {
Expand Down
23 changes: 23 additions & 0 deletions extractor/filesystem/os/ecosystem/ecosystem_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,29 @@ func TestEcosystemRPM(t *testing.T) {
},
want: "AlmaLinux",
},
{
desc: "Mageia_9",
metadata: &rpmmeta.Metadata{
OSID: "mageia",
OSVersionID: "9",
},
want: "Mageia:9",
},
{
desc: "Mageia_8",
metadata: &rpmmeta.Metadata{
OSID: "mageia",
OSVersionID: "8",
},
want: "Mageia:8",
},
{
desc: "Mageia_no_version",
metadata: &rpmmeta.Metadata{
OSID: "mageia",
},
want: "Mageia",
},
{
desc: "OS ID not present",
metadata: &rpmmeta.Metadata{},
Expand Down
Loading