fix(rpc): add PkgPath field to client / server mode (#1643)

Author: afdesk

pkg/rpc/convert.go

@@ -8,7 +8,6 @@ import (
 	"google.golang.org/protobuf/types/known/structpb"
 
 	ftypes "github.com/aquasecurity/fanal/types"
-	deptypes "github.com/aquasecurity/go-dep-parser/pkg/types"
 	dbTypes "github.com/aquasecurity/trivy-db/pkg/types"
 	"github.com/aquasecurity/trivy/pkg/log"
 	"github.com/aquasecurity/trivy/pkg/types"
@@ -33,6 +32,7 @@ func ConvertToRPCPkgs(pkgs []ftypes.Package) []*common.Package {
 			SrcEpoch:   int32(pkg.SrcEpoch),
 			License:    pkg.License,
 			Layer:      ConvertToRPCLayer(pkg.Layer),
+			FilePath:   pkg.FilePath,
 		})
 	}
 	return rpcPkgs
@@ -54,37 +54,12 @@ func ConvertFromRPCPkgs(rpcPkgs []*common.Package) []ftypes.Package {
 			SrcEpoch:   int(pkg.SrcEpoch),
 			License:    pkg.License,
 			Layer:      ConvertFromRPCLayer(pkg.Layer),
+			FilePath:   pkg.FilePath,
 		})
 	}
 	return pkgs
 }
 
-// ConvertFromRPCLibraries returns list of Fanal library
-func ConvertFromRPCLibraries(rpcLibs []*common.Library) []ftypes.Package {
-	var pkgs []ftypes.Package
-	for _, l := range rpcLibs {
-		pkgs = append(pkgs, ftypes.Package{
-			Name:    l.Name,
-			Version: l.Version,
-			License: l.License,
-		})
-	}
-	return pkgs
-}
-
-// ConvertToRPCLibraries returns list of libraries
-func ConvertToRPCLibraries(libs []deptypes.Library) []*common.Library {
-	var rpcLibs []*common.Library
-	for _, l := range libs {
-		rpcLibs = append(rpcLibs, &common.Library{
-			Name:    l.Name,
-			Version: l.Version,
-			License: l.License,
-		})
-	}
-	return rpcLibs
-}
-
 // ConvertToRPCVulns returns common.Vulnerability
 func ConvertToRPCVulns(vulns []types.DetectedVulnerability) []*common.Vulnerability {
 	var rpcVulns []*common.Vulnerability
@@ -128,6 +103,7 @@ func ConvertToRPCVulns(vulns []types.DetectedVulnerability) []*common.Vulnerabil
 			VulnerabilityId:    vuln.VulnerabilityID,
 			VendorIds:          vuln.VendorIDs,
 			PkgName:            vuln.PkgName,
+			PkgPath:            vuln.PkgPath,
 			InstalledVersion:   vuln.InstalledVersion,
 			FixedVersion:       vuln.FixedVersion,
 			Title:              vuln.Title,
@@ -264,6 +240,7 @@ func ConvertFromRPCVulns(rpcVulns []*common.Vulnerability) []types.DetectedVulne
 			VulnerabilityID:  vuln.VulnerabilityId,
 			VendorIDs:        vuln.VendorIds,
 			PkgName:          vuln.PkgName,
+			PkgPath:          vuln.PkgPath,
 			InstalledVersion: vuln.InstalledVersion,
 			FixedVersion:     vuln.FixedVersion,
 			Vulnerability: dbTypes.Vulnerability{
@@ -364,7 +341,7 @@ func ConvertFromRPCApplications(rpcApps []*common.Application) []ftypes.Applicat
 		apps = append(apps, ftypes.Application{
 			Type:      rpcApp.Type,
 			FilePath:  rpcApp.FilePath,
-			Libraries: ConvertFromRPCLibraries(rpcApp.Libraries),
+			Libraries: ConvertFromRPCPkgs(rpcApp.Libraries),
 		})
 	}
 	return apps
@@ -478,18 +455,10 @@ func ConvertToRPCBlobInfo(diffID string, blobInfo ftypes.BlobInfo) *cache.PutBlo
 
 	var applications []*common.Application
 	for _, app := range blobInfo.Applications {
-		var libs []*common.Library
-		for _, lib := range app.Libraries {
-			libs = append(libs, &common.Library{
-				Name:    lib.Name,
-				Version: lib.Version,
-				License: lib.License,
-			})
-		}
 		applications = append(applications, &common.Application{
 			Type:      app.Type,
 			FilePath:  app.FilePath,
-			Libraries: libs,
+			Libraries: ConvertToRPCPkgs(app.Libraries),
 		})
 	}
 

pkg/rpc/convert_test.go

@@ -9,7 +9,6 @@ import (
 
 	fos "github.com/aquasecurity/fanal/analyzer/os"
 	ftypes "github.com/aquasecurity/fanal/types"
-	ptypes "github.com/aquasecurity/go-dep-parser/pkg/types"
 	dbTypes "github.com/aquasecurity/trivy-db/pkg/types"
 	"github.com/aquasecurity/trivy-db/pkg/vulnsrc/vulnerability"
 	"github.com/aquasecurity/trivy/pkg/types"
@@ -134,68 +133,6 @@ func TestConvertFromRpcPkgs(t *testing.T) {
 	}
 }
 
-func TestConvertFromRpcLibraries(t *testing.T) {
-	type args struct {
-		rpcLibs []*common.Library
-	}
-	tests := []struct {
-		name string
-		args args
-		want []ftypes.Package
-	}{
-		{
-			name: "happy path",
-			args: args{
-				rpcLibs: []*common.Library{
-					{Name: "foo", Version: "1.2.3"},
-					{Name: "bar", Version: "4.5.6"},
-				},
-			},
-			want: []ftypes.Package{
-				{Name: "foo", Version: "1.2.3"},
-				{Name: "bar", Version: "4.5.6"},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := ConvertFromRPCLibraries(tt.args.rpcLibs)
-			assert.Equal(t, got, tt.want, tt.name)
-		})
-	}
-}
-
-func TestConvertToRpcLibraries(t *testing.T) {
-	type args struct {
-		libs []ptypes.Library
-	}
-	tests := []struct {
-		name string
-		args args
-		want []*common.Library
-	}{
-		{
-			name: "happy path",
-			args: args{
-				libs: []ptypes.Library{
-					{Name: "foo", Version: "1.2.3"},
-					{Name: "bar", Version: "4.5.6"},
-				},
-			},
-			want: []*common.Library{
-				{Name: "foo", Version: "1.2.3"},
-				{Name: "bar", Version: "4.5.6"},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := ConvertToRPCLibraries(tt.args.libs)
-			assert.Equal(t, got, tt.want, tt.name)
-		})
-	}
-}
-
 func TestConvertToRpcVulns(t *testing.T) {
 	fixedPublishedDate := time.Unix(1257894000, 0)
 	fixedLastModifiedDate := time.Unix(1257894010, 0)

pkg/rpc/server/server_test.go

@@ -359,7 +359,7 @@ func TestCacheServer_PutBlob(t *testing.T) {
 							{
 								Type:     "composer",
 								FilePath: "php-app/composer.lock",
-								Libraries: []*common.Library{
+								Libraries: []*common.Package{
 									{
 										Name:    "guzzlehttp/guzzle",
 										Version: "6.2.0",