Merge pull request google#2033 from herdiyana256:feature/os-wolfi-extractor

PiperOrigin-RevId: 913515859

Author: copybara-github

extractor/filesystem/language/dotnet/paketdependencies/paketdependencies.go

@@ -256,7 +256,6 @@ func (e Extractor) parseDependenciesFile(reader io.Reader, path string) ([]*extr
 			packages = append(packages, pkg)
 			continue
 		}
-
 	}
 
 	if err := scanner.Err(); err != nil {

extractor/filesystem/os/ecosystem/ecosystem.go

@@ -39,6 +39,15 @@ func MakeEcosystem(metadata any) osvecosystem.Parsed {
 	osVersionID := ""
 	switch m := metadata.(type) {
 	case *apkmeta.Metadata:
+		// Check for specific distros that use APK but map to different ecosystems.
+		// These checks must come before the version == "" guard because rolling
+		// distros (Wolfi, Chainguard) may not set VERSION_ID in os-release.
+		if m.OSID == "wolfi" {
+			return osvecosystem.FromEcosystem(osvconstants.EcosystemWolfi)
+		}
+		if m.OSID == "chainguard" {
+			return osvecosystem.FromEcosystem(osvconstants.EcosystemChainguard)
+		}
 		version := m.ToDistro()
 		if version == "" {
 			return osvecosystem.FromEcosystem(osvconstants.EcosystemAlpine)

extractor/filesystem/os/ecosystem/ecosystem_test.go

@@ -89,6 +89,20 @@ func TestMakeEcosystemAPK(t *testing.T) {
 			},
 			want: "BellSoft Hardened Containers:stream",
 		},
+		{
+			desc: "Wolfi",
+			metadata: &apkmeta.Metadata{
+				OSID: "wolfi",
+			},
+			want: "Wolfi",
+		},
+		{
+			desc: "Chainguard",
+			metadata: &apkmeta.Metadata{
+				OSID: "chainguard",
+			},
+			want: "Chainguard",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.desc, func(t *testing.T) {