Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions cmd/api/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ import (
_ "github.com/tektoncd/results/pkg/api/server/db/errors/postgres"

"github.com/golang-jwt/jwt/v4"
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
grpc_auth "github.com/grpc-ecosystem/go-grpc-middleware/auth"
grpc_zap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap"
"github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
Expand Down Expand Up @@ -293,7 +292,7 @@ func main() {

svrOpts := []grpc.ServerOption{
grpc.Creds(creds),
grpc_middleware.WithUnaryServerChain( //nolint:staticcheck // TODO: migrate to grpc.ChainUnaryInterceptor
grpc.ChainUnaryInterceptor(
// The grpc_ctxtags context updater should be before everything else
grpc_ctxtags.UnaryServerInterceptor(grpc_ctxtags.WithFieldExtractor(grpc_ctxtags.CodeGenRequestFieldExtractor)),
grpc_zap.UnaryServerInterceptor(grpcLogger, zapOpts...),
Expand All @@ -302,7 +301,7 @@ func main() {
fieldmask.UnaryServerInterceptor(f.Get(features.PartialResponse)),
recovery.UnaryServerInterceptor(recovery.WithRecoveryHandler(recoveryHandler)),
),
grpc_middleware.WithStreamServerChain( //nolint:staticcheck // TODO: migrate to grpc.ChainStreamInterceptor
grpc.ChainStreamInterceptor(
// The grpc_ctxtags context updater should be before everything else
grpc_ctxtags.StreamServerInterceptor(grpc_ctxtags.WithFieldExtractor(grpc_ctxtags.CodeGenRequestFieldExtractor)),
grpc_zap.StreamServerInterceptor(grpcLogger, zapOpts...),
Expand Down
Loading