fix: add buildInfo for BlobInfo in rpc package [backport: release/v0.67]

pkg/rpc/convert.go

@@ -834,6 +834,7 @@ func ConvertFromRPCPutBlobRequest(req *cache.PutBlobRequest) ftypes.BlobInfo {
 		CreatedBy:         req.BlobInfo.CreatedBy,
 		OpaqueDirs:        req.BlobInfo.OpaqueDirs,
 		WhiteoutFiles:     req.BlobInfo.WhiteoutFiles,
+		BuildInfo:         ConvertFromRPCBuildInfo(req.BlobInfo.BuildInfo),
 	}
 }
 
@@ -858,6 +859,18 @@ func ConvertToRPCRepository(repo *ftypes.Repository) *common.Repository {
 	}
 }
 
+// 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,
+	}
+}
+
 // ConvertToRPCArtifactInfo returns PutArtifactRequest
 func ConvertToRPCArtifactInfo(imageID string, imageInfo ftypes.ArtifactInfo) *cache.PutArtifactRequest {
 
@@ -947,10 +960,23 @@ func ConvertToRPCPutBlobRequest(diffID string, blobInfo ftypes.BlobInfo) *cache.
 			CreatedBy:         blobInfo.CreatedBy,
 			OpaqueDirs:        blobInfo.OpaqueDirs,
 			WhiteoutFiles:     blobInfo.WhiteoutFiles,
+			BuildInfo:         ConvertToRPCBuildInfo(blobInfo.BuildInfo),
 		},
 	}
 }
 
+// ConvertToRPCBuildInfo converts *ftypes.BuildInfo to *common.BuildInfo
+func ConvertToRPCBuildInfo(buildInfo *ftypes.BuildInfo) *common.BuildInfo {
+	if buildInfo == nil {
+		return nil
+	}
+	return &common.BuildInfo{
+		ContentSets: buildInfo.ContentSets,
+		Nvr:         buildInfo.Nvr,
+		Arch:        buildInfo.Arch,
+	}
+}
+
 // ConvertToMisconfResults returns common.MisconfResult
 func ConvertToMisconfResults(results []ftypes.MisconfResult) []*common.MisconfResult {
 	var rpcResults []*common.MisconfResult

rpc/cache/service.proto

@@ -46,6 +46,7 @@ message BlobInfo {
   repeated common.LicenseFile licenses = 13;
   int64 size = 14;
   string created_by = 15;
+  common.BuildInfo build_info = 16;
 }
 
 message PutBlobRequest {