Skip to content
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

Jump to bottom

test: migrate grpc json transcoder test configurations to v2 #8487

Merged
merged 1 commit into from
Oct 4, 2019
Merged

test: migrate grpc json transcoder test configurations to v2 #8487

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
1 change: 0 additions & 1 deletion test/extensions/filters/http/grpc_json_transcoder/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ envoy_extension_cc_test(
],
extension_name = "envoy.filters.http.grpc_json_transcoder",
deps = [
"//source/common/config:filter_json_lib",
"//source/extensions/filters/http/grpc_json_transcoder:json_transcoder_filter_lib",
"//test/mocks/http:http_mocks",
"//test/mocks/upstream:upstream_mocks",
Expand Down
45 changes: 20 additions & 25 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 @@ -2,7 +2,6 @@
#include <functional>

#include "common/buffer/buffer_impl.h"
#include "common/config/filter_json.h"
#include "common/grpc/codec.h"
#include "common/grpc/common.h"
#include "common/http/header_map_impl.h"
Expand Down Expand Up @@ -52,13 +51,12 @@ class GrpcJsonTranscoderConfigTest : public testing::Test, public GrpcJsonTransc
getProtoConfig(const std::string& descriptor_path, const std::string& service_name,
bool match_incoming_request_route = false,
const std::vector<std::string>& ignored_query_parameters = {}) {
std::string json_string = "{\"proto_descriptor\": \"" + descriptor_path +
"\",\"services\": [\"" + service_name + "\"]}";
auto json_config = Json::Factory::loadFromString(json_string);
const std::string json_string = "{\"proto_descriptor\": \"" + descriptor_path +
"\",\"services\": [\"" + service_name + "\"]}";
envoy::config::filter::http::transcoder::v2::GrpcJsonTranscoder proto_config;
Envoy::Config::FilterJson::translateGrpcJsonTranscoder(*json_config, proto_config);
TestUtility::loadFromJson(json_string, proto_config);
proto_config.set_match_incoming_request_route(match_incoming_request_route);
for (const std::string& query_param : ignored_query_parameters) {
for (const auto& query_param : ignored_query_parameters) {
proto_config.add_ignored_query_parameters(query_param);
}

Expand Down Expand Up @@ -196,7 +194,7 @@ TEST_F(GrpcJsonTranscoderConfigTest, CreateTranscoder) {
TranscoderInputStreamImpl request_in, response_in;
std::unique_ptr<Transcoder> transcoder;
const MethodDescriptor* method_descriptor;
auto status =
const auto status =
config.createTranscoder(headers, request_in, response_in, transcoder, method_descriptor);

EXPECT_TRUE(status.ok());
Expand All @@ -217,7 +215,7 @@ TEST_F(GrpcJsonTranscoderConfigTest, CreateTranscoderAutoMap) {
TranscoderInputStreamImpl request_in, response_in;
std::unique_ptr<Transcoder> transcoder;
const MethodDescriptor* method_descriptor;
auto status =
const auto status =
config.createTranscoder(headers, request_in, response_in, transcoder, method_descriptor);

EXPECT_TRUE(status.ok());
Expand All @@ -236,7 +234,7 @@ TEST_F(GrpcJsonTranscoderConfigTest, InvalidQueryParameter) {
TranscoderInputStreamImpl request_in, response_in;
std::unique_ptr<Transcoder> transcoder;
const MethodDescriptor* method_descriptor;
auto status =
const auto status =
config.createTranscoder(headers, request_in, response_in, transcoder, method_descriptor);

EXPECT_EQ(Code::INVALID_ARGUMENT, status.error_code());
Expand All @@ -256,7 +254,7 @@ TEST_F(GrpcJsonTranscoderConfigTest, UnknownQueryParameterIsIgnored) {
TranscoderInputStreamImpl request_in, response_in;
std::unique_ptr<Transcoder> transcoder;
const MethodDescriptor* method_descriptor;
auto status =
const auto status =
config.createTranscoder(headers, request_in, response_in, transcoder, method_descriptor);

EXPECT_TRUE(status.ok());
Expand All @@ -275,7 +273,7 @@ TEST_F(GrpcJsonTranscoderConfigTest, IgnoredQueryParameter) {
TranscoderInputStreamImpl request_in, response_in;
std::unique_ptr<Transcoder> transcoder;
const MethodDescriptor* method_descriptor;
auto status =
const auto status =
config.createTranscoder(headers, request_in, response_in, transcoder, method_descriptor);

EXPECT_TRUE(status.ok());
Expand All @@ -297,7 +295,7 @@ TEST_F(GrpcJsonTranscoderConfigTest, InvalidVariableBinding) {
TranscoderInputStreamImpl request_in, response_in;
std::unique_ptr<Transcoder> transcoder;
const MethodDescriptor* method_descriptor;
auto status =
const auto status =
config.createTranscoder(headers, request_in, response_in, transcoder, method_descriptor);

EXPECT_EQ(Code::INVALID_ARGUMENT, status.error_code());
Expand All @@ -317,11 +315,10 @@ class GrpcJsonTranscoderFilterTest : public testing::Test, public GrpcJsonTransc

static const envoy::config::filter::http::transcoder::v2::GrpcJsonTranscoder
bookstoreProtoConfig() {
std::string json_string = "{\"proto_descriptor\": \"" + bookstoreDescriptorPath() +
"\",\"services\": [\"bookstore.Bookstore\"]}";
auto json_config = Json::Factory::loadFromString(json_string);
envoy::config::filter::http::transcoder::v2::GrpcJsonTranscoder proto_config{};
Envoy::Config::FilterJson::translateGrpcJsonTranscoder(*json_config, proto_config);
const std::string json_string = "{\"proto_descriptor\": \"" + bookstoreDescriptorPath() +
"\",\"services\": [\"bookstore.Bookstore\"]}";
envoy::config::filter::http::transcoder::v2::GrpcJsonTranscoder proto_config;
TestUtility::loadFromJson(json_string, proto_config);
return proto_config;
}

Expand Down Expand Up @@ -771,7 +768,7 @@ class GrpcJsonTranscoderFilterConvertGrpcStatusTest : public GrpcJsonTranscoderF

// Single headers frame with end_stream flag (trailer), no grpc-status-details-bin header.
TEST_F(GrpcJsonTranscoderFilterConvertGrpcStatusTest, TranscodingTextHeadersInTrailerOnlyResponse) {
std::string expected_response(R"({"code":5,"message":"Resource not found"})");
const std::string expected_response(R"({"code":5,"message":"Resource not found"})");
EXPECT_CALL(encoder_callbacks_, addEncodedData(_, false))
.WillOnce(Invoke([&expected_response](Buffer::Instance& data, bool) {
EXPECT_EQ(expected_response, data.toString());
Expand All @@ -791,7 +788,7 @@ TEST_F(GrpcJsonTranscoderFilterConvertGrpcStatusTest, TranscodingTextHeadersInTr
// Trailer-only response with grpc-status-details-bin header.
TEST_F(GrpcJsonTranscoderFilterConvertGrpcStatusTest,
TranscodingBinaryHeaderInTrailerOnlyResponse) {
std::string expected_response(R"({"code":5,"message":"Resource not found"})");
const std::string expected_response(R"({"code":5,"message":"Resource not found"})");
EXPECT_CALL(encoder_callbacks_, addEncodedData(_, false))
.WillOnce(Invoke([&expected_response](Buffer::Instance& data, bool) {
EXPECT_EQ(expected_response, data.toString());
Expand All @@ -815,7 +812,7 @@ TEST_F(GrpcJsonTranscoderFilterConvertGrpcStatusTest,
// Also tests that a user-defined type from a proto descriptor in config can be used in details.
TEST_F(GrpcJsonTranscoderFilterConvertGrpcStatusTest,
TranscodingBinaryHeaderWithDetailsInTrailerOnlyResponse) {
std::string expected_response(
const std::string expected_response(
"{\"code\":5,\"message\":\"Error\",\"details\":"
"[{\"@type\":\"type.googleapis.com/helloworld.HelloReply\",\"message\":\"details\"}]}");
EXPECT_CALL(encoder_callbacks_, addEncodedData(_, false))
Expand Down Expand Up @@ -878,7 +875,7 @@ TEST_F(GrpcJsonTranscoderFilterConvertGrpcStatusTest, SkipTranscodingStatusIfBod
EXPECT_EQ(Http::FilterDataStatus::StopIterationAndBuffer,
filter_.encodeData(*response_data, false));

std::string response_json = response_data->toString();
const std::string response_json = response_data->toString();
EXPECT_EQ(R"({"id":"20","theme":"Children"})", response_json);

EXPECT_CALL(encoder_callbacks_, addEncodedData(_, _)).Times(0);
Expand All @@ -897,10 +894,8 @@ class GrpcJsonTranscoderFilterPrintTest
public GrpcJsonTranscoderFilterTestBase {
protected:
GrpcJsonTranscoderFilterPrintTest() {
auto json_config =
Json::Factory::loadFromString(TestEnvironment::substitute(GetParam().config_json_));
envoy::config::filter::http::transcoder::v2::GrpcJsonTranscoder proto_config{};
Envoy::Config::FilterJson::translateGrpcJsonTranscoder(*json_config, proto_config);
envoy::config::filter::http::transcoder::v2::GrpcJsonTranscoder proto_config;
TestUtility::loadFromJson(TestEnvironment::substitute(GetParam().config_json_), proto_config);
config_ = new JsonTranscoderConfig(proto_config, *api_);
filter_ = new JsonTranscoderFilter(*config_);
filter_->setDecoderFilterCallbacks(decoder_callbacks_);
Expand Down