vendor: update buildkit to master@31c870e82a48

Signed-off-by: Justin Chadwell <me@jedevc.com>

vendor/github.com/moby/buildkit/util/attestation/types.go

@@ -1,11 +0,0 @@
-package attestation
-
-const (
-	MediaTypeDockerSchema2AttestationType = "application/vnd.in-toto+json"
-
-	DockerAnnotationReferenceType        = "vnd.docker.reference.type"
-	DockerAnnotationReferenceDigest      = "vnd.docker.reference.digest"
-	DockerAnnotationReferenceDescription = "vnd.docker.reference.description"
-
-	DockerAnnotationReferenceTypeDefault = "attestation-manifest"
-)

vendor/github.com/moby/buildkit/util/bklog/log.go

@@ -2,6 +2,7 @@ package bklog
 
 import (
 	"context"
+	"runtime/debug"
 
 	"github.com/containerd/containerd/log"
 	"github.com/sirupsen/logrus"
@@ -61,3 +62,11 @@ func GetLogger(ctx context.Context) (l *logrus.Entry) {
 
 	return l
 }
+
+// LazyStackTrace lets you include a stack trace as a field's value in a log but only
+// call it when the log level is actually enabled.
+type LazyStackTrace struct{}
+
+func (LazyStackTrace) String() string {
+	return string(debug.Stack())
+}

vendor/github.com/moby/buildkit/util/contentutil/copy.go

@@ -15,6 +15,7 @@ import (
 )
 
 func Copy(ctx context.Context, ingester content.Ingester, provider content.Provider, desc ocispecs.Descriptor, ref string, logger func([]byte)) error {
+	ctx = RegisterContentPayloadTypes(ctx)
 	if _, err := retryhandler.New(limited.FetchHandler(ingester, &localFetcher{provider}, ref), logger)(ctx, desc); err != nil {
 		return err
 	}
@@ -60,6 +61,7 @@ func (r *rc) Seek(offset int64, whence int) (int64, error) {
 }
 
 func CopyChain(ctx context.Context, ingester content.Ingester, provider content.Provider, desc ocispecs.Descriptor) error {
+	ctx = RegisterContentPayloadTypes(ctx)
 	var m sync.Mutex
 	manifestStack := []ocispecs.Descriptor{}
 

vendor/github.com/moby/buildkit/util/contentutil/types.go

@@ -0,0 +1,15 @@
+package contentutil
+
+import (
+	"context"
+
+	"github.com/containerd/containerd/remotes"
+	intoto "github.com/in-toto/in-toto-golang/in_toto"
+)
+
+// RegisterContentPayloadTypes registers content types that are not defined by
+// default but that we expect to find in registry images.
+func RegisterContentPayloadTypes(ctx context.Context) context.Context {
+	ctx = remotes.WithMediaTypeKeyPrefix(ctx, intoto.PayloadType, "intoto")
+	return ctx
+}

vendor/github.com/moby/buildkit/util/imageutil/config.go

@@ -13,7 +13,7 @@ import (
 	"github.com/containerd/containerd/reference"
 	"github.com/containerd/containerd/remotes"
 	"github.com/containerd/containerd/remotes/docker"
-	"github.com/moby/buildkit/util/attestation"
+	intoto "github.com/in-toto/in-toto-golang/in_toto"
 	"github.com/moby/buildkit/util/contentutil"
 	"github.com/moby/buildkit/util/leaseutil"
 	"github.com/moby/buildkit/util/resolver/limited"
@@ -174,7 +174,7 @@ func childrenConfigHandler(provider content.Provider, platform platforms.MatchCo
 				descs = append(descs, index.Manifests...)
 			}
 		case images.MediaTypeDockerSchema2Config, ocispecs.MediaTypeImageConfig, docker.LegacyConfigMediaType,
-			attestation.MediaTypeDockerSchema2AttestationType:
+			intoto.PayloadType:
 			// childless data types.
 			return nil, nil
 		default:

vendor/github.com/moby/buildkit/util/progress/progressui/display.go

@@ -582,7 +582,7 @@ func (t *trace) update(s *client.SolveStatus, termWidth int) {
 				} else if sec < 100 {
 					prec = 2
 				}
-				v.logs = append(v.logs, []byte(fmt.Sprintf("#%d %s %s", v.index, fmt.Sprintf("%.[2]*[1]f", sec, prec), dt)))
+				v.logs = append(v.logs, []byte(fmt.Sprintf("%s %s", fmt.Sprintf("%.[2]*[1]f", sec, prec), dt)))
 			}
 			i++
 		})

vendor/github.com/moby/buildkit/util/progress/progressui/printer.go

@@ -146,7 +146,7 @@ func (p *textMux) printVtx(t *trace, dgst digest.Digest) {
 		if i == 0 {
 			l = l[v.logsOffset:]
 		}
-		fmt.Fprintf(p.w, "%s", []byte(l))
+		fmt.Fprintf(p.w, "#%d %s", v.index, []byte(l))
 		if i != len(v.logs)-1 || !v.logsPartial {
 			fmt.Fprintln(p.w, "")
 		}

vendor/github.com/moby/buildkit/util/stack/stack.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
+// 	protoc-gen-go v1.30.0
 // 	protoc        v3.11.4
 // source: stack.proto