From b4ffe101681bff7ba5bd3686234b214f2966eaa0 Mon Sep 17 00:00:00 2001 From: Travis Cline Date: Sun, 16 Apr 2017 21:10:43 -0700 Subject: [PATCH] bugfix: reflect upstream api change. metadata.NewContext now is a synonym for metadata.NewOutgoingContext. Call NewIncomingContext instead. --- runtime/context.go | 2 +- runtime/context_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime/context.go b/runtime/context.go index 98eeb44c9a1..2eb5c5e69ab 100644 --- a/runtime/context.go +++ b/runtime/context.go @@ -94,7 +94,7 @@ func AnnotateContext(ctx context.Context, req *http.Request) (context.Context, e if len(pairs) == 0 { return ctx, nil } - return metadata.NewContext(ctx, metadata.Pairs(pairs...)), nil + return metadata.NewIncomingContext(ctx, metadata.Pairs(pairs...)), nil } // ServerMetadata consists of metadata sent from gRPC server. diff --git a/runtime/context_test.go b/runtime/context_test.go index 2f3b02393db..334bbc3214a 100644 --- a/runtime/context_test.go +++ b/runtime/context_test.go @@ -28,7 +28,7 @@ func TestAnnotateContext_WorksWithEmpty(t *testing.T) { t.Errorf("runtime.AnnotateContext(ctx, %#v) failed with %v; want success", request, err) return } - md, ok := metadata.FromContext(annotated) + md, ok := metadata.FromIncomingContext(annotated) if !ok || len(md) != emptyForwardMetaCount { t.Errorf("Expected %d metadata items in context; got %v", emptyForwardMetaCount, md) } @@ -50,7 +50,7 @@ func TestAnnotateContext_ForwardsGrpcMetadata(t *testing.T) { t.Errorf("runtime.AnnotateContext(ctx, %#v) failed with %v; want success", request, err) return } - md, ok := metadata.FromContext(annotated) + md, ok := metadata.FromIncomingContext(annotated) if got, want := len(md), emptyForwardMetaCount+4; !ok || got != want { t.Errorf("metadata items in context = %d want %d: %v", got, want, md) } @@ -82,7 +82,7 @@ func TestAnnotateContext_XForwardedFor(t *testing.T) { t.Errorf("runtime.AnnotateContext(ctx, %#v) failed with %v; want success", request, err) return } - md, ok := metadata.FromContext(annotated) + md, ok := metadata.FromIncomingContext(annotated) if !ok || len(md) != emptyForwardMetaCount+1 { t.Errorf("Expected %d metadata items in context; got %v", emptyForwardMetaCount+1, md) }