Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions source/extensions/filters/http/grpc_web/config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ Http::FilterFactoryCb GrpcWebFilterConfig::createFilterFactoryFromProtoTyped(
};
}

Http::FilterFactoryCb GrpcWebFilterConfig::createFilterFactoryFromProtoWithServerContextTyped(
const envoy::extensions::filters::http::grpc_web::v3::GrpcWeb&, const std::string&,
Server::Configuration::ServerFactoryContext& factory_context) {
return [&factory_context](Http::FilterChainFactoryCallbacks& callbacks) {
callbacks.addStreamFilter(std::make_shared<GrpcWebFilter>(factory_context.grpcContext()));
};
}

/**
* Static registration for the gRPC-Web filter. @see RegisterFactory.
*/
Expand Down
5 changes: 5 additions & 0 deletions source/extensions/filters/http/grpc_web/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ class GrpcWebFilterConfig
const envoy::extensions::filters::http::grpc_web::v3::GrpcWeb& proto_config,
const std::string& stats_prefix,
Server::Configuration::FactoryContext& factory_context) override;

Http::FilterFactoryCb createFilterFactoryFromProtoWithServerContextTyped(
const envoy::extensions::filters::http::grpc_web::v3::GrpcWeb& proto_config,
const std::string& stats_prefix,
Server::Configuration::ServerFactoryContext& factory_context) override;
};

} // namespace GrpcWeb
Expand Down
11 changes: 11 additions & 0 deletions test/extensions/filters/http/grpc_web/config_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@ TEST(GrpcWebFilterConfigTest, GrpcWebFilter) {
cb(filter_callback);
}

TEST(GrpcWebFilterConfigTest, GrpcWebFilterWithServerContext) {
NiceMock<Server::Configuration::MockServerFactoryContext> context;
GrpcWebFilterConfig factory;
envoy::extensions::filters::http::grpc_web::v3::GrpcWeb config;
Http::FilterFactoryCb cb =
factory.createFilterFactoryFromProtoWithServerContext(config, "stats", context);
Http::MockFilterChainFactoryCallbacks filter_callback;
EXPECT_CALL(filter_callback, addStreamFilter(_));
cb(filter_callback);
}

} // namespace
} // namespace GrpcWeb
} // namespace HttpFilters
Expand Down
Loading