Skip to content

Commit 6def66e

Browse files
authored
fix: add buildInfo for BlobInfo in rpc package (#9608)
1 parent 7422cc7 commit 6def66e

File tree

6 files changed

+703
-574
lines changed

6 files changed

+703
-574
lines changed

pkg/rpc/convert.go

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -847,6 +847,7 @@ func ConvertFromRPCPutBlobRequest(req *cache.PutBlobRequest) ftypes.BlobInfo {
847847
CreatedBy: req.BlobInfo.CreatedBy,
848848
OpaqueDirs: req.BlobInfo.OpaqueDirs,
849849
WhiteoutFiles: req.BlobInfo.WhiteoutFiles,
850+
BuildInfo: ConvertFromRPCBuildInfo(req.BlobInfo.BuildInfo),
850851
}
851852
}
852853

@@ -871,6 +872,18 @@ func ConvertToRPCRepository(repo *ftypes.Repository) *common.Repository {
871872
}
872873
}
873874

875+
// ConvertFromRPCBuildInfo converts *common.BuildInfo to *ftypes.BuildInfo
876+
func ConvertFromRPCBuildInfo(buildInfo *common.BuildInfo) *ftypes.BuildInfo {
877+
if buildInfo == nil {
878+
return nil
879+
}
880+
return &ftypes.BuildInfo{
881+
ContentSets: buildInfo.ContentSets,
882+
Nvr: buildInfo.Nvr,
883+
Arch: buildInfo.Arch,
884+
}
885+
}
886+
874887
// ConvertToRPCArtifactInfo returns PutArtifactRequest
875888
func ConvertToRPCArtifactInfo(imageID string, imageInfo ftypes.ArtifactInfo) *cache.PutArtifactRequest {
876889

@@ -960,10 +973,23 @@ func ConvertToRPCPutBlobRequest(diffID string, blobInfo ftypes.BlobInfo) *cache.
960973
CreatedBy: blobInfo.CreatedBy,
961974
OpaqueDirs: blobInfo.OpaqueDirs,
962975
WhiteoutFiles: blobInfo.WhiteoutFiles,
976+
BuildInfo: ConvertToRPCBuildInfo(blobInfo.BuildInfo),
963977
},
964978
}
965979
}
966980

981+
// ConvertToRPCBuildInfo converts *ftypes.BuildInfo to *common.BuildInfo
982+
func ConvertToRPCBuildInfo(buildInfo *ftypes.BuildInfo) *common.BuildInfo {
983+
if buildInfo == nil {
984+
return nil
985+
}
986+
return &common.BuildInfo{
987+
ContentSets: buildInfo.ContentSets,
988+
Nvr: buildInfo.Nvr,
989+
Arch: buildInfo.Arch,
990+
}
991+
}
992+
967993
// ConvertToMisconfResults returns common.MisconfResult
968994
func ConvertToMisconfResults(results []ftypes.MisconfResult) []*common.MisconfResult {
969995
var rpcResults []*common.MisconfResult

rpc/cache/service.pb.go

Lines changed: 81 additions & 67 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rpc/cache/service.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ message BlobInfo {
4646
repeated common.LicenseFile licenses = 13;
4747
int64 size = 14;
4848
string created_by = 15;
49+
common.BuildInfo build_info = 16;
4950
}
5051

5152
message PutBlobRequest {

0 commit comments

Comments
 (0)