diff --git a/examples/examplepb/a_bit_of_everything.pb.gw.go b/examples/examplepb/a_bit_of_everything.pb.gw.go index 75cf12cc89a..b906c01fc57 100644 --- a/examples/examplepb/a_bit_of_everything.pb.gw.go +++ b/examples/examplepb/a_bit_of_everything.pb.gw.go @@ -34,8 +34,9 @@ var ( filter_ABitOfEverythingService_Create_0 = &utilities.DoubleArray{Encoding: map[string]int{"float_value": 0, "double_value": 1, "int64_value": 2, "uint64_value": 3, "int32_value": 4, "fixed64_value": 5, "fixed32_value": 6, "bool_value": 7, "string_value": 8, "uint32_value": 9, "sfixed32_value": 10, "sfixed64_value": 11, "sint32_value": 12, "sint64_value": 13}, Base: []int{1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, Check: []int{0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}} ) -func request_ABitOfEverythingService_Create_0(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_ABitOfEverythingService_Create_0(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq ABitOfEverything + var metadata runtime.ServerMetadata var ( val string @@ -46,180 +47,186 @@ func request_ABitOfEverythingService_Create_0(ctx context.Context, client ABitOf val, ok = pathParams["float_value"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "float_value") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "float_value") } protoReq.FloatValue, err = runtime.Float32(val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["double_value"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "double_value") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "double_value") } protoReq.DoubleValue, err = runtime.Float64(val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["int64_value"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "int64_value") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "int64_value") } protoReq.Int64Value, err = runtime.Int64(val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["uint64_value"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "uint64_value") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "uint64_value") } protoReq.Uint64Value, err = runtime.Uint64(val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["int32_value"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "int32_value") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "int32_value") } protoReq.Int32Value, err = runtime.Int32(val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["fixed64_value"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "fixed64_value") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "fixed64_value") } protoReq.Fixed64Value, err = runtime.Uint64(val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["fixed32_value"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "fixed32_value") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "fixed32_value") } protoReq.Fixed32Value, err = runtime.Uint32(val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["bool_value"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "bool_value") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "bool_value") } protoReq.BoolValue, err = runtime.Bool(val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["string_value"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "string_value") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "string_value") } protoReq.StringValue, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["uint32_value"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "uint32_value") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "uint32_value") } protoReq.Uint32Value, err = runtime.Uint32(val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["sfixed32_value"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "sfixed32_value") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "sfixed32_value") } protoReq.Sfixed32Value, err = runtime.Int32(val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["sfixed64_value"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "sfixed64_value") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "sfixed64_value") } protoReq.Sfixed64Value, err = runtime.Int64(val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["sint32_value"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "sint32_value") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "sint32_value") } protoReq.Sint32Value, err = runtime.Int32(val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["sint64_value"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "sint64_value") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "sint64_value") } protoReq.Sint64Value, err = runtime.Int64(val) if err != nil { - return nil, err + return nil, metadata, err } if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_ABitOfEverythingService_Create_0); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } - return client.Create(ctx, &protoReq) + msg, err := client.Create(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } -func request_ABitOfEverythingService_CreateBody_0(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_ABitOfEverythingService_CreateBody_0(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq ABitOfEverything + var metadata runtime.ServerMetadata if err := json.NewDecoder(req.Body).Decode(&protoReq); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } - return client.CreateBody(ctx, &protoReq) + msg, err := client.CreateBody(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } -func request_ABitOfEverythingService_BulkCreate_0(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_ABitOfEverythingService_BulkCreate_0(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var metadata runtime.ServerMetadata stream, err := client.BulkCreate(ctx) if err != nil { glog.Errorf("Failed to start streaming: %v", err) - return nil, err + return nil, metadata, err } dec := json.NewDecoder(req.Body) for { @@ -230,20 +237,34 @@ func request_ABitOfEverythingService_BulkCreate_0(ctx context.Context, client AB } if err != nil { glog.Errorf("Failed to decode request: %v", err) - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } if err = stream.Send(&protoReq); err != nil { glog.Errorf("Failed to send request: %v", err) - return nil, err + return nil, metadata, err } } - return stream.CloseAndRecv() + if err := stream.CloseSend(); err != nil { + glog.Errorf("Failed to terminate client stream: %v", err) + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + glog.Errorf("Failed to get header from client: %v", err) + return nil, metadata, err + } + metadata.HeaderMD = header + + msg, err := stream.CloseAndRecv() + metadata.TrailerMD = stream.Trailer() + return msg, metadata, err } -func request_ABitOfEverythingService_Lookup_0(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_ABitOfEverythingService_Lookup_0(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq IdMessage + var metadata runtime.ServerMetadata var ( val string @@ -254,29 +275,43 @@ func request_ABitOfEverythingService_Lookup_0(ctx context.Context, client ABitOf val, ok = pathParams["uuid"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "uuid") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "uuid") } protoReq.Uuid, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } - return client.Lookup(ctx, &protoReq) + msg, err := client.Lookup(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } -func request_ABitOfEverythingService_List_0(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (ABitOfEverythingService_ListClient, error) { +func request_ABitOfEverythingService_List_0(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (ABitOfEverythingService_ListClient, runtime.ServerMetadata, error) { var protoReq EmptyMessage + var metadata runtime.ServerMetadata + + stream, err := client.List(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err + } + metadata.HeaderMD = header + return stream, metadata, nil - return client.List(ctx, &protoReq) } -func request_ABitOfEverythingService_Update_0(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_ABitOfEverythingService_Update_0(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq ABitOfEverything + var metadata runtime.ServerMetadata if err := json.NewDecoder(req.Body).Decode(&protoReq); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } var ( @@ -288,20 +323,23 @@ func request_ABitOfEverythingService_Update_0(ctx context.Context, client ABitOf val, ok = pathParams["uuid"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "uuid") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "uuid") } protoReq.Uuid, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } - return client.Update(ctx, &protoReq) + msg, err := client.Update(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } -func request_ABitOfEverythingService_Delete_0(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_ABitOfEverythingService_Delete_0(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq IdMessage + var metadata runtime.ServerMetadata var ( val string @@ -312,20 +350,23 @@ func request_ABitOfEverythingService_Delete_0(ctx context.Context, client ABitOf val, ok = pathParams["uuid"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "uuid") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "uuid") } protoReq.Uuid, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } - return client.Delete(ctx, &protoReq) + msg, err := client.Delete(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } -func request_ABitOfEverythingService_Echo_0(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_ABitOfEverythingService_Echo_0(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq sub.StringMessage + var metadata runtime.ServerMetadata var ( val string @@ -336,47 +377,56 @@ func request_ABitOfEverythingService_Echo_0(ctx context.Context, client ABitOfEv val, ok = pathParams["value"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "value") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "value") } protoReq.Value, err = runtime.StringP(val) if err != nil { - return nil, err + return nil, metadata, err } - return client.Echo(ctx, &protoReq) + msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } -func request_ABitOfEverythingService_Echo_1(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_ABitOfEverythingService_Echo_1(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq sub.StringMessage + var metadata runtime.ServerMetadata if err := json.NewDecoder(req.Body).Decode(&protoReq.Value); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } - return client.Echo(ctx, &protoReq) + msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } var ( filter_ABitOfEverythingService_Echo_2 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) -func request_ABitOfEverythingService_Echo_2(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_ABitOfEverythingService_Echo_2(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq sub.StringMessage + var metadata runtime.ServerMetadata if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_ABitOfEverythingService_Echo_2); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } - return client.Echo(ctx, &protoReq) + msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } -func request_ABitOfEverythingService_BulkEcho_0(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (ABitOfEverythingService_BulkEchoClient, error) { +func request_ABitOfEverythingService_BulkEcho_0(ctx context.Context, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (ABitOfEverythingService_BulkEchoClient, runtime.ServerMetadata, error) { + var metadata runtime.ServerMetadata stream, err := client.BulkEcho(ctx) if err != nil { glog.Errorf("Failed to start streaming: %v", err) - return nil, err + return nil, metadata, err } dec := json.NewDecoder(req.Body) for { @@ -387,19 +437,26 @@ func request_ABitOfEverythingService_BulkEcho_0(ctx context.Context, client ABit } if err != nil { glog.Errorf("Failed to decode request: %v", err) - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } if err = stream.Send(&protoReq); err != nil { glog.Errorf("Failed to send request: %v", err) - return nil, err + return nil, metadata, err } } - if err = stream.CloseSend(); err != nil { + if err := stream.CloseSend(); err != nil { glog.Errorf("Failed to terminate client stream: %v", err) - return nil, err + return nil, metadata, err } - return stream, nil + header, err := stream.Header() + if err != nil { + glog.Errorf("Failed to get header from client: %v", err) + return nil, metadata, err + } + metadata.HeaderMD = header + + return stream, metadata, nil } @@ -442,7 +499,8 @@ func RegisterABitOfEverythingServiceHandler(ctx context.Context, mux *runtime.Se cancel() }() } - resp, err := request_ABitOfEverythingService_Create_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_ABitOfEverythingService_Create_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -461,7 +519,8 @@ func RegisterABitOfEverythingServiceHandler(ctx context.Context, mux *runtime.Se cancel() }() } - resp, err := request_ABitOfEverythingService_CreateBody_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_ABitOfEverythingService_CreateBody_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -480,7 +539,8 @@ func RegisterABitOfEverythingServiceHandler(ctx context.Context, mux *runtime.Se cancel() }() } - resp, err := request_ABitOfEverythingService_BulkCreate_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_ABitOfEverythingService_BulkCreate_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -499,7 +559,8 @@ func RegisterABitOfEverythingServiceHandler(ctx context.Context, mux *runtime.Se cancel() }() } - resp, err := request_ABitOfEverythingService_Lookup_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_ABitOfEverythingService_Lookup_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -518,7 +579,8 @@ func RegisterABitOfEverythingServiceHandler(ctx context.Context, mux *runtime.Se cancel() }() } - resp, err := request_ABitOfEverythingService_List_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_ABitOfEverythingService_List_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -537,7 +599,8 @@ func RegisterABitOfEverythingServiceHandler(ctx context.Context, mux *runtime.Se cancel() }() } - resp, err := request_ABitOfEverythingService_Update_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_ABitOfEverythingService_Update_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -556,7 +619,8 @@ func RegisterABitOfEverythingServiceHandler(ctx context.Context, mux *runtime.Se cancel() }() } - resp, err := request_ABitOfEverythingService_Delete_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_ABitOfEverythingService_Delete_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -575,7 +639,8 @@ func RegisterABitOfEverythingServiceHandler(ctx context.Context, mux *runtime.Se cancel() }() } - resp, err := request_ABitOfEverythingService_Echo_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_ABitOfEverythingService_Echo_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -594,7 +659,8 @@ func RegisterABitOfEverythingServiceHandler(ctx context.Context, mux *runtime.Se cancel() }() } - resp, err := request_ABitOfEverythingService_Echo_1(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_ABitOfEverythingService_Echo_1(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -613,7 +679,8 @@ func RegisterABitOfEverythingServiceHandler(ctx context.Context, mux *runtime.Se cancel() }() } - resp, err := request_ABitOfEverythingService_Echo_2(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_ABitOfEverythingService_Echo_2(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -632,7 +699,8 @@ func RegisterABitOfEverythingServiceHandler(ctx context.Context, mux *runtime.Se cancel() }() } - resp, err := request_ABitOfEverythingService_BulkEcho_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_ABitOfEverythingService_BulkEcho_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return diff --git a/examples/examplepb/echo_service.pb.gw.go b/examples/examplepb/echo_service.pb.gw.go index 1e7f121f023..c16cc444a74 100644 --- a/examples/examplepb/echo_service.pb.gw.go +++ b/examples/examplepb/echo_service.pb.gw.go @@ -29,8 +29,9 @@ var _ = runtime.String var _ = json.Marshal var _ = utilities.NewDoubleArray -func request_EchoService_Echo_0(ctx context.Context, client EchoServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_EchoService_Echo_0(ctx context.Context, client EchoServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq SimpleMessage + var metadata runtime.ServerMetadata var ( val string @@ -41,26 +42,31 @@ func request_EchoService_Echo_0(ctx context.Context, client EchoServiceClient, r val, ok = pathParams["id"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "id") } protoReq.Id, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } - return client.Echo(ctx, &protoReq) + msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } -func request_EchoService_EchoBody_0(ctx context.Context, client EchoServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_EchoService_EchoBody_0(ctx context.Context, client EchoServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq SimpleMessage + var metadata runtime.ServerMetadata if err := json.NewDecoder(req.Body).Decode(&protoReq); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } - return client.EchoBody(ctx, &protoReq) + msg, err := client.EchoBody(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } // RegisterEchoServiceHandlerFromEndpoint is same as RegisterEchoServiceHandler but @@ -102,7 +108,8 @@ func RegisterEchoServiceHandler(ctx context.Context, mux *runtime.ServeMux, conn cancel() }() } - resp, err := request_EchoService_Echo_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_EchoService_Echo_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -121,7 +128,8 @@ func RegisterEchoServiceHandler(ctx context.Context, mux *runtime.ServeMux, conn cancel() }() } - resp, err := request_EchoService_EchoBody_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_EchoService_EchoBody_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return diff --git a/examples/examplepb/flow_combination.pb.gw.go b/examples/examplepb/flow_combination.pb.gw.go index 3839f631998..f83c88fa5d9 100644 --- a/examples/examplepb/flow_combination.pb.gw.go +++ b/examples/examplepb/flow_combination.pb.gw.go @@ -29,23 +29,38 @@ var _ = runtime.String var _ = json.Marshal var _ = utilities.NewDoubleArray -func request_FlowCombination_RpcEmptyRpc_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_FlowCombination_RpcEmptyRpc_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq EmptyProto + var metadata runtime.ServerMetadata + + msg, err := client.RpcEmptyRpc(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err - return client.RpcEmptyRpc(ctx, &protoReq) } -func request_FlowCombination_RpcEmptyStream_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcEmptyStreamClient, error) { +func request_FlowCombination_RpcEmptyStream_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcEmptyStreamClient, runtime.ServerMetadata, error) { var protoReq EmptyProto + var metadata runtime.ServerMetadata + + stream, err := client.RpcEmptyStream(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err + } + metadata.HeaderMD = header + return stream, metadata, nil - return client.RpcEmptyStream(ctx, &protoReq) } -func request_FlowCombination_StreamEmptyRpc_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_FlowCombination_StreamEmptyRpc_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var metadata runtime.ServerMetadata stream, err := client.StreamEmptyRpc(ctx) if err != nil { glog.Errorf("Failed to start streaming: %v", err) - return nil, err + return nil, metadata, err } dec := json.NewDecoder(req.Body) for { @@ -56,23 +71,37 @@ func request_FlowCombination_StreamEmptyRpc_0(ctx context.Context, client FlowCo } if err != nil { glog.Errorf("Failed to decode request: %v", err) - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } if err = stream.Send(&protoReq); err != nil { glog.Errorf("Failed to send request: %v", err) - return nil, err + return nil, metadata, err } } - return stream.CloseAndRecv() + if err := stream.CloseSend(); err != nil { + glog.Errorf("Failed to terminate client stream: %v", err) + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + glog.Errorf("Failed to get header from client: %v", err) + return nil, metadata, err + } + metadata.HeaderMD = header + + msg, err := stream.CloseAndRecv() + metadata.TrailerMD = stream.Trailer() + return msg, metadata, err } -func request_FlowCombination_StreamEmptyStream_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_StreamEmptyStreamClient, error) { +func request_FlowCombination_StreamEmptyStream_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_StreamEmptyStreamClient, runtime.ServerMetadata, error) { + var metadata runtime.ServerMetadata stream, err := client.StreamEmptyStream(ctx) if err != nil { glog.Errorf("Failed to start streaming: %v", err) - return nil, err + return nil, metadata, err } dec := json.NewDecoder(req.Body) for { @@ -83,34 +112,45 @@ func request_FlowCombination_StreamEmptyStream_0(ctx context.Context, client Flo } if err != nil { glog.Errorf("Failed to decode request: %v", err) - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } if err = stream.Send(&protoReq); err != nil { glog.Errorf("Failed to send request: %v", err) - return nil, err + return nil, metadata, err } } - if err = stream.CloseSend(); err != nil { + if err := stream.CloseSend(); err != nil { glog.Errorf("Failed to terminate client stream: %v", err) - return nil, err + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + glog.Errorf("Failed to get header from client: %v", err) + return nil, metadata, err } - return stream, nil + metadata.HeaderMD = header + + return stream, metadata, nil } -func request_FlowCombination_RpcBodyRpc_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_FlowCombination_RpcBodyRpc_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq NonEmptyProto + var metadata runtime.ServerMetadata if err := json.NewDecoder(req.Body).Decode(&protoReq); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } - return client.RpcBodyRpc(ctx, &protoReq) + msg, err := client.RpcBodyRpc(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } -func request_FlowCombination_RpcBodyRpc_1(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_FlowCombination_RpcBodyRpc_1(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq NonEmptyProto + var metadata runtime.ServerMetadata var ( val string @@ -121,59 +161,65 @@ func request_FlowCombination_RpcBodyRpc_1(ctx context.Context, client FlowCombin val, ok = pathParams["a"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a") } protoReq.A, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["b"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "b") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "b") } protoReq.B, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["c"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "c") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "c") } protoReq.C, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } - return client.RpcBodyRpc(ctx, &protoReq) + msg, err := client.RpcBodyRpc(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } var ( filter_FlowCombination_RpcBodyRpc_2 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) -func request_FlowCombination_RpcBodyRpc_2(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_FlowCombination_RpcBodyRpc_2(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq NonEmptyProto + var metadata runtime.ServerMetadata if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_FlowCombination_RpcBodyRpc_2); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } - return client.RpcBodyRpc(ctx, &protoReq) + msg, err := client.RpcBodyRpc(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } -func request_FlowCombination_RpcBodyRpc_3(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_FlowCombination_RpcBodyRpc_3(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq NonEmptyProto + var metadata runtime.ServerMetadata if err := json.NewDecoder(req.Body).Decode(&protoReq.C); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } var ( @@ -185,56 +231,62 @@ func request_FlowCombination_RpcBodyRpc_3(ctx context.Context, client FlowCombin val, ok = pathParams["a"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a") } protoReq.A, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["b"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "b") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "b") } protoReq.B, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } - return client.RpcBodyRpc(ctx, &protoReq) + msg, err := client.RpcBodyRpc(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } var ( filter_FlowCombination_RpcBodyRpc_4 = &utilities.DoubleArray{Encoding: map[string]int{"c": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} ) -func request_FlowCombination_RpcBodyRpc_4(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_FlowCombination_RpcBodyRpc_4(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq NonEmptyProto + var metadata runtime.ServerMetadata if err := json.NewDecoder(req.Body).Decode(&protoReq.C); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_FlowCombination_RpcBodyRpc_4); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } - return client.RpcBodyRpc(ctx, &protoReq) + msg, err := client.RpcBodyRpc(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } var ( filter_FlowCombination_RpcBodyRpc_5 = &utilities.DoubleArray{Encoding: map[string]int{"c": 0, "a": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} ) -func request_FlowCombination_RpcBodyRpc_5(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_FlowCombination_RpcBodyRpc_5(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq NonEmptyProto + var metadata runtime.ServerMetadata if err := json.NewDecoder(req.Body).Decode(&protoReq.C); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } var ( @@ -246,28 +298,31 @@ func request_FlowCombination_RpcBodyRpc_5(ctx context.Context, client FlowCombin val, ok = pathParams["a"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a") } protoReq.A, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_FlowCombination_RpcBodyRpc_5); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } - return client.RpcBodyRpc(ctx, &protoReq) + msg, err := client.RpcBodyRpc(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } var ( filter_FlowCombination_RpcBodyRpc_6 = &utilities.DoubleArray{Encoding: map[string]int{"a": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} ) -func request_FlowCombination_RpcBodyRpc_6(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_FlowCombination_RpcBodyRpc_6(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq NonEmptyProto + var metadata runtime.ServerMetadata var ( val string @@ -278,28 +333,31 @@ func request_FlowCombination_RpcBodyRpc_6(ctx context.Context, client FlowCombin val, ok = pathParams["a"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a") } protoReq.A, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_FlowCombination_RpcBodyRpc_6); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } - return client.RpcBodyRpc(ctx, &protoReq) + msg, err := client.RpcBodyRpc(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } var ( filter_FlowCombination_RpcPathSingleNestedRpc_0 = &utilities.DoubleArray{Encoding: map[string]int{"a": 0, "str": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) -func request_FlowCombination_RpcPathSingleNestedRpc_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_FlowCombination_RpcPathSingleNestedRpc_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq SingleNestedProto + var metadata runtime.ServerMetadata var ( val string @@ -310,31 +368,34 @@ func request_FlowCombination_RpcPathSingleNestedRpc_0(ctx context.Context, clien val, ok = pathParams["a.str"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a.str") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a.str") } err = runtime.PopulateFieldFromPath(&protoReq, "a.str", val) if err != nil { - return nil, err + return nil, metadata, err } if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_FlowCombination_RpcPathSingleNestedRpc_0); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } - return client.RpcPathSingleNestedRpc(ctx, &protoReq) + msg, err := client.RpcPathSingleNestedRpc(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } var ( filter_FlowCombination_RpcPathNestedRpc_0 = &utilities.DoubleArray{Encoding: map[string]int{"c": 0, "a": 1, "str": 2, "b": 3}, Base: []int{1, 1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 1, 3, 1, 2, 4, 5}} ) -func request_FlowCombination_RpcPathNestedRpc_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_FlowCombination_RpcPathNestedRpc_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq NestedProto + var metadata runtime.ServerMetadata if err := json.NewDecoder(req.Body).Decode(&protoReq.C); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } var ( @@ -346,39 +407,42 @@ func request_FlowCombination_RpcPathNestedRpc_0(ctx context.Context, client Flow val, ok = pathParams["a.str"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a.str") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a.str") } err = runtime.PopulateFieldFromPath(&protoReq, "a.str", val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["b"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "b") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "b") } protoReq.B, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_FlowCombination_RpcPathNestedRpc_0); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } - return client.RpcPathNestedRpc(ctx, &protoReq) + msg, err := client.RpcPathNestedRpc(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } var ( filter_FlowCombination_RpcPathNestedRpc_1 = &utilities.DoubleArray{Encoding: map[string]int{"a": 0, "str": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) -func request_FlowCombination_RpcPathNestedRpc_1(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_FlowCombination_RpcPathNestedRpc_1(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq NestedProto + var metadata runtime.ServerMetadata var ( val string @@ -389,31 +453,34 @@ func request_FlowCombination_RpcPathNestedRpc_1(ctx context.Context, client Flow val, ok = pathParams["a.str"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a.str") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a.str") } err = runtime.PopulateFieldFromPath(&protoReq, "a.str", val) if err != nil { - return nil, err + return nil, metadata, err } if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_FlowCombination_RpcPathNestedRpc_1); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } - return client.RpcPathNestedRpc(ctx, &protoReq) + msg, err := client.RpcPathNestedRpc(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } var ( filter_FlowCombination_RpcPathNestedRpc_2 = &utilities.DoubleArray{Encoding: map[string]int{"c": 0, "a": 1, "str": 2}, Base: []int{1, 1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 3, 2, 4}} ) -func request_FlowCombination_RpcPathNestedRpc_2(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, error) { +func request_FlowCombination_RpcPathNestedRpc_2(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq NestedProto + var metadata runtime.ServerMetadata if err := json.NewDecoder(req.Body).Decode(&protoReq.C); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } var ( @@ -425,34 +492,48 @@ func request_FlowCombination_RpcPathNestedRpc_2(ctx context.Context, client Flow val, ok = pathParams["a.str"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a.str") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a.str") } err = runtime.PopulateFieldFromPath(&protoReq, "a.str", val) if err != nil { - return nil, err + return nil, metadata, err } if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_FlowCombination_RpcPathNestedRpc_2); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } - return client.RpcPathNestedRpc(ctx, &protoReq) + msg, err := client.RpcPathNestedRpc(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + } -func request_FlowCombination_RpcBodyStream_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcBodyStreamClient, error) { +func request_FlowCombination_RpcBodyStream_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcBodyStreamClient, runtime.ServerMetadata, error) { var protoReq NonEmptyProto + var metadata runtime.ServerMetadata if err := json.NewDecoder(req.Body).Decode(&protoReq); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) + } + + stream, err := client.RpcBodyStream(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err } + metadata.HeaderMD = header + return stream, metadata, nil - return client.RpcBodyStream(ctx, &protoReq) } -func request_FlowCombination_RpcBodyStream_1(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcBodyStreamClient, error) { +func request_FlowCombination_RpcBodyStream_1(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcBodyStreamClient, runtime.ServerMetadata, error) { var protoReq NonEmptyProto + var metadata runtime.ServerMetadata var ( val string @@ -463,59 +544,81 @@ func request_FlowCombination_RpcBodyStream_1(ctx context.Context, client FlowCom val, ok = pathParams["a"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a") } protoReq.A, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["b"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "b") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "b") } protoReq.B, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["c"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "c") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "c") } protoReq.C, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } - return client.RpcBodyStream(ctx, &protoReq) + stream, err := client.RpcBodyStream(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err + } + metadata.HeaderMD = header + return stream, metadata, nil + } var ( filter_FlowCombination_RpcBodyStream_2 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) -func request_FlowCombination_RpcBodyStream_2(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcBodyStreamClient, error) { +func request_FlowCombination_RpcBodyStream_2(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcBodyStreamClient, runtime.ServerMetadata, error) { var protoReq NonEmptyProto + var metadata runtime.ServerMetadata if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_FlowCombination_RpcBodyStream_2); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) + } + + stream, err := client.RpcBodyStream(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err } + metadata.HeaderMD = header + return stream, metadata, nil - return client.RpcBodyStream(ctx, &protoReq) } -func request_FlowCombination_RpcBodyStream_3(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcBodyStreamClient, error) { +func request_FlowCombination_RpcBodyStream_3(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcBodyStreamClient, runtime.ServerMetadata, error) { var protoReq NonEmptyProto + var metadata runtime.ServerMetadata if err := json.NewDecoder(req.Body).Decode(&protoReq.C); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } var ( @@ -527,56 +630,78 @@ func request_FlowCombination_RpcBodyStream_3(ctx context.Context, client FlowCom val, ok = pathParams["a"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a") } protoReq.A, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["b"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "b") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "b") } protoReq.B, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } - return client.RpcBodyStream(ctx, &protoReq) + stream, err := client.RpcBodyStream(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err + } + metadata.HeaderMD = header + return stream, metadata, nil + } var ( filter_FlowCombination_RpcBodyStream_4 = &utilities.DoubleArray{Encoding: map[string]int{"c": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} ) -func request_FlowCombination_RpcBodyStream_4(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcBodyStreamClient, error) { +func request_FlowCombination_RpcBodyStream_4(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcBodyStreamClient, runtime.ServerMetadata, error) { var protoReq NonEmptyProto + var metadata runtime.ServerMetadata if err := json.NewDecoder(req.Body).Decode(&protoReq.C); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_FlowCombination_RpcBodyStream_4); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) + } + + stream, err := client.RpcBodyStream(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err } + metadata.HeaderMD = header + return stream, metadata, nil - return client.RpcBodyStream(ctx, &protoReq) } var ( filter_FlowCombination_RpcBodyStream_5 = &utilities.DoubleArray{Encoding: map[string]int{"c": 0, "a": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} ) -func request_FlowCombination_RpcBodyStream_5(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcBodyStreamClient, error) { +func request_FlowCombination_RpcBodyStream_5(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcBodyStreamClient, runtime.ServerMetadata, error) { var protoReq NonEmptyProto + var metadata runtime.ServerMetadata if err := json.NewDecoder(req.Body).Decode(&protoReq.C); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } var ( @@ -588,28 +713,39 @@ func request_FlowCombination_RpcBodyStream_5(ctx context.Context, client FlowCom val, ok = pathParams["a"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a") } protoReq.A, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_FlowCombination_RpcBodyStream_5); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } - return client.RpcBodyStream(ctx, &protoReq) + stream, err := client.RpcBodyStream(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err + } + metadata.HeaderMD = header + return stream, metadata, nil + } var ( filter_FlowCombination_RpcBodyStream_6 = &utilities.DoubleArray{Encoding: map[string]int{"a": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} ) -func request_FlowCombination_RpcBodyStream_6(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcBodyStreamClient, error) { +func request_FlowCombination_RpcBodyStream_6(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcBodyStreamClient, runtime.ServerMetadata, error) { var protoReq NonEmptyProto + var metadata runtime.ServerMetadata var ( val string @@ -620,28 +756,39 @@ func request_FlowCombination_RpcBodyStream_6(ctx context.Context, client FlowCom val, ok = pathParams["a"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a") } protoReq.A, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_FlowCombination_RpcBodyStream_6); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) + } + + stream, err := client.RpcBodyStream(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err } + metadata.HeaderMD = header + return stream, metadata, nil - return client.RpcBodyStream(ctx, &protoReq) } var ( filter_FlowCombination_RpcPathSingleNestedStream_0 = &utilities.DoubleArray{Encoding: map[string]int{"a": 0, "str": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) -func request_FlowCombination_RpcPathSingleNestedStream_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcPathSingleNestedStreamClient, error) { +func request_FlowCombination_RpcPathSingleNestedStream_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcPathSingleNestedStreamClient, runtime.ServerMetadata, error) { var protoReq SingleNestedProto + var metadata runtime.ServerMetadata var ( val string @@ -652,31 +799,42 @@ func request_FlowCombination_RpcPathSingleNestedStream_0(ctx context.Context, cl val, ok = pathParams["a.str"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a.str") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a.str") } err = runtime.PopulateFieldFromPath(&protoReq, "a.str", val) if err != nil { - return nil, err + return nil, metadata, err } if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_FlowCombination_RpcPathSingleNestedStream_0); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } - return client.RpcPathSingleNestedStream(ctx, &protoReq) + stream, err := client.RpcPathSingleNestedStream(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err + } + metadata.HeaderMD = header + return stream, metadata, nil + } var ( filter_FlowCombination_RpcPathNestedStream_0 = &utilities.DoubleArray{Encoding: map[string]int{"c": 0, "a": 1, "str": 2, "b": 3}, Base: []int{1, 1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 1, 3, 1, 2, 4, 5}} ) -func request_FlowCombination_RpcPathNestedStream_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcPathNestedStreamClient, error) { +func request_FlowCombination_RpcPathNestedStream_0(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcPathNestedStreamClient, runtime.ServerMetadata, error) { var protoReq NestedProto + var metadata runtime.ServerMetadata if err := json.NewDecoder(req.Body).Decode(&protoReq.C); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } var ( @@ -688,39 +846,50 @@ func request_FlowCombination_RpcPathNestedStream_0(ctx context.Context, client F val, ok = pathParams["a.str"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a.str") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a.str") } err = runtime.PopulateFieldFromPath(&protoReq, "a.str", val) if err != nil { - return nil, err + return nil, metadata, err } val, ok = pathParams["b"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "b") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "b") } protoReq.B, err = runtime.String(val) if err != nil { - return nil, err + return nil, metadata, err } if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_FlowCombination_RpcPathNestedStream_0); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) + } + + stream, err := client.RpcPathNestedStream(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err } + metadata.HeaderMD = header + return stream, metadata, nil - return client.RpcPathNestedStream(ctx, &protoReq) } var ( filter_FlowCombination_RpcPathNestedStream_1 = &utilities.DoubleArray{Encoding: map[string]int{"a": 0, "str": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) -func request_FlowCombination_RpcPathNestedStream_1(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcPathNestedStreamClient, error) { +func request_FlowCombination_RpcPathNestedStream_1(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcPathNestedStreamClient, runtime.ServerMetadata, error) { var protoReq NestedProto + var metadata runtime.ServerMetadata var ( val string @@ -731,31 +900,42 @@ func request_FlowCombination_RpcPathNestedStream_1(ctx context.Context, client F val, ok = pathParams["a.str"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a.str") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a.str") } err = runtime.PopulateFieldFromPath(&protoReq, "a.str", val) if err != nil { - return nil, err + return nil, metadata, err } if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_FlowCombination_RpcPathNestedStream_1); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } - return client.RpcPathNestedStream(ctx, &protoReq) + stream, err := client.RpcPathNestedStream(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err + } + metadata.HeaderMD = header + return stream, metadata, nil + } var ( filter_FlowCombination_RpcPathNestedStream_2 = &utilities.DoubleArray{Encoding: map[string]int{"c": 0, "a": 1, "str": 2}, Base: []int{1, 1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 3, 2, 4}} ) -func request_FlowCombination_RpcPathNestedStream_2(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcPathNestedStreamClient, error) { +func request_FlowCombination_RpcPathNestedStream_2(ctx context.Context, client FlowCombinationClient, req *http.Request, pathParams map[string]string) (FlowCombination_RpcPathNestedStreamClient, runtime.ServerMetadata, error) { var protoReq NestedProto + var metadata runtime.ServerMetadata if err := json.NewDecoder(req.Body).Decode(&protoReq.C); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } var ( @@ -767,20 +947,30 @@ func request_FlowCombination_RpcPathNestedStream_2(ctx context.Context, client F val, ok = pathParams["a.str"] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a.str") + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", "a.str") } err = runtime.PopulateFieldFromPath(&protoReq, "a.str", val) if err != nil { - return nil, err + return nil, metadata, err } if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_FlowCombination_RpcPathNestedStream_2); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) + } + + stream, err := client.RpcPathNestedStream(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err } + metadata.HeaderMD = header + return stream, metadata, nil - return client.RpcPathNestedStream(ctx, &protoReq) } // RegisterFlowCombinationHandlerFromEndpoint is same as RegisterFlowCombinationHandler but @@ -822,7 +1012,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcEmptyRpc_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcEmptyRpc_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -841,7 +1032,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcEmptyStream_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcEmptyStream_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -860,7 +1052,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_StreamEmptyRpc_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_StreamEmptyRpc_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -879,7 +1072,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_StreamEmptyStream_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_StreamEmptyStream_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -898,7 +1092,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcBodyRpc_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcBodyRpc_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -917,7 +1112,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcBodyRpc_1(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcBodyRpc_1(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -936,7 +1132,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcBodyRpc_2(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcBodyRpc_2(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -955,7 +1152,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcBodyRpc_3(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcBodyRpc_3(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -974,7 +1172,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcBodyRpc_4(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcBodyRpc_4(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -993,7 +1192,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcBodyRpc_5(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcBodyRpc_5(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -1012,7 +1212,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcBodyRpc_6(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcBodyRpc_6(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -1031,7 +1232,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcPathSingleNestedRpc_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcPathSingleNestedRpc_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -1050,7 +1252,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcPathNestedRpc_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcPathNestedRpc_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -1069,7 +1272,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcPathNestedRpc_1(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcPathNestedRpc_1(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -1088,7 +1292,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcPathNestedRpc_2(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcPathNestedRpc_2(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -1107,7 +1312,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcBodyStream_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcBodyStream_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -1126,7 +1332,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcBodyStream_1(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcBodyStream_1(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -1145,7 +1352,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcBodyStream_2(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcBodyStream_2(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -1164,7 +1372,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcBodyStream_3(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcBodyStream_3(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -1183,7 +1392,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcBodyStream_4(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcBodyStream_4(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -1202,7 +1412,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcBodyStream_5(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcBodyStream_5(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -1221,7 +1432,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcBodyStream_6(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcBodyStream_6(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -1240,7 +1452,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcPathSingleNestedStream_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcPathSingleNestedStream_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -1259,7 +1472,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcPathNestedStream_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcPathNestedStream_0(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -1278,7 +1492,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcPathNestedStream_1(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcPathNestedStream_1(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return @@ -1297,7 +1512,8 @@ func RegisterFlowCombinationHandler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_FlowCombination_RpcPathNestedStream_2(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_FlowCombination_RpcPathNestedStream_2(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return diff --git a/examples/integration_test.go b/examples/integration_test.go index 1472efec6ef..fd3c2ff6300 100644 --- a/examples/integration_test.go +++ b/examples/integration_test.go @@ -8,6 +8,7 @@ import ( "io/ioutil" "net/http" "reflect" + "strconv" "strings" "testing" "time" @@ -19,8 +20,14 @@ import ( sub "github.com/gengo/grpc-gateway/examples/sub" "github.com/gengo/grpc-gateway/runtime" "github.com/golang/protobuf/proto" + "google.golang.org/grpc/codes" ) +type errorBody struct { + Error string `json:"error"` + Code int `json:"code"` +} + func TestIntegration(t *testing.T) { if testing.Short() { t.Skip() @@ -47,6 +54,7 @@ func TestIntegration(t *testing.T) { testABECreateBody(t) testABEBulkCreate(t) testABELookup(t) + testABELookupNotFound(t) testABEList(t) testAdditionalBindings(t) @@ -135,6 +143,20 @@ func testEchoBody(t *testing.T) { if got, want := received, sent; !reflect.DeepEqual(got, want) { t.Errorf("msg.Id = %q; want %q", got, want) } + + if got, want := resp.Header.Get("Grpc-Metadata-Foo"), "foo1"; got != want { + t.Errorf("Grpc-Header-Foo was %q, wanted %q", got, want) + } + if got, want := resp.Header.Get("Grpc-Metadata-Bar"), "bar1"; got != want { + t.Errorf("Grpc-Header-Bar was %q, wanted %q", got, want) + } + + if got, want := resp.Trailer.Get("Grpc-Trailer-Foo"), "foo2"; got != want { + t.Errorf("Grpc-Trailer-Foo was %q, wanted %q", got, want) + } + if got, want := resp.Trailer.Get("Grpc-Trailer-Bar"), "bar2"; got != want { + t.Errorf("Grpc-Trailer-Bar was %q, wanted %q", got, want) + } } func testABECreate(t *testing.T) { @@ -253,6 +275,7 @@ func testABECreateBody(t *testing.T) { } func testABEBulkCreate(t *testing.T) { + count := 0 r, w := io.Pipe() go func(w io.WriteCloser) { defer func() { @@ -302,6 +325,7 @@ func testABEBulkCreate(t *testing.T) { t.Errorf("w.Write(%s) failed with %v; want success", buf, err) return } + count++ } }(w) url := "http://localhost:8080/v1/example/a_bit_of_everything/bulk" @@ -327,6 +351,17 @@ func testABEBulkCreate(t *testing.T) { t.Errorf("json.Unmarshal(%s, &msg) failed with %v; want success", buf, err) return } + + if got, want := resp.Header.Get("Grpc-Metadata-Count"), fmt.Sprintf("%d", count); got != want { + t.Errorf("Grpc-Header-Count was %q, wanted %q", got, want) + } + + if got, want := resp.Trailer.Get("Grpc-Trailer-Foo"), "foo2"; got != want { + t.Errorf("Grpc-Trailer-Foo was %q, wanted %q", got, want) + } + if got, want := resp.Trailer.Get("Grpc-Trailer-Bar"), "bar2"; got != want { + t.Errorf("Grpc-Trailer-Bar was %q, wanted %q", got, want) + } } func testABELookup(t *testing.T) { @@ -378,6 +413,49 @@ func testABELookup(t *testing.T) { if got := msg; !reflect.DeepEqual(got, want) { t.Errorf("msg= %v; want %v", &got, &want) } + + if got, want := resp.Header.Get("Grpc-Metadata-Uuid"), want.Uuid; got != want { + t.Errorf("Grpc-Metadata-Uuid was %s, wanted %s", got, want) + } +} + +func testABELookupNotFound(t *testing.T) { + url := "http://localhost:8080/v1/example/a_bit_of_everything" + uuid := "not_exist" + url = fmt.Sprintf("%s/%s", url, uuid) + resp, err := http.Get(url) + if err != nil { + t.Errorf("http.Get(%q) failed with %v; want success", url, err) + return + } + defer resp.Body.Close() + + buf, err := ioutil.ReadAll(resp.Body) + if err != nil { + t.Errorf("ioutil.ReadAll(resp.Body) failed with %v; want success", err) + return + } + + if got, want := resp.StatusCode, http.StatusNotFound; got != want { + t.Errorf("resp.StatusCode = %d; want %d", got, want) + t.Logf("%s", buf) + return + } + + var msg errorBody + if err := json.Unmarshal(buf, &msg); err != nil { + t.Errorf("json.Unmarshal(%s, &msg) failed with %v; want success", buf, err) + return + } + + if got, want := msg.Code, int(codes.NotFound); got != want { + t.Errorf("msg.Code = %d; want %d", got, want) + return + } + + if got, want := resp.Header.Get("Grpc-Metadata-Uuid"), uuid; got != want { + t.Errorf("Grpc-Metadata-Uuid was %s, wanted %s", got, want) + } } func testABEList(t *testing.T) { @@ -404,6 +482,20 @@ func testABEList(t *testing.T) { if i <= 0 { t.Errorf("i == %d; want > 0", i) } + + value := resp.Header.Get("Grpc-Metadata-Count") + if value == "" { + t.Errorf("Grpc-Header-Count should not be empty") + } + + count, err := strconv.Atoi(value) + if err != nil { + t.Errorf("failed to Atoi %q: %v", value, err) + } + + if count <= 0 { + t.Errorf("count == %d; want > 0", count) + } } func testAdditionalBindings(t *testing.T) { @@ -454,7 +546,7 @@ func testAdditionalBindings(t *testing.T) { var msg sub.StringMessage if err := json.Unmarshal(buf, &msg); err != nil { - t.Errorf("json.Unmarshal(%s, &msg) failed with %v; want success; %i", buf, err, i) + t.Errorf("json.Unmarshal(%s, &msg) failed with %v; want success; %d", buf, err, i) return } if got, want := msg.GetValue(), "hello"; got != want { diff --git a/examples/server/a_bit_of_everything.go b/examples/server/a_bit_of_everything.go index 49d52223bcd..3fdecd1edca 100644 --- a/examples/server/a_bit_of_everything.go +++ b/examples/server/a_bit_of_everything.go @@ -12,6 +12,7 @@ import ( "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" + "google.golang.org/grpc/metadata" ) // Implements of ABitOfEverythingServiceServer @@ -52,6 +53,7 @@ func (s *_ABitOfEverythingServer) CreateBody(ctx context.Context, msg *examples. } func (s *_ABitOfEverythingServer) BulkCreate(stream examples.ABitOfEverythingService_BulkCreateServer) error { + count := 0 ctx := stream.Context() for { msg, err := stream.Recv() @@ -61,33 +63,77 @@ func (s *_ABitOfEverythingServer) BulkCreate(stream examples.ABitOfEverythingSer if err != nil { return err } + count++ glog.Error(msg) if _, err = s.Create(ctx, msg); err != nil { return err } } + + err := stream.SendHeader(metadata.New(map[string]string{ + "count": fmt.Sprintf("%d", count), + })) + if err != nil { + return nil + } + + stream.SetTrailer(metadata.New(map[string]string{ + "foo": "foo2", + "bar": "bar2", + })) return stream.SendAndClose(new(examples.EmptyMessage)) } func (s *_ABitOfEverythingServer) Lookup(ctx context.Context, msg *examples.IdMessage) (*examples.ABitOfEverything, error) { s.m.Lock() defer s.m.Unlock() - glog.Info(msg) + + err := grpc.SendHeader(ctx, metadata.New(map[string]string{ + "uuid": msg.Uuid, + })) + if err != nil { + return nil, err + } + if a, ok := s.v[msg.Uuid]; ok { return a, nil } + + grpc.SetTrailer(ctx, metadata.New(map[string]string{ + "foo": "foo2", + "bar": "bar2", + })) return nil, grpc.Errorf(codes.NotFound, "not found") } func (s *_ABitOfEverythingServer) List(_ *examples.EmptyMessage, stream examples.ABitOfEverythingService_ListServer) error { s.m.Lock() defer s.m.Unlock() + + err := stream.SendHeader(metadata.New(map[string]string{ + "count": fmt.Sprintf("%d", len(s.v)), + })) + if err != nil { + return nil + } + for _, msg := range s.v { if err := stream.Send(msg); err != nil { return err } } + + // return error when metadata includes error header + if header, ok := metadata.FromContext(stream.Context()); ok { + if v, ok := header["error"]; ok { + stream.SetTrailer(metadata.New(map[string]string{ + "foo": "foo2", + "bar": "bar2", + })) + return grpc.Errorf(codes.InvalidArgument, "error metadata: %v", v) + } + } return nil } @@ -137,11 +183,25 @@ func (s *_ABitOfEverythingServer) BulkEcho(stream examples.ABitOfEverythingServi } msgs = append(msgs, msg) } + + hmd := metadata.New(map[string]string{ + "foo": "foo1", + "bar": "bar1", + }) + if err := stream.SendHeader(hmd); err != nil { + return err + } + for _, msg := range msgs { glog.Info(msg) if err := stream.Send(msg); err != nil { return err } } + + stream.SetTrailer(metadata.New(map[string]string{ + "foo": "foo2", + "bar": "bar2", + })) return nil } diff --git a/examples/server/echo.go b/examples/server/echo.go index 040a9e5da68..0f07fbbd496 100644 --- a/examples/server/echo.go +++ b/examples/server/echo.go @@ -4,6 +4,8 @@ import ( examples "github.com/gengo/grpc-gateway/examples/examplepb" "github.com/golang/glog" "golang.org/x/net/context" + "google.golang.org/grpc" + "google.golang.org/grpc/metadata" ) // Implements of EchoServiceServer @@ -21,5 +23,13 @@ func (s *echoServer) Echo(ctx context.Context, msg *examples.SimpleMessage) (*ex func (s *echoServer) EchoBody(ctx context.Context, msg *examples.SimpleMessage) (*examples.SimpleMessage, error) { glog.Info(msg) + grpc.SendHeader(ctx, metadata.New(map[string]string{ + "foo": "foo1", + "bar": "bar1", + })) + grpc.SetTrailer(ctx, metadata.New(map[string]string{ + "foo": "foo2", + "bar": "bar2", + })) return msg, nil } diff --git a/protoc-gen-grpc-gateway/gengateway/template.go b/protoc-gen-grpc-gateway/gengateway/template.go index 6eaff63bb7e..34838c3907c 100644 --- a/protoc-gen-grpc-gateway/gengateway/template.go +++ b/protoc-gen-grpc-gateway/gengateway/template.go @@ -127,17 +127,18 @@ var _ = utilities.NewDoubleArray _ = template.Must(handlerTemplate.New("request-func-signature").Parse(strings.Replace(` {{if .Method.GetServerStreaming}} -func request_{{.Method.Service.GetName}}_{{.Method.GetName}}_{{.Index}}(ctx context.Context, client {{.Method.Service.GetName}}Client, req *http.Request, pathParams map[string]string) ({{.Method.Service.GetName}}_{{.Method.GetName}}Client, error) +func request_{{.Method.Service.GetName}}_{{.Method.GetName}}_{{.Index}}(ctx context.Context, client {{.Method.Service.GetName}}Client, req *http.Request, pathParams map[string]string) ({{.Method.Service.GetName}}_{{.Method.GetName}}Client, runtime.ServerMetadata, error) {{else}} -func request_{{.Method.Service.GetName}}_{{.Method.GetName}}_{{.Index}}(ctx context.Context, client {{.Method.Service.GetName}}Client, req *http.Request, pathParams map[string]string) (proto.Message, error) +func request_{{.Method.Service.GetName}}_{{.Method.GetName}}_{{.Index}}(ctx context.Context, client {{.Method.Service.GetName}}Client, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {{end}}`, "\n", "", -1))) _ = template.Must(handlerTemplate.New("client-streaming-request-func").Parse(` {{template "request-func-signature" .}} { + var metadata runtime.ServerMetadata stream, err := client.{{.Method.GetName}}(ctx) if err != nil { glog.Errorf("Failed to start streaming: %v", err) - return nil, err + return nil, metadata, err } dec := json.NewDecoder(req.Body) for { @@ -148,21 +149,30 @@ func request_{{.Method.Service.GetName}}_{{.Method.GetName}}_{{.Index}}(ctx cont } if err != nil { glog.Errorf("Failed to decode request: %v", err) - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } if err = stream.Send(&protoReq); err != nil { glog.Errorf("Failed to send request: %v", err) - return nil, err + return nil, metadata, err } } -{{if .Method.GetServerStreaming}} - if err = stream.CloseSend(); err != nil { + + if err := stream.CloseSend(); err != nil { glog.Errorf("Failed to terminate client stream: %v", err) - return nil, err + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + glog.Errorf("Failed to get header from client: %v", err) + return nil, metadata, err } - return stream, nil + metadata.HeaderMD = header +{{if .Method.GetServerStreaming}} + return stream, metadata, nil {{else}} - return stream.CloseAndRecv() + msg, err := stream.CloseAndRecv() + metadata.TrailerMD = stream.Trailer() + return msg, metadata, err {{end}} } `)) @@ -175,9 +185,10 @@ var ( {{end}} {{template "request-func-signature" .}} { var protoReq {{.Method.RequestType.GoType .Method.Service.File.GoPkg.Path}} + var metadata runtime.ServerMetadata {{if .Body}} if err := json.NewDecoder(req.Body).Decode(&{{.Body.RHS "protoReq"}}); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } {{end}} {{if .PathParams}} @@ -190,7 +201,7 @@ var ( {{range $param := .PathParams}} val, ok = pathParams[{{$param | printf "%q"}}] if !ok { - return nil, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", {{$param | printf "%q"}}) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "missing parameter %s", {{$param | printf "%q"}}) } {{if $param.IsNestedProto3 }} err = runtime.PopulateFieldFromPath(&protoReq, {{$param | printf "%q"}}, val) @@ -198,17 +209,30 @@ var ( {{$param.RHS "protoReq"}}, err = {{$param.ConvertFuncExpr}}(val) {{end}} if err != nil { - return nil, err + return nil, metadata, err } {{end}} {{end}} {{if .HasQueryParam}} if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_{{.Method.Service.GetName}}_{{.Method.GetName}}_{{.Index}}); err != nil { - return nil, grpc.Errorf(codes.InvalidArgument, "%v", err) + return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err) } {{end}} - - return client.{{.Method.GetName}}(ctx, &protoReq) +{{if .Method.GetServerStreaming}} + stream, err := client.{{.Method.GetName}}(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err + } + metadata.HeaderMD = header + return stream, metadata, nil +{{else}} + msg, err := client.{{.Method.GetName}}(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err +{{end}} }`)) trailerTemplate = template.Must(template.New("trailer").Parse(` @@ -253,7 +277,8 @@ func Register{{$svc.GetName}}Handler(ctx context.Context, mux *runtime.ServeMux, cancel() }() } - resp, err := request_{{$svc.GetName}}_{{$m.GetName}}_{{$b.Index}}(runtime.AnnotateContext(ctx, req), client, req, pathParams) + resp, md, err := request_{{$svc.GetName}}_{{$m.GetName}}_{{$b.Index}}(runtime.AnnotateContext(ctx, req), client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, w, req, err) return diff --git a/protoc-gen-grpc-gateway/gengateway/template_test.go b/protoc-gen-grpc-gateway/gengateway/template_test.go index 77e8d50fbb3..c53d51e0eeb 100644 --- a/protoc-gen-grpc-gateway/gengateway/template_test.go +++ b/protoc-gen-grpc-gateway/gengateway/template_test.go @@ -133,11 +133,11 @@ func TestApplyTemplateRequestWithoutClientStreaming(t *testing.T) { }{ { serverStreaming: false, - sigWant: `func request_ExampleService_Echo_0(ctx context.Context, client ExampleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, error) {`, + sigWant: `func request_ExampleService_Echo_0(ctx context.Context, client ExampleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {`, }, { serverStreaming: true, - sigWant: `func request_ExampleService_Echo_0(ctx context.Context, client ExampleServiceClient, req *http.Request, pathParams map[string]string) (ExampleService_EchoClient, error) {`, + sigWant: `func request_ExampleService_Echo_0(ctx context.Context, client ExampleServiceClient, req *http.Request, pathParams map[string]string) (ExampleService_EchoClient, runtime.ServerMetadata, error) {`, }, } { meth.ServerStreaming = proto.Bool(spec.serverStreaming) @@ -294,11 +294,11 @@ func TestApplyTemplateRequestWithClientStreaming(t *testing.T) { }{ { serverStreaming: false, - sigWant: `func request_ExampleService_Echo_0(ctx context.Context, client ExampleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, error) {`, + sigWant: `func request_ExampleService_Echo_0(ctx context.Context, client ExampleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {`, }, { serverStreaming: true, - sigWant: `func request_ExampleService_Echo_0(ctx context.Context, client ExampleServiceClient, req *http.Request, pathParams map[string]string) (ExampleService_EchoClient, error) {`, + sigWant: `func request_ExampleService_Echo_0(ctx context.Context, client ExampleServiceClient, req *http.Request, pathParams map[string]string) (ExampleService_EchoClient, runtime.ServerMetadata, error) {`, }, } { meth.ServerStreaming = proto.Bool(spec.serverStreaming) diff --git a/runtime/context.go b/runtime/context.go index cde43136867..83557fa72fc 100644 --- a/runtime/context.go +++ b/runtime/context.go @@ -9,6 +9,7 @@ import ( ) const metadataHeaderPrefix = "Grpc-Metadata-" +const metadataTrailerPrefix = "Grpc-Trailer-" /* AnnotateContext adds context information such as metadata from the request. @@ -35,3 +36,22 @@ func AnnotateContext(ctx context.Context, req *http.Request) context.Context { } return metadata.NewContext(ctx, metadata.Pairs(pairs...)) } + +// ServerMetadata consists of metadata sent from gRPC server. +type ServerMetadata struct { + HeaderMD metadata.MD + TrailerMD metadata.MD +} + +type serverMetadataKey struct{} + +// NewServerMetadataContext creates a new context with ServerMetadata +func NewServerMetadataContext(ctx context.Context, md ServerMetadata) context.Context { + return context.WithValue(ctx, serverMetadataKey{}, md) +} + +// ServerMetadataFromContext returns the ServerMetadata in ctx +func ServerMetadataFromContext(ctx context.Context) (md ServerMetadata, ok bool) { + md, ok = ctx.Value(serverMetadataKey{}).(ServerMetadata) + return +} diff --git a/runtime/errors.go b/runtime/errors.go index 98c1950d4de..d26eac37df2 100644 --- a/runtime/errors.go +++ b/runtime/errors.go @@ -76,8 +76,12 @@ type errorBody struct { func DefaultHTTPError(ctx context.Context, w http.ResponseWriter, _ *http.Request, err error) { const fallback = `{"error": "failed to marshal error message"}` + w.Header().Del("Trailer") w.Header().Set("Content-Type", "application/json") - body := errorBody{Error: grpc.ErrorDesc(err), Code: int(grpc.Code(err))} + body := errorBody{ + Error: grpc.ErrorDesc(err), + Code: int(grpc.Code(err)), + } buf, merr := json.Marshal(body) if merr != nil { glog.Errorf("Failed to marshal error message %q: %v", body, merr) @@ -88,11 +92,19 @@ func DefaultHTTPError(ctx context.Context, w http.ResponseWriter, _ *http.Reques return } + md, ok := ServerMetadataFromContext(ctx) + if !ok { + glog.Errorf("Failed to extract ServerMetadata from context") + } + + handleForwardResponseServerMetadata(w, md) st := HTTPStatusFromCode(grpc.Code(err)) w.WriteHeader(st) if _, err := w.Write(buf); err != nil { glog.Errorf("Failed to write response: %v", err) } + + handleForwardResponseTrailer(w, md) } func DefaultOtherErrorHandler(w http.ResponseWriter, _ *http.Request, error string, code int) { diff --git a/runtime/handler.go b/runtime/handler.go index 02d7c92c349..c1f7ce16c0b 100644 --- a/runtime/handler.go +++ b/runtime/handler.go @@ -5,6 +5,7 @@ import ( "fmt" "io" "net/http" + "net/textproto" "github.com/golang/glog" "github.com/golang/protobuf/proto" @@ -13,7 +14,7 @@ import ( ) type responseStreamChunk struct { - Result proto.Message `json:"result,omitempty"` + Result proto.Message `json:"result,omitempty"` Error *responseStreamError `json:"error,omitempty"` } @@ -33,6 +34,14 @@ func ForwardResponseStream(ctx context.Context, w http.ResponseWriter, req *http return } + md, ok := ServerMetadataFromContext(ctx) + if !ok { + glog.Errorf("Failed to extract ServerMetadata from context") + http.Error(w, "unexpected error", http.StatusInternalServerError) + return + } + handleForwardResponseServerMetadata(w, md) + w.Header().Set("Transfer-Encoding", "chunked") w.Header().Set("Content-Type", "application/json") if err := handleForwardResponseOptions(ctx, w, nil, opts); err != nil { @@ -67,8 +76,40 @@ func ForwardResponseStream(ctx context.Context, w http.ResponseWriter, req *http } } +func handleForwardResponseServerMetadata(w http.ResponseWriter, md ServerMetadata) { + for k, vs := range md.HeaderMD { + hKey := fmt.Sprintf("%s%s", metadataHeaderPrefix, k) + for i := range vs { + w.Header().Add(hKey, vs[i]) + } + } +} + +func handleForwardResponseTrailerHeader(w http.ResponseWriter, md ServerMetadata) { + for k := range md.TrailerMD { + tKey := textproto.CanonicalMIMEHeaderKey(fmt.Sprintf("%s%s", metadataTrailerPrefix, k)) + w.Header().Add("Trailer", tKey) + } +} + +func handleForwardResponseTrailer(w http.ResponseWriter, md ServerMetadata) { + for k, vs := range md.TrailerMD { + tKey := fmt.Sprintf("%s%s", metadataTrailerPrefix, k) + for i := range vs { + w.Header().Add(tKey, vs[i]) + } + } +} + // ForwardResponseMessage forwards the message "resp" from gRPC server to REST client. func ForwardResponseMessage(ctx context.Context, w http.ResponseWriter, req *http.Request, resp proto.Message, opts ...func(context.Context, http.ResponseWriter, proto.Message) error) { + md, ok := ServerMetadataFromContext(ctx) + if !ok { + glog.Errorf("Failed to extract ServerMetadata from context") + } + + handleForwardResponseServerMetadata(w, md) + handleForwardResponseTrailerHeader(w, md) w.Header().Set("Content-Type", "application/json") if err := handleForwardResponseOptions(ctx, w, resp, opts); err != nil { HTTPError(ctx, w, req, err) @@ -85,6 +126,8 @@ func ForwardResponseMessage(ctx context.Context, w http.ResponseWriter, req *htt if _, err = w.Write(buf); err != nil { glog.Errorf("Failed to write response: %v", err) } + + handleForwardResponseTrailer(w, md) } func handleForwardResponseOptions(ctx context.Context, w http.ResponseWriter, resp proto.Message, opts []func(context.Context, http.ResponseWriter, proto.Message) error) error { @@ -103,10 +146,13 @@ func handleForwardResponseOptions(ctx context.Context, w http.ResponseWriter, re func handleForwardResponseStreamError(w http.ResponseWriter, err error) { grpcCode := grpc.Code(err) httpCode := HTTPStatusFromCode(grpcCode) - resp := responseStreamChunk{Error: &responseStreamError{GrpcCode: int(grpcCode), - HTTPCode: httpCode, - Message: err.Error(), - HTTPStatus: http.StatusText(httpCode)}} + resp := responseStreamChunk{ + Error: &responseStreamError{ + GrpcCode: int(grpcCode), + HTTPCode: httpCode, + Message: err.Error(), + HTTPStatus: http.StatusText(httpCode), + }} buf, merr := json.Marshal(resp) if merr != nil { glog.Errorf("Failed to marshal an error: %v", merr)