Resolved merge conflicts

google · Jan 13, 2025 · 54882ab · 54882ab
2 parents 79b9984 + ed18178
commit 54882ab
Show file tree

Hide file tree

Showing 14 changed files with 1,399 additions and 567 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -42,6 +42,7 @@ jobs:
           args: --timeout=5m
   tests:
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}

diff --git a/binary/proto/proto.go b/binary/proto/proto.go
@@ -32,6 +32,7 @@ import (
 	scalibr "github.com/google/osv-scalibr"
 	"github.com/google/osv-scalibr/extractor"
 	ctrdfs "github.com/google/osv-scalibr/extractor/filesystem/containers/containerd"
+	"github.com/google/osv-scalibr/extractor/filesystem/language/dotnet/depsjson"
 	"github.com/google/osv-scalibr/extractor/filesystem/language/java/archive"
 	"github.com/google/osv-scalibr/extractor/filesystem/language/java/javalockfile"
 	"github.com/google/osv-scalibr/extractor/filesystem/language/javascript/packagejson"
@@ -248,6 +249,14 @@ func setProtoMetadata(meta any, i *spb.Inventory) {
 				Maintainers:  personsToProto(m.Maintainers),
 			},
 		}
+	case *depsjson.Metadata:
+		i.Metadata = &spb.Inventory_DepsjsonMetadata{
+			DepsjsonMetadata: &spb.DEPSJSONMetadata{
+				PackageName:    m.PackageName,
+				PackageVersion: m.PackageVersion,
+				Type:           m.Type,
+			},
+		}
 	case *apk.Metadata:
 		i.Metadata = &spb.Inventory_ApkMetadata{
 			ApkMetadata: &spb.APKPackageMetadata{

diff --git a/binary/proto/proto_test.go b/binary/proto/proto_test.go
@@ -29,6 +29,7 @@ import (
 	"github.com/google/osv-scalibr/detector"
 	"github.com/google/osv-scalibr/extractor"
 	ctrdfs "github.com/google/osv-scalibr/extractor/filesystem/containers/containerd"
+	"github.com/google/osv-scalibr/extractor/filesystem/language/dotnet/depsjson"
 	"github.com/google/osv-scalibr/extractor/filesystem/language/javascript/packagejson"
 	"github.com/google/osv-scalibr/extractor/filesystem/language/python/requirements"
 	"github.com/google/osv-scalibr/extractor/filesystem/language/python/wheelegg"
@@ -225,6 +226,40 @@ func TestScanResultToProto(t *testing.T) {
 		Locations: []string{"/file1"},
 		Extractor: &packagejson.Extractor{},
 	}
+
+	purlDotnetDepsJSONInventory := &extractor.Inventory{
+		Name:    "software",
+		Version: "1.0.0",
+		Metadata: &depsjson.Metadata{
+			PackageName:    "software",
+			PackageVersion: "1.0.0",
+			Type:           "type",
+		},
+		Locations: []string{"/file1"},
+		Extractor: &depsjson.Extractor{},
+	}
+
+	purlDotnetDepsJSONInventoryProto := &spb.Inventory{
+		Name:    "software",
+		Version: "1.0.0",
+		Purl: &spb.Purl{
+			Purl:    "pkg:nuget/[email protected]",
+			Type:    purl.TypeNuget,
+			Name:    "software",
+			Version: "1.0.0",
+		},
+		Ecosystem: "NuGet",
+		Locations: []string{"/file1"},
+		Extractor: "dotnet/depsjson",
+		Metadata: &spb.Inventory_DepsjsonMetadata{
+			DepsjsonMetadata: &spb.DEPSJSONMetadata{
+				PackageName:    "software",
+				PackageVersion: "1.0.0",
+				Type:           "type",
+			},
+		},
+	}
+
 	windowsInventory := &extractor.Inventory{
 		Name:    "windows_server_2019",
 		Version: "10.0.17763.3406",
@@ -682,6 +717,7 @@ func TestScanResultToProto(t *testing.T) {
 					purlPythonInventory,
 					pythonRequirementsInventory,
 					purlJavascriptInventory,
+					purlDotnetDepsJSONInventory,
 					cdxInventory,
 					windowsInventory,
 					purlPythonInventoryWithLayerDetails,
@@ -734,6 +770,7 @@ func TestScanResultToProto(t *testing.T) {
 					purlPythonInventoryProto,
 					pythonRequirementsInventoryProto,
 					purlJavascriptInventoryProto,
+					purlDotnetDepsJSONInventoryProto,
 					cdxInventoryProto,
 					windowsInventoryProto,
 					purlPythonInventoryWithLayerDetailsProto,

diff --git a/binary/proto/scan_result.proto b/binary/proto/scan_result.proto
@@ -86,6 +86,7 @@ message Inventory {
     DPKGPackageMetadata dpkg_metadata = 8;
     RPMPackageMetadata rpm_metadata = 9;
     COSPackageMetadata cos_metadata = 13;
+    DEPSJSONMetadata depsjson_metadata = 40;
     SPDXPackageMetadata spdx_metadata = 14;
     JavaArchiveMetadata java_archive_metadata = 15;
     JavaLockfileMetadata java_lockfile_metadata = 31;
@@ -292,6 +293,13 @@ message PACMANPackageMetadata {
   string package_dependencies = 6;
 }
 
+// The additional data found in .NET deps json packages.
+message DEPSJSONMetadata {
+  string package_name = 1;
+  string package_version = 2;
+  string type = 3;
+}
+
 // The additional data found in SNAP packages.
 message SNAPPackageMetadata {
   string name = 1;