Skip to content

Remove gRPC error interceptor aliases #31011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Joerger merged 1 commit into from
Aug 25, 2023
Merged

Remove gRPC error interceptor aliases #31011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion e
Open in desktop
Submodule e updated from 8d05f0 to fd2d58
3 changes: 2 additions & 1 deletion lib/proxy/peer/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"github.com/gravitational/teleport"
"github.com/gravitational/teleport/api/client/proto"
"github.com/gravitational/teleport/api/metadata"
"github.com/gravitational/teleport/api/utils/grpc/interceptors"
"github.com/gravitational/teleport/lib/auth"
"github.com/gravitational/teleport/lib/utils"
)
Expand Down Expand Up @@ -131,7 +132,7 @@ func NewServer(config ServerConfig) (*Server, error) {
server := grpc.NewServer(
grpc.Creds(newServerCredentials(credentials.NewTLS(config.TLSConfig))),
grpc.StatsHandler(newStatsHandler(reporter)),
grpc.ChainStreamInterceptor(metadata.StreamServerInterceptor, utils.GRPCServerStreamErrorInterceptor),
grpc.ChainStreamInterceptor(metadata.StreamServerInterceptor, interceptors.GRPCServerStreamErrorInterceptor),
grpc.KeepaliveParams(keepalive.ServerParameters{
Time: peerKeepAlive,
Timeout: peerTimeout,
Expand Down
10 changes: 0 additions & 10 deletions lib/utils/grpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,6 @@ import (

"github.com/gravitational/trace"
"google.golang.org/grpc"

"github.com/gravitational/teleport/api/utils/grpc/interceptors"
)

// TODO(Joerger): Remove these aliases once /e no longer depends on them.
var (
GRPCServerUnaryErrorInterceptor = interceptors.GRPCServerUnaryErrorInterceptor
GRPCClientUnaryErrorInterceptor = interceptors.GRPCClientUnaryErrorInterceptor
GRPCServerStreamErrorInterceptor = interceptors.GRPCServerStreamErrorInterceptor
GRPCClientStreamErrorInterceptor = interceptors.GRPCClientStreamErrorInterceptor
)

// NewGRPCDummyClientConnection returns an implementation of grpc.ClientConnInterface
Expand Down