Merge pull request #276 from bufbuild/interceptors

Add interceptors
twitchtv · Sep 25, 2020 · 403a70c · 403a70c
2 parents 282c5d0 + ae97c56
commit 403a70c
Show file tree

Hide file tree

Showing 29 changed files with 2,750 additions and 274 deletions.
diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ test_python_client: generate build/clientcompat build/pycompat
 
 setup:
  ./install_proto.bash
- GOPATH=$(CURDIR)/_tools go install github.com/twitchtv/retool/...
+ GO111MODULE=off GOPATH=$(CURDIR)/_tools GOBIN=$(CURDIR)/_tools/bin go get github.com/twitchtv/retool
  $(RETOOL) build
 
 release_gen:

diff --git a/client_options.go b/client_options.go
@@ -22,8 +22,9 @@ type ClientOption func(*ClientOptions)
 
 // ClientOptions encapsulate the configurable parameters on a Twirp client.
 type ClientOptions struct {
- Hooks *ClientHooks
- pathPrefix *string
+ Interceptors []Interceptor
+ Hooks *ClientHooks
+ pathPrefix *string
 }
 
 func (opts *ClientOptions) PathPrefix() string {
@@ -33,6 +34,13 @@ func (opts *ClientOptions) PathPrefix() string {
  return *opts.pathPrefix
 }
 
+// WithClientInterceptors defines the interceptors for a Twirp client.
+func WithClientInterceptors(interceptors ...Interceptor) ClientOption {
+ return func(o *ClientOptions) {
+ o.Interceptors = append(o.Interceptors, interceptors...)
+ }
+}
+
 // WithClientHooks defines the hooks for a Twirp client.
 func WithClientHooks(hooks *ClientHooks) ClientOption {
  return func(o *ClientOptions) {

diff --git a/clientcompat/internal/clientcompat/clientcompat.twirp.go b/clientcompat/internal/clientcompat/clientcompat.twirp.go