envoyproxy · mattklein123 · Jul 2, 2021 · Jun 2, 2021 · Jun 8, 2021 · Jun 8, 2021
diff --git a/docs/root/operations/admin.rst b/docs/root/operations/admin.rst
@@ -194,6 +194,25 @@ modify different aspects of the server:
   field, use the mask query parameter documented above. If you want only a subset of fields from the repeated
   resource, use both as documented below.
 
+.. _operations_admin_interface_config_dump_by_name_regex:
+
+.. http:get:: /config_dump?name_regex={}
+
+  Dump only the currently loaded configurations whose names match the specified regex. Can be used with
+  both `resource` and `mask` query parameters.
+
+  For example, ``/config_dump?name_regex=.*substring.*`` would return all resource types
+  whose name field matches the given regex.
+
+  Per resource, the matched name field is:
+
+  - :ref:`envoy.config.listener.v3.Listener.name <envoy_v3_api_field_config.listener.v3.Listener.name>`
+  - :ref:`envoy.config.route.v3.RouteConfiguration.name <envoy_v3_api_field_config.route.v3.RouteConfiguration.name>`
+  - :ref:`envoy.config.route.v3.ScopedRouteConfiguration.name <envoy_v3_api_field_config.route.v3.ScopedRouteConfiguration.name>`
+  - :ref:`envoy.config.cluster.v3.Cluster.name <envoy_v3_api_field_config.cluster.v3.Cluster.name>`
+  - :ref:`envoy.extensions.transport_sockets.tls.v3.Secret <envoy_v3_api_field_extensions.transport_sockets.tls.v3.Secret.name>`
+  - :ref:`envoy.config.endpoint.v3.ClusterLoadAssignment <envoy_v3_api_field_config.endpoint.v3.ClusterLoadAssignment.cluster_name>`
+
 .. _operations_admin_interface_config_dump_by_resource_and_mask:
 
 .. http:get:: /config_dump?resource={}&mask={}

diff --git a/envoy/server/BUILD b/envoy/server/BUILD
@@ -53,6 +53,7 @@ envoy_cc_library(
     name = "config_tracker_interface",
     hdrs = ["config_tracker.h"],
     deps = [
+        "//envoy/common:matchers_interface",
         "//source/common/common:non_copyable",
         "//source/common/protobuf",
     ],

diff --git a/envoy/server/config_tracker.h b/envoy/server/config_tracker.h
@@ -4,6 +4,7 @@
 #include <map>
 #include <memory>
 
+#include "envoy/common/matchers.h"
 #include "envoy/common/pure.h"
 
 #include "source/common/common/non_copyable.h"
@@ -21,7 +22,9 @@ namespace Server {
  */
 class ConfigTracker {
 public:
-  using Cb = std::function<ProtobufTypes::MessagePtr()>;
+  // The passed StringMatcher will be matched against the `name` field of whatever
+  // proto is returned.
+  using Cb = std::function<ProtobufTypes::MessagePtr(const Matchers::StringMatcher&)>;
   using CbsMap = std::map<std::string, Cb>;
 
   /**

diff --git a/source/common/common/matchers.h b/source/common/common/matchers.h
@@ -76,6 +76,11 @@ class DoubleMatcher : public ValueMatcher {
   const envoy::type::matcher::v3::DoubleMatcher matcher_;
 };
 
+class UniversalStringMatcher : public StringMatcher {
+public:
+  bool match(absl::string_view) const override { return true; }
+};
+
 class StringMatcherImpl : public ValueMatcher, public StringMatcher {
 public:
   explicit StringMatcherImpl(const envoy::type::matcher::v3::StringMatcher& matcher);

diff --git a/source/common/config/config_provider_impl.cc b/source/common/config/config_provider_impl.cc
@@ -52,8 +52,9 @@ bool ConfigSubscriptionInstance::checkAndApplyConfigUpdate(const Protobuf::Messa
 
 ConfigProviderManagerImplBase::ConfigProviderManagerImplBase(Server::Admin& admin,
                                                              const std::string& config_name) {
-  config_tracker_entry_ =
-      admin.getConfigTracker().add(config_name, [this] { return dumpConfigs(); });
+  config_tracker_entry_ = admin.getConfigTracker().add(
+      config_name,
+      [this](const Matchers::StringMatcher& name_matcher) { return dumpConfigs(name_matcher); });
   // ConfigTracker keys must be unique. We are asserting that no one has stolen the key
   // from us, since the returned entry will be nullptr if the key already exists.
   RELEASE_ASSERT(config_tracker_entry_, "");

diff --git a/source/common/config/config_provider_impl.h b/source/common/config/config_provider_impl.h
@@ -383,7 +383,8 @@ class ConfigProviderManagerImplBase : public ConfigProviderManager, public Singl
    * @return ProtobufTypes::MessagePtr the config dump proto corresponding to the associated
    *                                   config providers.
    */
-  virtual ProtobufTypes::MessagePtr dumpConfigs() const PURE;
+  virtual ProtobufTypes::MessagePtr
+  dumpConfigs(const Matchers::StringMatcher& name_matcher) const PURE;
 
 protected:
   // Ordered set for deterministic config dump output.

diff --git a/source/common/router/rds_impl.cc b/source/common/router/rds_impl.cc
@@ -328,7 +328,9 @@ void RdsRouteConfigProviderImpl::requestVirtualHostsUpdate(
 
 RouteConfigProviderManagerImpl::RouteConfigProviderManagerImpl(Server::Admin& admin) {
   config_tracker_entry_ =
-      admin.getConfigTracker().add("routes", [this] { return dumpRouteConfigs(); });
+      admin.getConfigTracker().add("routes", [this](const Matchers::StringMatcher& matcher) {
+        return dumpRouteConfigs(matcher);
+      });
   // ConfigTracker keys must be unique. We are asserting that no one has stolen the "routes" key
   // from us, since the returned entry will be nullptr if the key already exists.
   RELEASE_ASSERT(config_tracker_entry_, "");
@@ -379,7 +381,8 @@ RouteConfigProviderPtr RouteConfigProviderManagerImpl::createStaticRouteConfigPr
 }
 
 std::unique_ptr<envoy::admin::v3::RoutesConfigDump>
-RouteConfigProviderManagerImpl::dumpRouteConfigs() const {
+RouteConfigProviderManagerImpl::dumpRouteConfigs(
+    const Matchers::StringMatcher& name_matcher) const {
   auto config_dump = std::make_unique<envoy::admin::v3::RoutesConfigDump>();
 
   for (const auto& element : dynamic_route_config_providers_) {
@@ -391,6 +394,9 @@ RouteConfigProviderManagerImpl::dumpRouteConfigs() const {
     ASSERT(subscription->route_config_provider_opt_.has_value());
 
     if (subscription->routeConfigUpdate()->configInfo()) {
+      if (!name_matcher.match(subscription->routeConfigUpdate()->protobufConfiguration().name())) {
+        continue;
+      }
       auto* dynamic_config = config_dump->mutable_dynamic_route_configs()->Add();
       dynamic_config->set_version_info(subscription->routeConfigUpdate()->configVersion());
       dynamic_config->mutable_route_config()->PackFrom(
@@ -402,6 +408,9 @@ RouteConfigProviderManagerImpl::dumpRouteConfigs() const {
 
   for (const auto& provider : static_route_config_providers_) {
     ASSERT(provider->configInfo());
+    if (!name_matcher.match(provider->configInfo().value().config_.name())) {
+      continue;
+    }
     auto* static_config = config_dump->mutable_static_route_configs()->Add();
     static_config->mutable_route_config()->PackFrom(
         API_RECOVER_ORIGINAL(provider->configInfo().value().config_));

diff --git a/source/common/router/rds_impl.h b/source/common/router/rds_impl.h
@@ -242,7 +242,8 @@ class RouteConfigProviderManagerImpl : public RouteConfigProviderManager,
 public:
   RouteConfigProviderManagerImpl(Server::Admin& admin);
 
-  std::unique_ptr<envoy::admin::v3::RoutesConfigDump> dumpRouteConfigs() const;
+  std::unique_ptr<envoy::admin::v3::RoutesConfigDump>
+  dumpRouteConfigs(const Matchers::StringMatcher& name_matcher) const;
 
   // RouteConfigProviderManager
   RouteConfigProviderSharedPtr createRdsRouteConfigProvider(

diff --git a/source/common/router/scoped_rds.cc b/source/common/router/scoped_rds.cc
@@ -521,7 +521,8 @@ ScopedRdsConfigProvider::ScopedRdsConfigProvider(
     ScopedRdsConfigSubscriptionSharedPtr&& subscription)
     : MutableConfigProviderCommonBase(std::move(subscription), ConfigProvider::ApiType::Delta) {}
 
-ProtobufTypes::MessagePtr ScopedRoutesConfigProviderManager::dumpConfigs() const {
+ProtobufTypes::MessagePtr
+ScopedRoutesConfigProviderManager::dumpConfigs(const Matchers::StringMatcher& name_matcher) const {
   auto config_dump = std::make_unique<envoy::admin::v3::ScopedRoutesConfigDump>();
   for (const auto& element : configSubscriptions()) {
     auto subscription = element.second.lock();
@@ -535,6 +536,9 @@ ProtobufTypes::MessagePtr ScopedRoutesConfigProviderManager::dumpConfigs() const
       dynamic_config->set_name(typed_subscription->name());
       const ScopedRouteMap& scoped_route_map = typed_subscription->scopedRouteMap();
       for (const auto& it : scoped_route_map) {
+        if (!name_matcher.match(it.second->configProto().name())) {
+          continue;
+        }
         dynamic_config->mutable_scoped_route_configs()->Add()->PackFrom(
             API_RECOVER_ORIGINAL(it.second->configProto()));
       }
@@ -550,6 +554,9 @@ ProtobufTypes::MessagePtr ScopedRoutesConfigProviderManager::dumpConfigs() const
     auto* inline_config = config_dump->mutable_inline_scoped_route_configs()->Add();
     inline_config->set_name(static_cast<InlineScopedRoutesConfigProvider*>(provider)->name());
     for (const auto& config_proto : protos_info.value().config_protos_) {
+      if (!name_matcher.match(config_proto->name())) {
+        continue;
+      }
       inline_config->mutable_scoped_route_configs()->Add()->PackFrom(
           API_RECOVER_ORIGINAL(*config_proto));
     }

diff --git a/source/common/router/scoped_rds.h b/source/common/router/scoped_rds.h
@@ -275,7 +275,7 @@ class ScopedRoutesConfigProviderManager : public Envoy::Config::ConfigProviderMa
   ~ScopedRoutesConfigProviderManager() override = default;
 
   // Envoy::Config::ConfigProviderManagerImplBase
-  ProtobufTypes::MessagePtr dumpConfigs() const override;
+  ProtobufTypes::MessagePtr dumpConfigs(const Matchers::StringMatcher& name_matcher) const override;
 
   // Envoy::Config::ConfigProviderManager
   Envoy::Config::ConfigProviderPtr