Skip to content

grpc_json_transcoder: when sse delimiter is on, make sure unary calls get content-type application/json #41594

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

grpc_json_transcoder: when sse delimiter is on, make sure unary calls get content-type application/json #41594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ Http::FilterHeadersStatus JsonTranscoderFilter::encodeHeaders(Http::ResponseHead
return Http::FilterHeadersStatus::Continue;
}

if (per_route_config_->isStreamSSEStyleDelimited()) {
if (method_->descriptor_->server_streaming() && per_route_config_->isStreamSSEStyleDelimited()) {
headers.setContentType(Http::Headers::get().ContentTypeValues.TextEventStream);
} else {
headers.setReferenceContentType(Http::Headers::get().ContentTypeValues.Json);
Expand Down
24 changes: 24 additions & 0 deletions test/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1395,6 +1395,30 @@ TEST_F(GrpcJsonTranscoderFilterTest, TranscodingStreamSSE) {
}
}

TEST_F(GrpcJsonTranscoderFilterTest, TranscodingStreamSSEUnary) {
envoy::extensions::filters::http::grpc_json_transcoder::v3::GrpcJsonTranscoder proto_config =
bookstoreProtoConfig();
proto_config.mutable_print_options()->set_stream_newline_delimited(true);
proto_config.mutable_print_options()->set_stream_sse_style_delimited(true);

auto config = std::make_shared<JsonTranscoderConfig>(proto_config, *api_);
auto filter = JsonTranscoderFilter(config, stats_);
filter.setDecoderFilterCallbacks(decoder_callbacks_);
filter.setEncoderFilterCallbacks(encoder_callbacks_);

Http::TestRequestHeaderMapImpl request_headers{{":method", "GET"},
{":path", "/shelves/1/books:unary"}};

EXPECT_CALL(decoder_callbacks_.downstream_callbacks_, clearRouteCache());

EXPECT_EQ(Http::FilterHeadersStatus::Continue, filter.decodeHeaders(request_headers, false));
Http::TestResponseHeaderMapImpl response_headers{{"content-type", "application/grpc"},
{":status", "200"}};
EXPECT_EQ(Http::FilterHeadersStatus::StopIteration,
filter.encodeHeaders(response_headers, false));
EXPECT_EQ("application/json", response_headers.get_("content-type"));
}

// Streaming requests with HTTP bodies do not internally buffer any data.
// The configured buffer limits will not apply.
TEST_F(GrpcJsonTranscoderFilterTest, TranscodingStreamPostWithHttpBodyNoBuffer) {
Expand Down