mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-30 20:22:25 -05:00 
			
		
		
		
	[chore]: Bump github.com/coreos/go-oidc/v3 from 3.6.0 to 3.7.0 (#2284)
Bumps [github.com/coreos/go-oidc/v3](https://github.com/coreos/go-oidc) from 3.6.0 to 3.7.0. - [Release notes](https://github.com/coreos/go-oidc/releases) - [Commits](https://github.com/coreos/go-oidc/compare/v3.6.0...v3.7.0) --- updated-dependencies: - dependency-name: github.com/coreos/go-oidc/v3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
		
					parent
					
						
							
								9114c5ca1b
							
						
					
				
			
			
				commit
				
					
						3dcc94940d
					
				
			
		
					 97 changed files with 272 additions and 8585 deletions
				
			
		
							
								
								
									
										50
									
								
								vendor/google.golang.org/appengine/internal/api_common.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										50
									
								
								vendor/google.golang.org/appengine/internal/api_common.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -5,20 +5,26 @@ | |||
| package internal | ||||
| 
 | ||||
| import ( | ||||
| 	"context" | ||||
| 	"errors" | ||||
| 	"os" | ||||
| 
 | ||||
| 	"github.com/golang/protobuf/proto" | ||||
| 	netcontext "golang.org/x/net/context" | ||||
| ) | ||||
| 
 | ||||
| type ctxKey string | ||||
| 
 | ||||
| func (c ctxKey) String() string { | ||||
| 	return "appengine context key: " + string(c) | ||||
| } | ||||
| 
 | ||||
| var errNotAppEngineContext = errors.New("not an App Engine context") | ||||
| 
 | ||||
| type CallOverrideFunc func(ctx netcontext.Context, service, method string, in, out proto.Message) error | ||||
| type CallOverrideFunc func(ctx context.Context, service, method string, in, out proto.Message) error | ||||
| 
 | ||||
| var callOverrideKey = "holds []CallOverrideFunc" | ||||
| 
 | ||||
| func WithCallOverride(ctx netcontext.Context, f CallOverrideFunc) netcontext.Context { | ||||
| func WithCallOverride(ctx context.Context, f CallOverrideFunc) context.Context { | ||||
| 	// We avoid appending to any existing call override | ||||
| 	// so we don't risk overwriting a popped stack below. | ||||
| 	var cofs []CallOverrideFunc | ||||
|  | @ -26,10 +32,10 @@ func WithCallOverride(ctx netcontext.Context, f CallOverrideFunc) netcontext.Con | |||
| 		cofs = append(cofs, uf...) | ||||
| 	} | ||||
| 	cofs = append(cofs, f) | ||||
| 	return netcontext.WithValue(ctx, &callOverrideKey, cofs) | ||||
| 	return context.WithValue(ctx, &callOverrideKey, cofs) | ||||
| } | ||||
| 
 | ||||
| func callOverrideFromContext(ctx netcontext.Context) (CallOverrideFunc, netcontext.Context, bool) { | ||||
| func callOverrideFromContext(ctx context.Context) (CallOverrideFunc, context.Context, bool) { | ||||
| 	cofs, _ := ctx.Value(&callOverrideKey).([]CallOverrideFunc) | ||||
| 	if len(cofs) == 0 { | ||||
| 		return nil, nil, false | ||||
|  | @ -37,7 +43,7 @@ func callOverrideFromContext(ctx netcontext.Context) (CallOverrideFunc, netconte | |||
| 	// We found a list of overrides; grab the last, and reconstitute a | ||||
| 	// context that will hide it. | ||||
| 	f := cofs[len(cofs)-1] | ||||
| 	ctx = netcontext.WithValue(ctx, &callOverrideKey, cofs[:len(cofs)-1]) | ||||
| 	ctx = context.WithValue(ctx, &callOverrideKey, cofs[:len(cofs)-1]) | ||||
| 	return f, ctx, true | ||||
| } | ||||
| 
 | ||||
|  | @ -45,23 +51,35 @@ type logOverrideFunc func(level int64, format string, args ...interface{}) | |||
| 
 | ||||
| var logOverrideKey = "holds a logOverrideFunc" | ||||
| 
 | ||||
| func WithLogOverride(ctx netcontext.Context, f logOverrideFunc) netcontext.Context { | ||||
| 	return netcontext.WithValue(ctx, &logOverrideKey, f) | ||||
| func WithLogOverride(ctx context.Context, f logOverrideFunc) context.Context { | ||||
| 	return context.WithValue(ctx, &logOverrideKey, f) | ||||
| } | ||||
| 
 | ||||
| var appIDOverrideKey = "holds a string, being the full app ID" | ||||
| 
 | ||||
| func WithAppIDOverride(ctx netcontext.Context, appID string) netcontext.Context { | ||||
| 	return netcontext.WithValue(ctx, &appIDOverrideKey, appID) | ||||
| func WithAppIDOverride(ctx context.Context, appID string) context.Context { | ||||
| 	return context.WithValue(ctx, &appIDOverrideKey, appID) | ||||
| } | ||||
| 
 | ||||
| var apiHostOverrideKey = ctxKey("holds a string, being the alternate API_HOST") | ||||
| 
 | ||||
| func withAPIHostOverride(ctx context.Context, apiHost string) context.Context { | ||||
| 	return context.WithValue(ctx, apiHostOverrideKey, apiHost) | ||||
| } | ||||
| 
 | ||||
| var apiPortOverrideKey = ctxKey("holds a string, being the alternate API_PORT") | ||||
| 
 | ||||
| func withAPIPortOverride(ctx context.Context, apiPort string) context.Context { | ||||
| 	return context.WithValue(ctx, apiPortOverrideKey, apiPort) | ||||
| } | ||||
| 
 | ||||
| var namespaceKey = "holds the namespace string" | ||||
| 
 | ||||
| func withNamespace(ctx netcontext.Context, ns string) netcontext.Context { | ||||
| 	return netcontext.WithValue(ctx, &namespaceKey, ns) | ||||
| func withNamespace(ctx context.Context, ns string) context.Context { | ||||
| 	return context.WithValue(ctx, &namespaceKey, ns) | ||||
| } | ||||
| 
 | ||||
| func NamespaceFromContext(ctx netcontext.Context) string { | ||||
| func NamespaceFromContext(ctx context.Context) string { | ||||
| 	// If there's no namespace, return the empty string. | ||||
| 	ns, _ := ctx.Value(&namespaceKey).(string) | ||||
| 	return ns | ||||
|  | @ -70,14 +88,14 @@ func NamespaceFromContext(ctx netcontext.Context) string { | |||
| // FullyQualifiedAppID returns the fully-qualified application ID. | ||||
| // This may contain a partition prefix (e.g. "s~" for High Replication apps), | ||||
| // or a domain prefix (e.g. "example.com:"). | ||||
| func FullyQualifiedAppID(ctx netcontext.Context) string { | ||||
| func FullyQualifiedAppID(ctx context.Context) string { | ||||
| 	if id, ok := ctx.Value(&appIDOverrideKey).(string); ok { | ||||
| 		return id | ||||
| 	} | ||||
| 	return fullyQualifiedAppID(ctx) | ||||
| } | ||||
| 
 | ||||
| func Logf(ctx netcontext.Context, level int64, format string, args ...interface{}) { | ||||
| func Logf(ctx context.Context, level int64, format string, args ...interface{}) { | ||||
| 	if f, ok := ctx.Value(&logOverrideKey).(logOverrideFunc); ok { | ||||
| 		f(level, format, args...) | ||||
| 		return | ||||
|  | @ -90,7 +108,7 @@ func Logf(ctx netcontext.Context, level int64, format string, args ...interface{ | |||
| } | ||||
| 
 | ||||
| // NamespacedContext wraps a Context to support namespaces. | ||||
| func NamespacedContext(ctx netcontext.Context, namespace string) netcontext.Context { | ||||
| func NamespacedContext(ctx context.Context, namespace string) context.Context { | ||||
| 	return withNamespace(ctx, namespace) | ||||
| } | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue