filter: add network filters to the upstreams

source/common/upstream/upstream_impl.cc

@@ -544,7 +544,7 @@ ClusterLoadReportStats ClusterInfoImpl::generateLoadReportStats(Stats::Scope& sc
 }
 
 // Implements the FactoryContext interface required by network filters.
-class ClusterInfoImpl::FactoryContextImpl : public Server::Configuration::CommonFactoryContext {
+class FactoryContextImpl : public Server::Configuration::CommonFactoryContext {
 public:
   // Create from a TransportSocketFactoryContext using parent stats_scope and runtime
   // other contexts taken from TransportSocketFactoryContext.
@@ -695,9 +695,9 @@ ClusterInfoImpl::ClusterInfoImpl(
     ENVOY_LOG(debug, "    name: {}", string_name);
     auto& factory = Config::Utility::getAndCheckFactory<
         Server::Configuration::NamedUpstreamNetworkFilterConfigFactory>(string_name);
-    auto message = factory.createEmptyConfigProto().get();
+    auto message = factory.createEmptyConfigProto();
     if (!proto_config.typed_config().value().empty()) {
-      proto_config.typed_config().UnpackTo(message);
+      proto_config.typed_config().UnpackTo(message.get());
     }
     Network::FilterFactoryCb callback =
         factory.createFilterFactoryFromProto(*message, *factory_context_);

source/common/upstream/upstream_impl.h

@@ -625,8 +625,6 @@ class ClusterInfoImpl : public ClusterInfo, protected Logger::Loggable<Logger::I
   const bool warm_hosts_;
   absl::optional<std::string> eds_service_name_;
   const absl::optional<envoy::api::v2::Cluster::CustomClusterType> cluster_type_;
-
-  class FactoryContextImpl;
   const std::unique_ptr<Server::Configuration::CommonFactoryContext> factory_context_;
   std::vector<Network::FilterFactoryCb> filter_factories_;
 };

test/common/upstream/cluster_manager_impl_test.cc

@@ -2708,7 +2708,7 @@ class TestUpstreamNetworkFilterConfigFactory
     };
   }
   ProtobufTypes::MessagePtr createEmptyConfigProto() override {
-    return ProtobufTypes::MessagePtr{new Envoy::ProtobufWkt::Empty()};
+    return std::make_unique<Envoy::ProtobufWkt::Empty>();
   }
   std::string name() override { return "envoy.test.filter"; }
 };

test/integration/cluster_filter_integration_test.cc

@@ -11,11 +11,13 @@ namespace {
 
 class PoliteFilter : public Network::Filter, Logger::Loggable<Logger::Id::filter> {
 public:
+  PoliteFilter(const ProtobufWkt::StringValue& value) : greeting(value.value()) {}
+
   Network::FilterStatus onData(Buffer::Instance& data, bool end_stream) override {
     ENVOY_CONN_LOG(debug, "polite: onData {} bytes {} end_stream", read_callbacks_->connection(),
                    data.length(), end_stream);
     if (!read_greeted_) {
-      Buffer::OwnedImpl greeter("surely ");
+      Buffer::OwnedImpl greeter(greeting);
       read_callbacks_->injectReadDataToFilterChain(greeter, false);
       read_greeted_ = true;
     }
@@ -44,6 +46,7 @@ class PoliteFilter : public Network::Filter, Logger::Loggable<Logger::Id::filter
   }
 
 private:
+  std::string greeting;
   Network::ReadFilterCallbacks* read_callbacks_{};
   Network::WriteFilterCallbacks* write_callbacks_{};
   bool read_greeted_{false};
@@ -54,15 +57,16 @@ class PoliteFilterConfigFactory
     : public Server::Configuration::NamedUpstreamNetworkFilterConfigFactory {
 public:
   Network::FilterFactoryCb
-  createFilterFactoryFromProto(const Protobuf::Message&,
+  createFilterFactoryFromProto(const Protobuf::Message& proto_config,
                                Server::Configuration::CommonFactoryContext&) override {
-    return [](Network::FilterManager& filter_manager) -> void {
-      filter_manager.addFilter(std::make_shared<PoliteFilter>());
+    auto config = dynamic_cast<const ProtobufWkt::StringValue&>(proto_config);
+    return [config](Network::FilterManager& filter_manager) -> void {
+      filter_manager.addFilter(std::make_shared<PoliteFilter>(config));
     };
   }
 
   ProtobufTypes::MessagePtr createEmptyConfigProto() override {
-    return ProtobufTypes::MessagePtr{new Envoy::ProtobufWkt::Empty()};
+    return std::make_unique<ProtobufWkt::StringValue>();
   }
 
   std::string name() override { return "envoy.upstream.polite"; }
@@ -84,6 +88,9 @@ class ClusterFilterIntegrationTest : public testing::TestWithParam<Network::Addr
       auto* cluster_0 = bootstrap.mutable_static_resources()->mutable_clusters(0);
       auto* filter = cluster_0->add_filters();
       filter->set_name("envoy.upstream.polite");
+      ProtobufWkt::StringValue config;
+      config.set_value("surely ");
+      filter->mutable_typed_config()->PackFrom(config);
     });
     BaseIntegrationTest::initialize();
   }