JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix empty string id in result ref 

Signed-off-by: Edgar Lee <edgarl@netflix.com>
v0.7
Edgar Lee 2019-12-05 11:08:12 -08:00
parent b622a87c5d
commit 7562a6638a
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/gateway/gateway.go
View File

@ -479,7 +479,7 @@ func (lbf *llbBridgeForwarder) Solve(ctx context.Context, req *pb.SolveRequest)
if req.AllowResultArrayRef { if req.AllowResultArrayRef {
refMap := make(map[string]*pb.Ref, len(res.Refs)) refMap := make(map[string]*pb.Ref, len(res.Refs))
for k, id := range ids { for k, id := range ids {
refMap[k] = &pb.Ref{Ids: []string{id}} refMap[k] = pb.NewRef(id)
} }
pbRes.Result = &pb.Result_Refs{Refs: &pb.RefMap{Refs: refMap}} pbRes.Result = &pb.Result_Refs{Refs: &pb.RefMap{Refs: refMap}}
} else { } else {
@ -495,7 +495,7 @@ func (lbf *llbBridgeForwarder) Solve(ctx context.Context, req *pb.SolveRequest)
defaultID = id defaultID = id
if req.AllowResultArrayRef { if req.AllowResultArrayRef {
pbRes.Result = &pb.Result_Ref{Ref: &pb.Ref{Ids: []string{id}}} pbRes.Result = &pb.Result_Ref{Ref: pb.NewRef(id)}
} else { } else {
pbRes.Result = &pb.Result_RefDeprecated{RefDeprecated: id} pbRes.Result = &pb.Result_RefDeprecated{RefDeprecated: id}
} }

4
frontend/gateway/grpcclient/client.go
View File

@ -112,7 +112,7 @@ func (c *grpcClient) Run(ctx context.Context, f client.BuildFunc) (retError erro
retError = err retError = err
continue continue
} }
m[k] = &pb.Ref{Ids: []string{id}} m[k] = pb.NewRef(id)
} }
pbRes.Result = &pb.Result_Refs{Refs: &pb.RefMap{Refs: m}} pbRes.Result = &pb.Result_Refs{Refs: &pb.RefMap{Refs: m}}
} else { } else {
@ -120,7 +120,7 @@ func (c *grpcClient) Run(ctx context.Context, f client.BuildFunc) (retError erro
if err != nil { if err != nil {
retError = err retError = err
} else { } else {
pbRes.Result = &pb.Result_Ref{Ref: &pb.Ref{Ids: []string{id}}} pbRes.Result = &pb.Result_Ref{Ref: pb.NewRef(id)}
} }
} }
if retError == nil { if retError == nil {

9
frontend/gateway/pb/ref.go Normal file
View File

@ -0,0 +1,9 @@
package moby_buildkit_v1_frontend
func NewRef(id string) *Ref {
var ref Ref
if id != "" {
ref.Ids = append(ref.Ids, id)
}
return &ref
}