mirror of
				https://github.com/k3s-io/kubernetes.git
				synced 2025-10-29 21:01:02 +00:00 
			
		
		
		
	Update golang.org/x/net/... dependencies to release-branch.go1.11
- latest grpc-ecosystem/go-grpc-middleware Change-Id: Ida7d01e4606f6e0313e1355db6e85be0c0ef1dd1
This commit is contained in:
		
				
					committed by
					
						 Davanum Srinivas
						Davanum Srinivas
					
				
			
			
				
	
			
			
			
						parent
						
							9cbccd3859
						
					
				
				
					commit
					317ecf58cc
				
			
							
								
								
									
										3
									
								
								vendor/github.com/grpc-ecosystem/go-grpc-middleware/.travis.yml
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								vendor/github.com/grpc-ecosystem/go-grpc-middleware/.travis.yml
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,7 +1,7 @@ | ||||
| sudo: false | ||||
| language: go | ||||
| go: | ||||
|   - 1.8.x | ||||
|   - 1.11.x | ||||
| env: | ||||
|   - DEP_VERSION="0.3.2" | ||||
|  | ||||
| @@ -15,7 +15,6 @@ install: | ||||
|   - dep ensure | ||||
|  | ||||
| script: | ||||
|  - make checkdocs | ||||
|  - make test | ||||
|   | ||||
| after_success: | ||||
|   | ||||
							
								
								
									
										166
									
								
								vendor/github.com/grpc-ecosystem/go-grpc-middleware/DOC.md
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										166
									
								
								vendor/github.com/grpc-ecosystem/go-grpc-middleware/DOC.md
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,166 +0,0 @@ | ||||
| # grpc_middleware | ||||
| `import "github.com/grpc-ecosystem/go-grpc-middleware"` | ||||
|  | ||||
| * [Overview](#pkg-overview) | ||||
| * [Imported Packages](#pkg-imports) | ||||
| * [Index](#pkg-index) | ||||
|  | ||||
| ## <a name="pkg-overview">Overview</a> | ||||
| `grpc_middleware` is a collection of gRPC middleware packages: interceptors, helpers and tools. | ||||
|  | ||||
| ### Middleware | ||||
| gRPC is a fantastic RPC middleware, which sees a lot of adoption in the Golang world. However, the | ||||
| upstream gRPC codebase is relatively bare bones. | ||||
|  | ||||
| This package, and most of its child packages provides commonly needed middleware for gRPC: | ||||
| client-side interceptors for retires, server-side interceptors for input validation and auth, | ||||
| functions for chaining said interceptors, metadata convenience methods and more. | ||||
|  | ||||
| ### Chaining | ||||
| By default, gRPC doesn't allow one to have more than one interceptor either on the client nor on | ||||
| the server side. `grpc_middleware` provides convenient chaining methods | ||||
|  | ||||
| Simple way of turning a multiple interceptors into a single interceptor. Here's an example for | ||||
| server chaining: | ||||
|  | ||||
| 	myServer := grpc.NewServer( | ||||
| 	    grpc.StreamInterceptor(grpc_middleware.ChainStreamServer(loggingStream, monitoringStream, authStream)), | ||||
| 	    grpc.UnaryInterceptor(grpc_middleware.ChainUnaryServer(loggingUnary, monitoringUnary, authUnary), | ||||
| 	) | ||||
|  | ||||
| These interceptors will be executed from left to right: logging, monitoring and auth. | ||||
|  | ||||
| Here's an example for client side chaining: | ||||
|  | ||||
| 	clientConn, err = grpc.Dial( | ||||
| 	    address, | ||||
| 	        grpc.WithUnaryInterceptor(grpc_middleware.ChainUnaryClient(monitoringClientUnary, retryUnary)), | ||||
| 	        grpc.WithStreamInterceptor(grpc_middleware.ChainStreamClient(monitoringClientStream, retryStream)), | ||||
| 	) | ||||
| 	client = pb_testproto.NewTestServiceClient(clientConn) | ||||
| 	resp, err := client.PingEmpty(s.ctx, &myservice.Request{Msg: "hello"}) | ||||
|  | ||||
| These interceptors will be executed from left to right: monitoring and then retry logic. | ||||
|  | ||||
| The retry interceptor will call every interceptor that follows it whenever when a retry happens. | ||||
|  | ||||
| ### Writing Your Own | ||||
| Implementing your own interceptor is pretty trivial: there are interfaces for that. But the interesting | ||||
| bit exposing common data to handlers (and other middleware), similarly to HTTP Middleware design. | ||||
| For example, you may want to pass the identity of the caller from the auth interceptor all the way | ||||
| to the handling function. | ||||
|  | ||||
| For example, a client side interceptor example for auth looks like: | ||||
|  | ||||
| 	func FakeAuthUnaryInterceptor(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) { | ||||
| 	   newCtx := context.WithValue(ctx, "user_id", "john@example.com") | ||||
| 	   return handler(newCtx, req) | ||||
| 	} | ||||
|  | ||||
| Unfortunately, it's not as easy for streaming RPCs. These have the `context.Context` embedded within | ||||
| the `grpc.ServerStream` object. To pass values through context, a wrapper (`WrappedServerStream`) is | ||||
| needed. For example: | ||||
|  | ||||
| 	func FakeAuthStreamingInterceptor(srv interface{}, stream grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error { | ||||
| 	   newStream := grpc_middleware.WrapServerStream(stream) | ||||
| 	   newStream.WrappedContext = context.WithValue(ctx, "user_id", "john@example.com") | ||||
| 	   return handler(srv, stream) | ||||
| 	} | ||||
|  | ||||
| ## <a name="pkg-imports">Imported Packages</a> | ||||
|  | ||||
| - [golang.org/x/net/context](https://godoc.org/golang.org/x/net/context) | ||||
| - [google.golang.org/grpc](https://godoc.org/google.golang.org/grpc) | ||||
|  | ||||
| ## <a name="pkg-index">Index</a> | ||||
| * [func ChainStreamClient(interceptors ...grpc.StreamClientInterceptor) grpc.StreamClientInterceptor](#ChainStreamClient) | ||||
| * [func ChainStreamServer(interceptors ...grpc.StreamServerInterceptor) grpc.StreamServerInterceptor](#ChainStreamServer) | ||||
| * [func ChainUnaryClient(interceptors ...grpc.UnaryClientInterceptor) grpc.UnaryClientInterceptor](#ChainUnaryClient) | ||||
| * [func ChainUnaryServer(interceptors ...grpc.UnaryServerInterceptor) grpc.UnaryServerInterceptor](#ChainUnaryServer) | ||||
| * [func WithStreamServerChain(interceptors ...grpc.StreamServerInterceptor) grpc.ServerOption](#WithStreamServerChain) | ||||
| * [func WithUnaryServerChain(interceptors ...grpc.UnaryServerInterceptor) grpc.ServerOption](#WithUnaryServerChain) | ||||
| * [type WrappedServerStream](#WrappedServerStream) | ||||
|   * [func WrapServerStream(stream grpc.ServerStream) \*WrappedServerStream](#WrapServerStream) | ||||
|   * [func (w \*WrappedServerStream) Context() context.Context](#WrappedServerStream.Context) | ||||
|  | ||||
| #### <a name="pkg-files">Package files</a> | ||||
| [chain.go](./chain.go) [doc.go](./doc.go) [wrappers.go](./wrappers.go)  | ||||
|  | ||||
| ## <a name="ChainStreamClient">func</a> [ChainStreamClient](./chain.go#L136) | ||||
| ``` go | ||||
| func ChainStreamClient(interceptors ...grpc.StreamClientInterceptor) grpc.StreamClientInterceptor | ||||
| ``` | ||||
| ChainStreamClient creates a single interceptor out of a chain of many interceptors. | ||||
|  | ||||
| Execution is done in left-to-right order, including passing of context. | ||||
| For example ChainStreamClient(one, two, three) will execute one before two before three. | ||||
|  | ||||
| ## <a name="ChainStreamServer">func</a> [ChainStreamServer](./chain.go#L58) | ||||
| ``` go | ||||
| func ChainStreamServer(interceptors ...grpc.StreamServerInterceptor) grpc.StreamServerInterceptor | ||||
| ``` | ||||
| ChainStreamServer creates a single interceptor out of a chain of many interceptors. | ||||
|  | ||||
| Execution is done in left-to-right order, including passing of context. | ||||
| For example ChainUnaryServer(one, two, three) will execute one before two before three. | ||||
| If you want to pass context between interceptors, use WrapServerStream. | ||||
|  | ||||
| ## <a name="ChainUnaryClient">func</a> [ChainUnaryClient](./chain.go#L97) | ||||
| ``` go | ||||
| func ChainUnaryClient(interceptors ...grpc.UnaryClientInterceptor) grpc.UnaryClientInterceptor | ||||
| ``` | ||||
| ChainUnaryClient creates a single interceptor out of a chain of many interceptors. | ||||
|  | ||||
| Execution is done in left-to-right order, including passing of context. | ||||
| For example ChainUnaryClient(one, two, three) will execute one before two before three. | ||||
|  | ||||
| ## <a name="ChainUnaryServer">func</a> [ChainUnaryServer](./chain.go#L18) | ||||
| ``` go | ||||
| func ChainUnaryServer(interceptors ...grpc.UnaryServerInterceptor) grpc.UnaryServerInterceptor | ||||
| ``` | ||||
| ChainUnaryServer creates a single interceptor out of a chain of many interceptors. | ||||
|  | ||||
| Execution is done in left-to-right order, including passing of context. | ||||
| For example ChainUnaryServer(one, two, three) will execute one before two before three, and three | ||||
| will see context changes of one and two. | ||||
|  | ||||
| ## <a name="WithStreamServerChain">func</a> [WithStreamServerChain](./chain.go#L181) | ||||
| ``` go | ||||
| func WithStreamServerChain(interceptors ...grpc.StreamServerInterceptor) grpc.ServerOption | ||||
| ``` | ||||
| WithStreamServerChain is a grpc.Server config option that accepts multiple stream interceptors. | ||||
| Basically syntactic sugar. | ||||
|  | ||||
| ## <a name="WithUnaryServerChain">func</a> [WithUnaryServerChain](./chain.go#L175) | ||||
| ``` go | ||||
| func WithUnaryServerChain(interceptors ...grpc.UnaryServerInterceptor) grpc.ServerOption | ||||
| ``` | ||||
| Chain creates a single interceptor out of a chain of many interceptors. | ||||
|  | ||||
| WithUnaryServerChain is a grpc.Server config option that accepts multiple unary interceptors. | ||||
| Basically syntactic sugar. | ||||
|  | ||||
| ## <a name="WrappedServerStream">type</a> [WrappedServerStream](./wrappers.go#L12-L16) | ||||
| ``` go | ||||
| type WrappedServerStream struct { | ||||
|     grpc.ServerStream | ||||
|     // WrappedContext is the wrapper's own Context. You can assign it. | ||||
|     WrappedContext context.Context | ||||
| } | ||||
| ``` | ||||
| WrappedServerStream is a thin wrapper around grpc.ServerStream that allows modifying context. | ||||
|  | ||||
| ### <a name="WrapServerStream">func</a> [WrapServerStream](./wrappers.go#L24) | ||||
| ``` go | ||||
| func WrapServerStream(stream grpc.ServerStream) *WrappedServerStream | ||||
| ``` | ||||
| WrapServerStream returns a ServerStream that has the ability to overwrite context. | ||||
|  | ||||
| ### <a name="WrappedServerStream.Context">func</a> (\*WrappedServerStream) [Context](./wrappers.go#L19) | ||||
| ``` go | ||||
| func (w *WrappedServerStream) Context() context.Context | ||||
| ``` | ||||
| Context returns the wrapper's WrappedContext, overwriting the nested grpc.ServerStream.Context() | ||||
|  | ||||
| - - - | ||||
| Generated by [godoc2ghmd](https://github.com/GandalfUK/godoc2ghmd) | ||||
							
								
								
									
										58
									
								
								vendor/github.com/grpc-ecosystem/go-grpc-middleware/Gopkg.lock
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										58
									
								
								vendor/github.com/grpc-ecosystem/go-grpc-middleware/Gopkg.lock
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -4,14 +4,14 @@ | ||||
| [[projects]] | ||||
|   name = "cloud.google.com/go" | ||||
|   packages = ["compute/metadata"] | ||||
|   revision = "2d3a6656c17a60b0815b7e06ab0be04eacb6e613" | ||||
|   version = "v0.16.0" | ||||
|   revision = "28a4bc8c44b3acbcc482cff0cdf7de29a4688b61" | ||||
|   version = "v0.35.1" | ||||
|  | ||||
| [[projects]] | ||||
|   name = "github.com/davecgh/go-spew" | ||||
|   packages = ["spew"] | ||||
|   revision = "346938d642f2ec3594ed81d874461961cd0faa76" | ||||
|   version = "v1.1.0" | ||||
|   revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73" | ||||
|   version = "v1.1.1" | ||||
|  | ||||
| [[projects]] | ||||
|   name = "github.com/gogo/protobuf" | ||||
| @@ -23,7 +23,13 @@ | ||||
|   branch = "master" | ||||
|   name = "github.com/golang/protobuf" | ||||
|   packages = ["jsonpb","proto","ptypes","ptypes/any","ptypes/duration","ptypes/struct","ptypes/timestamp"] | ||||
|   revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845" | ||||
|   revision = "347cf4a86c1cb8d262994d8ef5924d4576c5b331" | ||||
|  | ||||
| [[projects]] | ||||
|   name = "github.com/konsorten/go-windows-terminal-sequences" | ||||
|   packages = ["."] | ||||
|   revision = "5c8c8bd35d3832f5d134ae1e1e375b69a4d25242" | ||||
|   version = "v1.0.1" | ||||
|  | ||||
| [[projects]] | ||||
|   name = "github.com/opentracing/opentracing-go" | ||||
| @@ -40,20 +46,20 @@ | ||||
| [[projects]] | ||||
|   name = "github.com/sirupsen/logrus" | ||||
|   packages = ["."] | ||||
|   revision = "f006c2ac4710855cf0f916dd6b77acf6b048dc6e" | ||||
|   version = "v1.0.3" | ||||
|   revision = "e1e72e9de974bd926e5c56f83753fba2df402ce5" | ||||
|   version = "v1.3.0" | ||||
|  | ||||
| [[projects]] | ||||
|   name = "github.com/stretchr/testify" | ||||
|   packages = ["assert","require","suite"] | ||||
|   revision = "69483b4bd14f5845b5a1e55bca19e954e827f1d0" | ||||
|   version = "v1.1.4" | ||||
|   revision = "ffdc059bfe9ce6a4e144ba849dbedead332c6053" | ||||
|   version = "v1.3.0" | ||||
|  | ||||
| [[projects]] | ||||
|   name = "go.uber.org/atomic" | ||||
|   packages = ["."] | ||||
|   revision = "8474b86a5a6f79c443ce4b2992817ff32cf208b8" | ||||
|   version = "v1.3.1" | ||||
|   revision = "1ea20fb1cbb1cc08cbd0d913a96dead89aa18289" | ||||
|   version = "v1.3.2" | ||||
|  | ||||
| [[projects]] | ||||
|   name = "go.uber.org/multierr" | ||||
| @@ -64,56 +70,56 @@ | ||||
| [[projects]] | ||||
|   name = "go.uber.org/zap" | ||||
|   packages = [".","buffer","internal/bufferpool","internal/color","internal/exit","zapcore"] | ||||
|   revision = "35aad584952c3e7020db7b839f6b102de6271f89" | ||||
|   version = "v1.7.1" | ||||
|   revision = "ff33455a0e382e8a81d14dd7c922020b6b5e7982" | ||||
|   version = "v1.9.1" | ||||
|  | ||||
| [[projects]] | ||||
|   branch = "master" | ||||
|   name = "golang.org/x/crypto" | ||||
|   packages = ["ssh/terminal"] | ||||
|   revision = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122" | ||||
|   revision = "b01c7a72566457eb1420261cdafef86638fc3861" | ||||
|  | ||||
| [[projects]] | ||||
|   branch = "master" | ||||
|   name = "golang.org/x/net" | ||||
|   packages = ["context","context/ctxhttp","http2","http2/hpack","idna","internal/timeseries","lex/httplex","trace"] | ||||
|   revision = "a8b9294777976932365dabb6640cf1468d95c70f" | ||||
|   packages = ["context","context/ctxhttp","http/httpguts","http2","http2/hpack","idna","internal/timeseries","trace"] | ||||
|   revision = "d26f9f9a57f3fab6a695bec0d84433c2c50f8bbf" | ||||
|  | ||||
| [[projects]] | ||||
|   branch = "master" | ||||
|   name = "golang.org/x/oauth2" | ||||
|   packages = [".","google","internal","jws","jwt"] | ||||
|   revision = "f95fa95eaa936d9d87489b15d1d18b97c1ba9c28" | ||||
|   revision = "99b60b757ec124ebb7d6b7e97f153b19c10ce163" | ||||
|  | ||||
| [[projects]] | ||||
|   branch = "master" | ||||
|   name = "golang.org/x/sys" | ||||
|   packages = ["unix","windows"] | ||||
|   revision = "13fcbd661c8ececa8807a29b48407d674b1d8ed8" | ||||
|   revision = "302c3dd5f1cc82baae8e44d9c3178e89b6e2b345" | ||||
|  | ||||
| [[projects]] | ||||
|   branch = "master" | ||||
|   name = "golang.org/x/text" | ||||
|   packages = ["collate","collate/build","internal/colltab","internal/gen","internal/tag","internal/triegen","internal/ucd","language","secure/bidirule","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable"] | ||||
|   revision = "75cc3cad82b5f47d3fb229ddda8c5167da14f294" | ||||
|   revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" | ||||
|   version = "v0.3.0" | ||||
|  | ||||
| [[projects]] | ||||
|   name = "google.golang.org/appengine" | ||||
|   packages = [".","internal","internal/app_identity","internal/base","internal/datastore","internal/log","internal/modules","internal/remote_api","internal/urlfetch","urlfetch"] | ||||
|   revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a" | ||||
|   version = "v1.0.0" | ||||
|   revision = "e9657d882bb81064595ca3b56cbe2546bbabf7b1" | ||||
|   version = "v1.4.0" | ||||
|  | ||||
| [[projects]] | ||||
|   branch = "master" | ||||
|   name = "google.golang.org/genproto" | ||||
|   packages = ["googleapis/rpc/status"] | ||||
|   revision = "7f0da29060c682909f650ad8ed4e515bd74fa12a" | ||||
|   revision = "8ac453e89fca495c0d17f98932642f392e2a11f3" | ||||
|  | ||||
| [[projects]] | ||||
|   name = "google.golang.org/grpc" | ||||
|   packages = [".","balancer","balancer/roundrobin","codes","connectivity","credentials","credentials/oauth","encoding","grpclb/grpc_lb_v1/messages","grpclog","internal","keepalive","metadata","naming","peer","resolver","resolver/dns","resolver/passthrough","stats","status","tap","transport"] | ||||
|   revision = "5a9f7b402fe85096d2e1d0383435ee1876e863d0" | ||||
|   version = "v1.8.0" | ||||
|   packages = [".","balancer","balancer/base","balancer/roundrobin","binarylog/grpc_binarylog_v1","codes","connectivity","credentials","credentials/internal","credentials/oauth","encoding","encoding/proto","grpclog","internal","internal/backoff","internal/binarylog","internal/channelz","internal/envconfig","internal/grpcrand","internal/grpcsync","internal/syscall","internal/transport","keepalive","metadata","naming","peer","resolver","resolver/dns","resolver/passthrough","stats","status","tap"] | ||||
|   revision = "a02b0774206b209466313a0b525d2c738fe407eb" | ||||
|   version = "v1.18.0" | ||||
|  | ||||
| [solve-meta] | ||||
|   analyzer-name = "dep" | ||||
|   | ||||
							
								
								
									
										4
									
								
								vendor/github.com/grpc-ecosystem/go-grpc-middleware/README.md
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/github.com/grpc-ecosystem/go-grpc-middleware/README.md
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -11,8 +11,6 @@ | ||||
|  | ||||
| [gRPC Go](https://github.com/grpc/grpc-go) Middleware: interceptors, helpers, utilities. | ||||
|  | ||||
| **Important** The repo recently moved to `github.com/grpc-ecosystem/go-grpc-middleware`, please update your import paths. | ||||
|  | ||||
| ## Middleware | ||||
|  | ||||
| [gRPC Go](https://github.com/grpc/grpc-go) recently acquired support for | ||||
| @@ -24,7 +22,7 @@ These are generic building blocks that make it easy to build multiple microservi | ||||
| The purpose of this repository is to act as a go-to point for such reusable functionality. It contains | ||||
| some of them itself, but also will link to useful external repos. | ||||
|  | ||||
| `grpc_middleware` itself provides support for chaining interceptors. See [Documentation](DOC.md), but here's an example: | ||||
| `grpc_middleware` itself provides support for chaining interceptors, here's an example: | ||||
|  | ||||
| ```go | ||||
| import "github.com/grpc-ecosystem/go-grpc-middleware" | ||||
|   | ||||
							
								
								
									
										12
									
								
								vendor/github.com/grpc-ecosystem/go-grpc-middleware/makefile
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								vendor/github.com/grpc-ecosystem/go-grpc-middleware/makefile
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,14 +1,8 @@ | ||||
| SHELL="/bin/bash" | ||||
| SHELL=/bin/bash | ||||
|  | ||||
| GOFILES_NOVENDOR = $(shell go list ./... | grep -v /vendor/) | ||||
|  | ||||
| all: vet fmt docs test | ||||
|  | ||||
| docs: | ||||
| 	./scripts/docs.sh generate | ||||
|  | ||||
| checkdocs: | ||||
| 	./scripts/docs.sh check | ||||
| all: vet fmt test | ||||
|  | ||||
| fmt: | ||||
| 	go fmt $(GOFILES_NOVENDOR) | ||||
| @@ -19,4 +13,4 @@ vet: | ||||
| test: vet | ||||
| 	./scripts/test_all.sh | ||||
|  | ||||
| .PHONY: all docs validate test | ||||
| .PHONY: all test | ||||
|   | ||||
		Reference in New Issue
	
	Block a user