Listener ECDS: Adding config provider manager implemantion for listener filter

envoy/filter/config_provider_manager.h

@@ -23,7 +23,7 @@ using DynamicFilterConfigProviderPtr = std::unique_ptr<DynamicFilterConfigProvid
  * The FilterConfigProviderManager exposes the ability to get an FilterConfigProvider
  * for both static and dynamic filter config providers.
  */
-template <class FactoryCb> class FilterConfigProviderManager {
+template <class FactoryCb, class FactoryCtx> class FilterConfigProviderManager {
 public:
   virtual ~FilterConfigProviderManager() = default;
 
@@ -40,7 +40,7 @@ template <class FactoryCb> class FilterConfigProviderManager {
    */
   virtual DynamicFilterConfigProviderPtr<FactoryCb> createDynamicFilterConfigProvider(
       const envoy::config::core::v3::ExtensionConfigSource& config_source,
-      const std::string& filter_config_name, Server::Configuration::FactoryContext& factory_context,
+      const std::string& filter_config_name, FactoryCtx& factory_context,
       const std::string& stat_prefix, bool last_filter_in_filter_chain,
       const std::string& filter_chain_type) PURE;
 

source/common/filter/config_discovery_impl.cc

@@ -17,6 +17,8 @@ namespace Envoy {
 namespace Filter {
 
 constexpr absl::string_view HttpStatPrefix = "http_filter.";
+constexpr absl::string_view TcpListenerStatPrefix = "tcp_listener_filter.";
+constexpr absl::string_view UdpListenerStatPrefix = "udp_listener_filter.";
 
 namespace {
 void validateTypeUrlHelper(const std::string& type_url,
@@ -232,18 +234,7 @@ void FilterConfigProviderManagerImplBase::applyLastOrDefaultConfig(
   }
 }
 
-std::tuple<ProtobufTypes::MessagePtr, std::string> HttpFilterConfigProviderManagerImpl::getMessage(
-    const envoy::config::core::v3::TypedExtensionConfig& filter_config,
-    Server::Configuration::ServerFactoryContext& factory_context) const {
-  auto& factory =
-      Config::Utility::getAndCheckFactory<Server::Configuration::NamedHttpFilterConfigFactory>(
-          filter_config);
-  ProtobufTypes::MessagePtr message = Config::Utility::translateAnyToFactoryConfig(
-      filter_config.typed_config(),
-      factory_context.messageValidationContext().dynamicValidationVisitor(), factory);
-  return {std::move(message), factory.name()};
-}
-
+// HTTP filter
 absl::string_view HttpFilterConfigProviderManagerImpl::statPrefix() const { return HttpStatPrefix; }
 
 ProtobufTypes::MessagePtr HttpFilterConfigProviderManagerImpl::getDefaultConfig(
@@ -269,5 +260,85 @@ ProtobufTypes::MessagePtr HttpFilterConfigProviderManagerImpl::getDefaultConfig(
   return message;
 }
 
+std::unique_ptr<DynamicFilterConfigProviderImpl<Http::FilterFactoryCb>>
+HttpFilterConfigProviderManagerImpl::createFilterConfigProviderImpl(
+    FilterConfigSubscriptionSharedPtr& subscription,
+    const absl::flat_hash_set<std::string>& require_type_urls,
+    Server::Configuration::FactoryContext& factory_context,
+    ProtobufTypes::MessagePtr&& default_config, bool last_filter_in_filter_chain,
+    const std::string& filter_chain_type, absl::string_view stat_prefix) {
+  return std::make_unique<HttpDynamicFilterConfigProviderImpl>(
+      subscription, require_type_urls, factory_context, std::move(default_config),
+      last_filter_in_filter_chain, filter_chain_type, stat_prefix);
+}
+
+// TCP listener filter
+absl::string_view TcpListenerFilterConfigProviderManagerImpl::statPrefix() const {
+  return TcpListenerStatPrefix;
+}
+
+ProtobufTypes::MessagePtr TcpListenerFilterConfigProviderManagerImpl::getDefaultConfig(
+    const ProtobufWkt::Any& proto_config, const std::string& filter_config_name,
+    Server::Configuration::ListenerFactoryContext& factory_context, bool, const std::string&,
+    const absl::flat_hash_set<std::string>& require_type_urls) const {
+  auto* default_factory =
+      Config::Utility::getFactoryByType<Server::Configuration::NamedListenerFilterConfigFactory>(
+          proto_config);
+  if (default_factory == nullptr) {
+    throw EnvoyException(fmt::format("Error: cannot find filter factory {} for default filter "
+                                     "configuration with type URL {}.",
+                                     filter_config_name, proto_config.type_url()));
+  }
+  validateTypeUrlHelper(Config::Utility::getFactoryType(proto_config), require_type_urls);
+  return Config::Utility::translateAnyToFactoryConfig(
+      proto_config, factory_context.messageValidationVisitor(), *default_factory);
+}
+
+std::unique_ptr<DynamicFilterConfigProviderImpl<Network::ListenerFilterFactoryCb>>
+TcpListenerFilterConfigProviderManagerImpl::createFilterConfigProviderImpl(
+    FilterConfigSubscriptionSharedPtr& subscription,
+    const absl::flat_hash_set<std::string>& require_type_urls,
+    Server::Configuration::ListenerFactoryContext& factory_context,
+    ProtobufTypes::MessagePtr&& default_config, bool last_filter_in_filter_chain,
+    const std::string& filter_chain_type, absl::string_view stat_prefix) {
+  return std::make_unique<TcpListenerDynamicFilterConfigProviderImpl>(
+      subscription, require_type_urls, factory_context, std::move(default_config),
+      last_filter_in_filter_chain, filter_chain_type, stat_prefix);
+}
+
+// UDP listener filter
+absl::string_view UdpListenerFilterConfigProviderManagerImpl::statPrefix() const {
+  return UdpListenerStatPrefix;
+}
+
+ProtobufTypes::MessagePtr UdpListenerFilterConfigProviderManagerImpl::getDefaultConfig(
+    const ProtobufWkt::Any& proto_config, const std::string& filter_config_name,
+    Server::Configuration::ListenerFactoryContext& factory_context, bool, const std::string&,
+    const absl::flat_hash_set<std::string>& require_type_urls) const {
+  auto* default_factory =
+      Config::Utility::getFactoryByType<Server::Configuration::NamedUdpListenerFilterConfigFactory>(
+          proto_config);
+  if (default_factory == nullptr) {
+    throw EnvoyException(fmt::format("Error: cannot find filter factory {} for default filter "
+                                     "configuration with type URL {}.",
+                                     filter_config_name, proto_config.type_url()));
+  }
+  validateTypeUrlHelper(Config::Utility::getFactoryType(proto_config), require_type_urls);
+  return Config::Utility::translateAnyToFactoryConfig(
+      proto_config, factory_context.messageValidationVisitor(), *default_factory);
+}
+
+std::unique_ptr<DynamicFilterConfigProviderImpl<Network::UdpListenerFilterFactoryCb>>
+UdpListenerFilterConfigProviderManagerImpl::createFilterConfigProviderImpl(
+    FilterConfigSubscriptionSharedPtr& subscription,
+    const absl::flat_hash_set<std::string>& require_type_urls,
+    Server::Configuration::ListenerFactoryContext& factory_context,
+    ProtobufTypes::MessagePtr&& default_config, bool last_filter_in_filter_chain,
+    const std::string& filter_chain_type, absl::string_view stat_prefix) {
+  return std::make_unique<UdpListenerDynamicFilterConfigProviderImpl>(
+      subscription, require_type_urls, factory_context, std::move(default_config),
+      last_filter_in_filter_chain, filter_chain_type, stat_prefix);
+}
+
 } // namespace Filter
 } // namespace Envoy