vendor: github.com/moby/buildkit v0.21.0-rc1

Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>

vendor/github.com/moby/buildkit/session/auth/authprovider/authprovider.go

@@ -45,7 +45,7 @@ type DockerAuthProviderConfig struct {
 	TLSConfigs map[string]*AuthTLSConfig
 	// ExpireCachedAuth is a function that returns true auth config should be refreshed
 	// instead of using a pre-cached result.
-	// If nil then the cached result will expire after 10 minutes.
+	// If nil then the cached result will expire after 4 minutes and 50 seconds.
 	// The function is called with the time the cached auth config was created
 	// and the server URL the auth config is for.
 	ExpireCachedAuth func(created time.Time, serverURL string) bool
@@ -59,7 +59,8 @@ type authConfigCacheEntry struct {
 func NewDockerAuthProvider(cfg DockerAuthProviderConfig) session.Attachable {
 	if cfg.ExpireCachedAuth == nil {
 		cfg.ExpireCachedAuth = func(created time.Time, _ string) bool {
-			return time.Since(created) > 10*time.Minute
+			// Tokens for Google Artifact Registry via Workload Identity expire after 5 minutes.
+			return time.Since(created) > 4*time.Minute+50*time.Second
 		}
 	}
 	return &authProvider{

vendor/github.com/moby/buildkit/session/filesync/diffcopy.go

@@ -17,8 +17,8 @@ import (
 
 type Stream interface {
 	Context() context.Context
-	SendMsg(m interface{}) error
-	RecvMsg(m interface{}) error
+	SendMsg(m any) error
+	RecvMsg(m any) error
 }
 
 func newStreamWriter(stream grpc.ClientStream) io.WriteCloser {

vendor/github.com/moby/buildkit/session/grpchijack/dial.go

@@ -32,8 +32,8 @@ func Dialer(api controlapi.ControlClient) session.Dialer {
 
 type stream interface {
 	Context() context.Context
-	SendMsg(m interface{}) error
-	RecvMsg(m interface{}) error
+	SendMsg(m any) error
+	RecvMsg(m any) error
 }
 
 func streamToConn(stream stream) (net.Conn, <-chan struct{}) {

vendor/github.com/moby/buildkit/session/sshforward/copy.go

@@ -9,8 +9,8 @@ import (
 )
 
 type Stream interface {
-	SendMsg(m interface{}) error
-	RecvMsg(m interface{}) error
+	SendMsg(m any) error
+	RecvMsg(m any) error
 }
 
 func Copy(ctx context.Context, conn io.ReadWriteCloser, stream Stream, closeStream func() error) error {

vendor/github.com/moby/buildkit/session/upload/uploadprovider/provider.go

@@ -63,23 +63,20 @@ type writer struct {
 	grpc.ServerStream
 }
 
-func (w *writer) Write(dt []byte) (int, error) {
-	// avoid sending too big messages on grpc stream
+func (w *writer) Write(dt []byte) (n int, err error) {
 	const maxChunkSize = 3 * 1024 * 1024
-	if len(dt) > maxChunkSize {
-		n1, err := w.Write(dt[:maxChunkSize])
-		if err != nil {
-			return n1, err
+	for len(dt) > 0 {
+		data := dt
+		if len(data) > maxChunkSize {
+			data = data[:maxChunkSize]
 		}
-		dt = dt[maxChunkSize:]
-		var n2 int
-		if n2, err := w.Write(dt); err != nil {
-			return n1 + n2, err
+
+		msg := &upload.BytesMessage{Data: data}
+		if err := w.SendMsg(msg); err != nil {
+			return n, err
 		}
-		return n1 + n2, nil
+		n += len(data)
+		dt = dt[len(data):]
 	}
-	if err := w.SendMsg(&upload.BytesMessage{Data: dt}); err != nil {
-		return 0, err
-	}
-	return len(dt), nil
+	return n, nil
 }