ecds: move filter config files out of http/ (#17701)

Refactoring in preparation for #14696 (see #14696 (comment))

Risk Level: Low
Testing: Existing

#14696

Signed-off-by: Taylor Barrella <tabarr@google.com>

Author: tbarrella

envoy/filter/http/BUILD envoy/filter/BUILD

@@ -9,8 +9,8 @@ licenses(["notice"])  # Apache 2
 envoy_package()
 
 envoy_cc_library(
-    name = "filter_config_provider_interface",
-    hdrs = ["filter_config_provider.h"],
+    name = "config_provider_manager_interface",
+    hdrs = ["config_provider_manager.h"],
     deps = [
         "//envoy/config:extension_config_provider_interface",
         "//envoy/http:filter_interface",

envoy/filter/http/filter_config_provider.h envoy/filter/config_provider_manager.h

@@ -10,7 +10,6 @@
 
 namespace Envoy {
 namespace Filter {
-namespace Http {
 
 using FilterConfigProvider =
     Envoy::Config::ExtensionConfigProvider<Server::Configuration::NamedHttpFilterConfigFactory,
@@ -55,6 +54,5 @@ class FilterConfigProviderManager {
                                    const std::string& filter_config_name) PURE;
 };
 
-} // namespace Http
 } // namespace Filter
 } // namespace Envoy

source/common/filter/http/BUILD source/common/filter/BUILD

@@ -9,12 +9,12 @@ licenses(["notice"])  # Apache 2
 envoy_package()
 
 envoy_cc_library(
-    name = "filter_config_discovery_lib",
-    srcs = ["filter_config_discovery_impl.cc"],
-    hdrs = ["filter_config_discovery_impl.h"],
+    name = "config_discovery_lib",
+    srcs = ["config_discovery_impl.cc"],
+    hdrs = ["config_discovery_impl.h"],
     deps = [
         "//envoy/config:subscription_interface",
-        "//envoy/filter/http:filter_config_provider_interface",
+        "//envoy/filter:config_provider_manager_interface",
         "//envoy/singleton:instance_interface",
         "//envoy/stats:stats_macros",
         "//envoy/thread_local:thread_local_interface",

source/common/filter/http/filter_config_discovery_impl.cc source/common/filter/config_discovery_impl.cc

@@ -1,4 +1,4 @@
-#include "source/common/filter/http/filter_config_discovery_impl.h"
+#include "source/common/filter/config_discovery_impl.h"
 
 #include "envoy/config/core/v3/extension.pb.h"
 #include "envoy/config/core/v3/extension.pb.validate.h"
@@ -16,7 +16,6 @@
 
 namespace Envoy {
 namespace Filter {
-namespace Http {
 
 namespace {
 void validateTypeUrlHelper(const std::string& type_url,
@@ -339,6 +338,5 @@ DynamicFilterConfigProviderPtr FilterConfigProviderManagerImpl::createDynamicFil
   return provider;
 }
 
-} // namespace Http
 } // namespace Filter
 } // namespace Envoy

source/common/filter/http/filter_config_discovery_impl.h source/common/filter/config_discovery_impl.h

@@ -4,7 +4,7 @@
 #include "envoy/config/core/v3/extension.pb.validate.h"
 #include "envoy/config/extension_config_provider.h"
 #include "envoy/config/subscription.h"
-#include "envoy/filter/http/filter_config_provider.h"
+#include "envoy/filter/config_provider_manager.h"
 #include "envoy/http/filter.h"
 #include "envoy/protobuf/message_validator.h"
 #include "envoy/server/factory_context.h"
@@ -22,7 +22,6 @@
 
 namespace Envoy {
 namespace Filter {
-namespace Http {
 
 class FilterConfigProviderManagerImpl;
 class FilterConfigSubscription;
@@ -211,6 +210,7 @@ class FilterConfigProviderManagerImpl : public FilterConfigProviderManager,
   friend class FilterConfigSubscription;
 };
 
-} // namespace Http
+class HttpFilterConfigProviderManagerImpl : public FilterConfigProviderManagerImpl {};
+
 } // namespace Filter
 } // namespace Envoy

source/extensions/filters/http/health_check/BUILD

@@ -39,7 +39,7 @@ envoy_cc_extension(
     hdrs = ["config.h"],
     # Legacy test use. TODO(#9953) clean up.
     extra_visibility = [
-        "//test/common/filter/http:__subpackages__",
+        "//test/common/filter:__subpackages__",
         "//test/integration:__subpackages__",
         "//test/server:__subpackages__",
     ],

source/extensions/filters/network/http_connection_manager/BUILD

@@ -36,7 +36,7 @@ envoy_cc_extension(
         "//source/common/access_log:access_log_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/config:utility_lib",
-        "//source/common/filter/http:filter_config_discovery_lib",
+        "//source/common/filter:config_discovery_lib",
         "//source/common/http:conn_manager_lib",
         "//source/common/http:default_server_string_lib",
         "//source/common/http:request_id_extension_lib",

source/extensions/filters/network/http_connection_manager/config.cc

@@ -20,7 +20,7 @@
 #include "source/common/access_log/access_log_impl.h"
 #include "source/common/common/fmt.h"
 #include "source/common/config/utility.h"
-#include "source/common/filter/http/filter_config_discovery_impl.h"
+#include "source/common/filter/config_discovery_impl.h"
 #include "source/common/http/conn_manager_config.h"
 #include "source/common/http/conn_manager_utility.h"
 #include "source/common/http/default_server_string.h"
@@ -176,10 +176,10 @@ Utility::Singletons Utility::createSingletons(Server::Configuration::FactoryCont
                 context.getServerFactoryContext(), context.messageValidationVisitor()));
       });
 
-  std::shared_ptr<Filter::Http::FilterConfigProviderManager> filter_config_provider_manager =
-      context.singletonManager().getTyped<Filter::Http::FilterConfigProviderManager>(
+  std::shared_ptr<FilterConfigProviderManager> filter_config_provider_manager =
+      context.singletonManager().getTyped<FilterConfigProviderManager>(
           SINGLETON_MANAGER_REGISTERED_NAME(filter_config_provider_manager),
-          [] { return std::make_shared<Filter::Http::FilterConfigProviderManagerImpl>(); });
+          [] { return std::make_shared<Filter::HttpFilterConfigProviderManagerImpl>(); });
 
   return {date_provider, route_config_provider_manager, scoped_routes_config_provider_manager,
           http_tracer_manager, filter_config_provider_manager};
@@ -192,7 +192,7 @@ std::shared_ptr<HttpConnectionManagerConfig> Utility::createConfig(
     Router::RouteConfigProviderManager& route_config_provider_manager,
     Config::ConfigProviderManager& scoped_routes_config_provider_manager,
     Tracing::HttpTracerManager& http_tracer_manager,
-    Filter::Http::FilterConfigProviderManager& filter_config_provider_manager) {
+    FilterConfigProviderManager& filter_config_provider_manager) {
   return std::make_shared<HttpConnectionManagerConfig>(
       proto_config, context, date_provider, route_config_provider_manager,
       scoped_routes_config_provider_manager, http_tracer_manager, filter_config_provider_manager);
@@ -263,7 +263,7 @@ HttpConnectionManagerConfig::HttpConnectionManagerConfig(
     Router::RouteConfigProviderManager& route_config_provider_manager,
     Config::ConfigProviderManager& scoped_routes_config_provider_manager,
     Tracing::HttpTracerManager& http_tracer_manager,
-    Filter::Http::FilterConfigProviderManager& filter_config_provider_manager)
+    FilterConfigProviderManager& filter_config_provider_manager)
     : context_(context), stats_prefix_(fmt::format("http.{}.", config.stat_prefix())),
       stats_(Http::ConnectionManagerImpl::generateStats(stats_prefix_, context_.scope())),
       tracing_stats_(

source/extensions/filters/network/http_connection_manager/config.h

@@ -11,7 +11,7 @@
 #include "envoy/config/core/v3/extension.pb.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.validate.h"
-#include "envoy/filter/http/filter_config_provider.h"
+#include "envoy/filter/config_provider_manager.h"
 #include "envoy/http/filter.h"
 #include "envoy/http/original_ip_detection.h"
 #include "envoy/http/request_id_extension.h"
@@ -39,6 +39,8 @@ namespace Extensions {
 namespace NetworkFilters {
 namespace HttpConnectionManager {
 
+using FilterConfigProviderManager = Filter::FilterConfigProviderManager;
+
 /**
  * Config registration for the HTTP connection manager filter. @see NamedNetworkFilterConfigFactory.
  */
@@ -119,11 +121,11 @@ class HttpConnectionManagerConfig : Logger::Loggable<Logger::Id::config>,
       Router::RouteConfigProviderManager& route_config_provider_manager,
       Config::ConfigProviderManager& scoped_routes_config_provider_manager,
       Tracing::HttpTracerManager& http_tracer_manager,
-      Filter::Http::FilterConfigProviderManager& filter_config_provider_manager);
+      FilterConfigProviderManager& filter_config_provider_manager);
 
   // Http::FilterChainFactory
   void createFilterChain(Http::FilterChainFactoryCallbacks& callbacks) override;
-  using FilterFactoriesList = std::list<Filter::Http::FilterConfigProviderPtr>;
+  using FilterFactoriesList = std::list<Filter::FilterConfigProviderPtr>;
   struct FilterConfig {
     std::unique_ptr<FilterFactoriesList> filter_factories;
     bool allow_upgrade;
@@ -264,7 +266,7 @@ class HttpConnectionManagerConfig : Logger::Loggable<Logger::Id::config>,
   std::vector<Http::ClientCertDetailsType> set_current_client_cert_details_;
   Router::RouteConfigProviderManager& route_config_provider_manager_;
   Config::ConfigProviderManager& scoped_routes_config_provider_manager_;
-  Filter::Http::FilterConfigProviderManager& filter_config_provider_manager_;
+  FilterConfigProviderManager& filter_config_provider_manager_;
   CodecType codec_type_;
   envoy::config::core::v3::Http3ProtocolOptions http3_options_;
   envoy::config::core::v3::Http2ProtocolOptions http2_options_;
@@ -337,7 +339,7 @@ class Utility {
     Router::RouteConfigProviderManagerSharedPtr route_config_provider_manager_;
     Router::ScopedRoutesConfigProviderManagerSharedPtr scoped_routes_config_provider_manager_;
     Tracing::HttpTracerManagerSharedPtr http_tracer_manager_;
-    std::shared_ptr<Filter::Http::FilterConfigProviderManager> filter_config_provider_manager_;
+    std::shared_ptr<FilterConfigProviderManager> filter_config_provider_manager_;
   };
 
   /**
@@ -365,7 +367,7 @@ class Utility {
       Router::RouteConfigProviderManager& route_config_provider_manager,
       Config::ConfigProviderManager& scoped_routes_config_provider_manager,
       Tracing::HttpTracerManager& http_tracer_manager,
-      Filter::Http::FilterConfigProviderManager& filter_config_provider_manager);
+      FilterConfigProviderManager& filter_config_provider_manager);
 };
 
 } // namespace HttpConnectionManager

test/common/filter/http/BUILD test/common/filter/BUILD

@@ -9,11 +9,11 @@ licenses(["notice"])  # Apache 2
 envoy_package()
 
 envoy_cc_test(
-    name = "filter_config_discovery_impl_test",
-    srcs = ["filter_config_discovery_impl_test.cc"],
+    name = "config_discovery_impl_test",
+    srcs = ["config_discovery_impl_test.cc"],
     deps = [
         "//source/common/config:utility_lib",
-        "//source/common/filter/http:filter_config_discovery_lib",
+        "//source/common/filter:config_discovery_lib",
         "//source/common/json:json_loader_lib",
         "//source/extensions/filters/http/health_check:config",
         "//source/extensions/filters/http/router:config",

test/common/filter/http/filter_config_discovery_impl_test.cc test/common/filter/config_discovery_impl_test.cc

@@ -9,7 +9,7 @@
 #include "envoy/stats/scope.h"
 
 #include "source/common/config/utility.h"
-#include "source/common/filter/http/filter_config_discovery_impl.h"
+#include "source/common/filter/config_discovery_impl.h"
 #include "source/common/json/json_loader.h"
 
 #include "test/mocks/init/mocks.h"
@@ -34,7 +34,6 @@ using testing::ReturnRef;
 
 namespace Envoy {
 namespace Filter {
-namespace Http {
 namespace {
 
 class FilterConfigDiscoveryTestBase : public testing::Test {
@@ -73,7 +72,7 @@ class FilterConfigDiscoveryTestBase : public testing::Test {
 class FilterConfigDiscoveryImplTest : public FilterConfigDiscoveryTestBase {
 public:
   FilterConfigDiscoveryImplTest() {
-    filter_config_provider_manager_ = std::make_unique<FilterConfigProviderManagerImpl>();
+    filter_config_provider_manager_ = std::make_unique<HttpFilterConfigProviderManagerImpl>();
   }
   ~FilterConfigDiscoveryImplTest() override { factory_context_.thread_local_.shutdownThread(); }
 
@@ -406,6 +405,5 @@ TEST_F(FilterConfigDiscoveryImplTest, TerminalFilterInvalid) {
 }
 
 } // namespace
-} // namespace Http
 } // namespace Filter
 } // namespace Envoy

test/extensions/filters/network/http_connection_manager/BUILD

@@ -25,7 +25,7 @@ envoy_extension_cc_test_library(
     extension_names = ["envoy.filters.network.http_connection_manager"],
     deps = [
         ":config_cc_proto",
-        "//source/common/filter/http:filter_config_discovery_lib",
+        "//source/common/filter:config_discovery_lib",
         "//source/common/network:address_lib",
         "//source/extensions/filters/http/common:factory_base_lib",
         "//source/extensions/filters/http/common:pass_through_filter_lib",

test/extensions/filters/network/http_connection_manager/config_test_base.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "source/common/filter/http/filter_config_discovery_impl.h"
+#include "source/common/filter/config_discovery_impl.h"
 #include "source/common/http/date_provider_impl.h"
 #include "source/common/network/address_impl.h"
 #include "source/extensions/filters/http/common/factory_base.h"
@@ -38,7 +38,7 @@ class HttpConnectionManagerConfigTest : public testing::Test {
   NiceMock<Router::MockRouteConfigProviderManager> route_config_provider_manager_;
   NiceMock<Config::MockConfigProviderManager> scoped_routes_config_provider_manager_;
   NiceMock<Tracing::MockHttpTracerManager> http_tracer_manager_;
-  Filter::Http::FilterConfigProviderManagerImpl filter_config_provider_manager_;
+  Filter::HttpFilterConfigProviderManagerImpl filter_config_provider_manager_;
   std::shared_ptr<NiceMock<Tracing::MockHttpTracer>> http_tracer_{
       std::make_shared<NiceMock<Tracing::MockHttpTracer>>()};
   void createHttpConnectionManagerConfig(const std::string& yaml) {