docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-07-09 21:17:09 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

vendor: update buildkit to master@8b7bcb900d3c

Browse Source 
Signed-off-by: Justin Chadwell <me@jedevc.com>
This commit is contained in:
Justin Chadwell
2023-03-29 12:38:36 +01:00
parent c6cdcb02cf
commit 9541457c54
416 changed files with 24398 additions and 16253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vendor/github.com/moby/buildkit/util/grpcerrors/grpcerrors.go generated vendored
View File

@ -1,16 +1,17 @@
package grpcerrors
import (
"context"
"encoding/json"
"errors"
"github.com/containerd/typeurl"
"github.com/containerd/typeurl/v2"
rpc "github.com/gogo/googleapis/google/rpc"
gogotypes "github.com/gogo/protobuf/types"
"github.com/golang/protobuf/proto" //nolint:staticcheck
"github.com/golang/protobuf/ptypes/any"
"github.com/moby/buildkit/util/bklog"
"github.com/moby/buildkit/util/stack"
"github.com/sirupsen/logrus"
spb "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
@ -25,7 +26,7 @@ type TypedErrorProto interface {
WrapError(error) error
}
func ToGRPC(err error) error {
func ToGRPC(ctx context.Context, err error) error {
if err == nil {
return nil
}
@ -64,7 +65,7 @@ func ToGRPC(err error) error {
})
if len(details) > 0 {
if st2, err := withDetails(st, details...); err == nil {
if st2, err := withDetails(ctx, st, details...); err == nil {
st = st2
}
}
@ -72,7 +73,7 @@ func ToGRPC(err error) error {
return st.Err()
}
func withDetails(s *status.Status, details ...proto.Message) (*status.Status, error) {
func withDetails(ctx context.Context, s *status.Status, details ...proto.Message) (*status.Status, error) {
if s.Code() == codes.OK {
return nil, errors.New("no error details for status with code OK")
}
@ -80,7 +81,7 @@ func withDetails(s *status.Status, details ...proto.Message) (*status.Status, er
for _, detail := range details {
url, err := typeurl.TypeURL(detail)
if err != nil {
logrus.Warnf("ignoring typed error %T: not registered", detail)
bklog.G(ctx).Warnf("ignoring typed error %T: not registered", detail)
continue
}
dt, err := json.Marshal(detail)

6
vendor/github.com/moby/buildkit/util/grpcerrors/intercept.go generated vendored
View File

@ -15,7 +15,7 @@ func UnaryServerInterceptor(ctx context.Context, req interface{}, info *grpc.Una
oldErr := err
if err != nil {
stack.Helper()
err = ToGRPC(err)
err = ToGRPC(ctx, err)
}
if oldErr != nil && err == nil {
logErr := errors.Wrap(err, "invalid grpc error conversion")
@ -30,7 +30,7 @@ func UnaryServerInterceptor(ctx context.Context, req interface{}, info *grpc.Una
}
func StreamServerInterceptor(srv interface{}, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
err := ToGRPC(handler(srv, ss))
err := ToGRPC(ss.Context(), handler(srv, ss))
if err != nil {
stack.Helper()
}
@ -50,5 +50,5 @@ func StreamClientInterceptor(ctx context.Context, desc *grpc.StreamDesc, cc *grp
if err != nil {
stack.Helper()
}
return s, ToGRPC(err)
return s, ToGRPC(ctx, err)
}