fix(rpc): update convert package + add test

Author: DmitriyLewen

pkg/rpc/convert.go

@@ -75,6 +75,7 @@ func ConvertToRPCPkgs(pkgs []ftypes.Package) []*common.Package {
 			Relationship: int32(pkg.Relationship),
 			Indirect:     pkg.Indirect,
 			Maintainer:   pkg.Maintainer,
+			BuildInfo:    ConvertToRPCBuildInfo(pkg.BuildInfo),
 		})
 	}
 	return rpcPkgs
@@ -107,6 +108,17 @@ func ConvertToRPCLocations(pkgLocs []ftypes.Location) []*common.Location {
 	return locations
 }
 
+func ConvertToRPCBuildInfo(buildInfo *ftypes.BuildInfo) *common.BuildInfo {
+	if buildInfo == nil {
+		return nil
+	}
+	return &common.BuildInfo{
+		ContentSets: buildInfo.ContentSets,
+		Nvr:         buildInfo.Nvr,
+		Arch:        buildInfo.Arch,
+	}
+}
+
 func ConvertToRPCCustomResources(resources []ftypes.CustomResource) []*common.CustomResource {
 	var rpcResources []*common.CustomResource
 	for _, r := range resources {
@@ -230,6 +242,7 @@ func ConvertFromRPCPkgs(rpcPkgs []*common.Package) []ftypes.Package {
 			Relationship: ftypes.Relationship(pkg.Relationship),
 			Indirect:     pkg.Indirect,
 			Maintainer:   pkg.Maintainer,
+			BuildInfo:    ConvertFromRPCBuildInfo(pkg.BuildInfo),
 		})
 	}
 	return pkgs
@@ -267,6 +280,18 @@ func ConvertFromRPCLocation(locs []*common.Location) []ftypes.Location {
 	return pkgLocs
 }
 
+// ConvertFromRPCBuildInfo converts *common.BuildInfo to *ftypes.BuildInfo
+func ConvertFromRPCBuildInfo(buildInfo *common.BuildInfo) *ftypes.BuildInfo {
+	if buildInfo == nil {
+		return nil
+	}
+	return &ftypes.BuildInfo{
+		ContentSets: buildInfo.ContentSets,
+		Nvr:         buildInfo.Nvr,
+		Arch:        buildInfo.Arch,
+	}
+}
+
 // ConvertToRPCVulns returns common.Vulnerability
 func ConvertToRPCVulns(vulns []types.DetectedVulnerability) []*common.Vulnerability {
 	var rpcVulns []*common.Vulnerability

pkg/rpc/convert_test.go

@@ -62,6 +62,16 @@ func TestConvertToRpcPkgs(t *testing.T) {
 						Identifier: ftypes.PkgIdentifier{
 							UID: "01",
 						},
+						BuildInfo: &ftypes.BuildInfo{
+							ContentSets: []string{
+								"rhel-8-for-x86_64-baseos-rpms",
+								"rhel-8-for-x86_64-appstream-rpms",
+							},
+							// Nvr and arch are added for testing purposes only.
+							// In real-world cases, buildInfo contains ContentSets or nvr+arch
+							Nvr:  "ubi8-container-8.3-227",
+							Arch: "x86_64",
+						},
 					},
 				},
 			},
@@ -97,6 +107,16 @@ func TestConvertToRpcPkgs(t *testing.T) {
 					Identifier: &common.PkgIdentifier{
 						Uid: "01",
 					},
+					BuildInfo: &common.BuildInfo{
+						ContentSets: []string{
+							"rhel-8-for-x86_64-baseos-rpms",
+							"rhel-8-for-x86_64-appstream-rpms",
+						},
+						// Nvr and arch are added for testing purposes only.
+						// In real-world cases, buildInfo contains ContentSets or nvr+arch
+						Nvr:  "ubi8-container-8.3-227",
+						Arch: "x86_64",
+					},
 				},
 			},
 		},
@@ -152,6 +172,12 @@ func TestConvertFromRpcPkgs(t *testing.T) {
 						Identifier: &common.PkgIdentifier{
 							Uid: "01",
 						},
+						BuildInfo: &common.BuildInfo{
+							ContentSets: []string{
+								"rhel-8-for-x86_64-baseos-rpms",
+								"rhel-8-for-x86_64-appstream-rpms",
+							},
+						},
 					},
 				},
 			},
@@ -187,6 +213,12 @@ func TestConvertFromRpcPkgs(t *testing.T) {
 					Identifier: ftypes.PkgIdentifier{
 						UID: "01",
 					},
+					BuildInfo: &ftypes.BuildInfo{
+						ContentSets: []string{
+							"rhel-8-for-x86_64-baseos-rpms",
+							"rhel-8-for-x86_64-appstream-rpms",
+						},
+					},
 				},
 			},
 		},
@@ -225,6 +257,10 @@ func TestConvertFromRpcPkgs(t *testing.T) {
 							Uid: "63f8bef824b960e3",
 						},
 						Maintainer: "[email protected]",
+						BuildInfo: &common.BuildInfo{
+							Nvr:  "ubi8-container-8.3-227",
+							Arch: "x86_64",
+						},
 					},
 				},
 			},
@@ -261,6 +297,10 @@ func TestConvertFromRpcPkgs(t *testing.T) {
 						UID: "63f8bef824b960e3",
 					},
 					Maintainer: "[email protected]",
+					BuildInfo: &ftypes.BuildInfo{
+						Nvr:  "ubi8-container-8.3-227",
+						Arch: "x86_64",
+					},
 				},
 			},
 		},