From 05d95d44f94ef555e90eb20d99cc9cc2a9e72748 Mon Sep 17 00:00:00 2001 From: chahatsagarmain Date: Wed, 16 Oct 2024 23:25:11 +0530 Subject: [PATCH] linting fix Signed-off-by: chahatsagarmain --- pkg/bearertoken/grpc.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkg/bearertoken/grpc.go b/pkg/bearertoken/grpc.go index ff11a0f791e..8ce42f38b0c 100644 --- a/pkg/bearertoken/grpc.go +++ b/pkg/bearertoken/grpc.go @@ -6,6 +6,7 @@ package bearertoken import ( "context" "fmt" + "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) @@ -37,10 +38,10 @@ func getValidBearerToken(ctx context.Context, bearerHeader string) (string, erro func tokenFromMetadata(md metadata.MD, bearerHeader string) (string, error) { bearerToken := md.Get(bearerHeader) if len(bearerToken) < 1 { - return "", fmt.Errorf("malformed token: no token found") + return "", nil } if len(bearerToken) > 1 { - return "", fmt.Errorf("malformed token: multiple tokens found") + return "", fmt.Errorf("malformed token: multiple tokens found") } return bearerToken[0], nil } @@ -84,14 +85,13 @@ func NewUnaryClientInterceptor() grpc.UnaryClientInterceptor { invoker grpc.UnaryInvoker, opts ...grpc.CallOption, ) error { - md, _ := metadata.FromOutgoingContext(ctx) - if len(md[Key]) == 0 { + if len(md[Key]) == 0 { bearerToken, err := GetBearerToken(ctx) - if err != false { + if err { return invoker(ctx, method, req, reply, cc, opts...) // Proceed without a token if there's an error } - + if bearerToken != "" { ctx = metadata.AppendToOutgoingContext(ctx, Key, bearerToken) } @@ -100,6 +100,7 @@ func NewUnaryClientInterceptor() grpc.UnaryClientInterceptor { return invoker(ctx, method, req, reply, cc, opts...) }) } + // NewStreamClientInterceptor injects the bearer token header into gRPC request metadata. func NewStreamClientInterceptor() grpc.StreamClientInterceptor { return grpc.StreamClientInterceptor(func( @@ -113,10 +114,10 @@ func NewStreamClientInterceptor() grpc.StreamClientInterceptor { md, _ := metadata.FromOutgoingContext(ctx) if len(md[Key]) == 0 { bearerToken, err := GetBearerToken(ctx) - if err != false { - return streamer(ctx, desc, cc, method, opts...) + if err { + return streamer(ctx, desc, cc, method, opts...) } - + if bearerToken != "" { ctx = metadata.AppendToOutgoingContext(ctx, Key, bearerToken) } @@ -124,4 +125,4 @@ func NewStreamClientInterceptor() grpc.StreamClientInterceptor { return streamer(ctx, desc, cc, method, opts...) }) -} \ No newline at end of file +}