mirror of
				https://gitea.com/Lydanne/buildx.git
				synced 2025-11-04 01:53:42 +08:00 
			
		
		
		
	protobuf: remove gogoproto
Removes gogo/protobuf from buildx and updates to a version of moby/buildkit where gogo is removed. This also changes how the proto files are generated. This is because newer versions of protobuf are more strict about name conflicts. If two files have the same name (even if they are relative paths) and are used in different protoc commands, they'll conflict in the registry. Since protobuf file generation doesn't work very well with `paths=source_relative`, this removes the `go:generate` expression and just relies on the dockerfile to perform the generation. Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
This commit is contained in:
		
							
								
								
									
										13
									
								
								vendor/golang.org/x/oauth2/internal/client_appengine.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										13
									
								
								vendor/golang.org/x/oauth2/internal/client_appengine.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -1,13 +0,0 @@
 | 
			
		||||
// Copyright 2018 The Go Authors. All rights reserved.
 | 
			
		||||
// Use of this source code is governed by a BSD-style
 | 
			
		||||
// license that can be found in the LICENSE file.
 | 
			
		||||
 | 
			
		||||
//go:build appengine
 | 
			
		||||
 | 
			
		||||
package internal
 | 
			
		||||
 | 
			
		||||
import "google.golang.org/appengine/urlfetch"
 | 
			
		||||
 | 
			
		||||
func init() {
 | 
			
		||||
	appengineClientHook = urlfetch.Client
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										5
									
								
								vendor/golang.org/x/oauth2/internal/transport.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								vendor/golang.org/x/oauth2/internal/transport.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -18,16 +18,11 @@ var HTTPClient ContextKey
 | 
			
		||||
// because nobody else can create a ContextKey, being unexported.
 | 
			
		||||
type ContextKey struct{}
 | 
			
		||||
 | 
			
		||||
var appengineClientHook func(context.Context) *http.Client
 | 
			
		||||
 | 
			
		||||
func ContextClient(ctx context.Context) *http.Client {
 | 
			
		||||
	if ctx != nil {
 | 
			
		||||
		if hc, ok := ctx.Value(HTTPClient).(*http.Client); ok {
 | 
			
		||||
			return hc
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	if appengineClientHook != nil {
 | 
			
		||||
		return appengineClientHook(ctx)
 | 
			
		||||
	}
 | 
			
		||||
	return http.DefaultClient
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								vendor/golang.org/x/oauth2/oauth2.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/golang.org/x/oauth2/oauth2.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -393,7 +393,7 @@ func ReuseTokenSource(t *Token, src TokenSource) TokenSource {
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// ReuseTokenSource returns a TokenSource that acts in the same manner as the
 | 
			
		||||
// ReuseTokenSourceWithExpiry returns a TokenSource that acts in the same manner as the
 | 
			
		||||
// TokenSource returned by ReuseTokenSource, except the expiry buffer is
 | 
			
		||||
// configurable. The expiration time of a token is calculated as
 | 
			
		||||
// t.Expiry.Add(-earlyExpiry).
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user