vendor: update buildkit with typed errors support

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

vendor/github.com/moby/buildkit/session/secrets/secrets.go

@@ -4,9 +4,9 @@ import (
 	"context"
 
 	"github.com/moby/buildkit/session"
+	"github.com/moby/buildkit/util/grpcerrors"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 )
 
 type SecretStore interface {
@@ -21,10 +21,10 @@ func GetSecret(ctx context.Context, c session.Caller, id string) ([]byte, error)
 		ID: id,
 	})
 	if err != nil {
-		if st, ok := status.FromError(errors.Cause(err)); ok && (st.Code() == codes.Unimplemented || st.Code() == codes.NotFound) {
+		if code := grpcerrors.Code(err); code == codes.Unimplemented || code == codes.NotFound {
 			return nil, errors.Wrapf(ErrNotFound, "secret %s not found", id)
 		}
-		return nil, errors.WithStack(err)
+		return nil, err
 	}
 	return resp.Data, nil
 }

vendor/github.com/moby/buildkit/session/secrets/secretsprovider/file.go

@@ -1,54 +0,0 @@
-package secretsprovider
-
-import (
-	"context"
-	"io/ioutil"
-	"os"
-
-	"github.com/moby/buildkit/session/secrets"
-	"github.com/pkg/errors"
-)
-
-type FileSource struct {
-	ID       string
-	FilePath string
-}
-
-func NewFileStore(files []FileSource) (secrets.SecretStore, error) {
-	m := map[string]FileSource{}
-	for _, f := range files {
-		if f.ID == "" {
-			return nil, errors.Errorf("secret missing ID")
-		}
-		if f.FilePath == "" {
-			f.FilePath = f.ID
-		}
-		fi, err := os.Stat(f.FilePath)
-		if err != nil {
-			return nil, errors.Wrapf(err, "failed to stat %s", f.FilePath)
-		}
-		if fi.Size() > MaxSecretSize {
-			return nil, errors.Errorf("secret %s too big. max size 500KB", f.ID)
-		}
-		m[f.ID] = f
-	}
-	return &fileStore{
-		m: m,
-	}, nil
-}
-
-type fileStore struct {
-	m map[string]FileSource
-}
-
-func (fs *fileStore) GetSecret(ctx context.Context, id string) ([]byte, error) {
-	v, ok := fs.m[id]
-	if !ok {
-		return nil, errors.WithStack(secrets.ErrNotFound)
-	}
-	dt, err := ioutil.ReadFile(v.FilePath)
-	if err != nil {
-		return nil, err
-	}
-	return dt, nil
-}

vendor/github.com/moby/buildkit/session/secrets/secretsprovider/secretsprovider.go

@@ -31,7 +31,7 @@ func (sp *secretProvider) Register(server *grpc.Server) {
 func (sp *secretProvider) GetSecret(ctx context.Context, req *secrets.GetSecretRequest) (*secrets.GetSecretResponse, error) {
 	dt, err := sp.store.GetSecret(ctx, req.ID)
 	if err != nil {
-		if errors.Cause(err) == secrets.ErrNotFound {
+		if errors.Is(err, secrets.ErrNotFound) {
 			return nil, status.Errorf(codes.NotFound, err.Error())
 		}
 		return nil, err

vendor/github.com/moby/buildkit/session/secrets/secretsprovider/store.go

@@ -0,0 +1,65 @@
+package secretsprovider
+
+import (
+	"context"
+	"io/ioutil"
+	"os"
+
+	"github.com/moby/buildkit/session/secrets"
+	"github.com/pkg/errors"
+	"github.com/tonistiigi/units"
+)
+
+type Source struct {
+	ID       string
+	FilePath string
+	Env      string
+}
+
+func NewStore(files []Source) (secrets.SecretStore, error) {
+	m := map[string]Source{}
+	for _, f := range files {
+		if f.ID == "" {
+			return nil, errors.Errorf("secret missing ID")
+		}
+		if f.Env == "" && f.FilePath == "" {
+			if _, ok := os.LookupEnv(f.ID); ok {
+				f.Env = f.ID
+			} else {
+				f.FilePath = f.ID
+			}
+		}
+		if f.FilePath != "" {
+			fi, err := os.Stat(f.FilePath)
+			if err != nil {
+				return nil, errors.Wrapf(err, "failed to stat %s", f.FilePath)
+			}
+			if fi.Size() > MaxSecretSize {
+				return nil, errors.Errorf("secret %s too big. max size %#.f", f.ID, MaxSecretSize*units.B)
+			}
+		}
+		m[f.ID] = f
+	}
+	return &fileStore{
+		m: m,
+	}, nil
+}
+
+type fileStore struct {
+	m map[string]Source
+}
+
+func (fs *fileStore) GetSecret(ctx context.Context, id string) ([]byte, error) {
+	v, ok := fs.m[id]
+	if !ok {
+		return nil, errors.WithStack(secrets.ErrNotFound)
+	}
+	if v.Env != "" {
+		return []byte(os.Getenv(v.Env)), nil
+	}
+	dt, err := ioutil.ReadFile(v.FilePath)
+	if err != nil {
+		return nil, err
+	}
+	return dt, nil
+}