diff options
| author | Eric Ju <eju@gitlab.com> | 2023-11-01 05:27:57 +0300 |
|---|---|---|
| committer | Eric Ju <eju@gitlab.com> | 2023-11-07 18:34:17 +0300 |
| commit | 7ea9ec06a916088cb4a7444ec4c3e524ed0fff06 (patch) | |
| tree | 3f37d4e02161439c70415b8fc10291f47287fb69 /cmd | |
| parent | 1a96b11d819f7b0bff63a4c3fd3f2588b40edc90 (diff) | |
cmd/gitaly-hooks: Convert to use native interceptor chaining
Currenlty, github.com/grpc-ecosystem/go-grpc-middleware v1 is used
in our code base.
This commit remove grpc_middleware.ChainUnaryClient and
grpc_middleware.ChainStreamClient, we will use grpc's native
`WithChainUnaryInterceptor()` and `WithChainStreamInterceptor()`
instead.
Also re-generate NOTICE file
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/gitaly-hooks/hooks.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd/gitaly-hooks/hooks.go b/cmd/gitaly-hooks/hooks.go index b900260a5..cb10dfae9 100644 --- a/cmd/gitaly-hooks/hooks.go +++ b/cmd/gitaly-hooks/hooks.go @@ -9,7 +9,6 @@ import ( "os" "path/filepath" - grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" "github.com/sirupsen/logrus" gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" @@ -232,8 +231,8 @@ func dialGitaly(ctx context.Context, payload git.HooksPayload) (*grpc.ClientConn streamInterceptors = append(streamInterceptors, tracing.StreamPassthroughInterceptor(spanContext)) } - dialOpts = append(dialOpts, grpc.WithUnaryInterceptor(grpc_middleware.ChainUnaryClient(unaryInterceptors...))) - dialOpts = append(dialOpts, grpc.WithStreamInterceptor(grpc_middleware.ChainStreamClient(streamInterceptors...))) + dialOpts = append(dialOpts, grpc.WithChainUnaryInterceptor(unaryInterceptors...)) + dialOpts = append(dialOpts, grpc.WithChainStreamInterceptor(streamInterceptors...)) conn, err := client.Dial(ctx, "unix://"+payload.InternalSocket, client.WithGrpcOptions(dialOpts)) if err != nil { return nil, fmt.Errorf("error when dialing: %w", err) |