thrift: adding xDS RDS support for thrift proxy.

api/envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 
 package envoy.extensions.filters.network.thrift_proxy.v3;
 
+import "envoy/config/core/v3/config_source.proto";
 import "envoy/extensions/filters/network/thrift_proxy/v3/route.proto";
 
 import "google/protobuf/any.proto";
@@ -58,7 +59,7 @@ enum ProtocolType {
   TWITTER = 4;
 }
 
-// [#next-free-field: 8]
+// [#next-free-field: 9]
 message ThriftProxy {
   option (udpa.annotations.versioning).previous_message_type =
       "envoy.config.filter.network.thrift_proxy.v2alpha1.ThriftProxy";
@@ -92,6 +93,9 @@ message ThriftProxy {
 
   // Optional maximum requests for a single downstream connection. If not specified, there is no limit.
   google.protobuf.UInt32Value max_requests_per_connection = 7;
+
+  // Use xDS to fetch the route configuration. If both route_config and rds defined, rds has priority.
+  Rds rds = 8;
 }
 
 // ThriftFilter configures a Thrift filter.
@@ -138,3 +142,9 @@ message ThriftProtocolOptions {
   // which is the default, causes the proxy to use the same protocol as the downstream connection.
   ProtocolType protocol = 2 [(validate.rules).enum = {defined_only: true}];
 }
+
+message Rds {
+  config.core.v3.ConfigSource config_source = 1 [(validate.rules).message = {required: true}];
+
+  string route_config_name = 2;
+}

api/envoy/extensions/filters/network/thrift_proxy/v4alpha/thrift_proxy.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 
 package envoy.extensions.filters.network.thrift_proxy.v4alpha;
 
+import "envoy/config/core/v4alpha/config_source.proto";
 import "envoy/extensions/filters/network/thrift_proxy/v4alpha/route.proto";
 
 import "google/protobuf/any.proto";
@@ -58,7 +59,7 @@ enum ProtocolType {
   TWITTER = 4;
 }
 
-// [#next-free-field: 8]
+// [#next-free-field: 9]
 message ThriftProxy {
   option (udpa.annotations.versioning).previous_message_type =
       "envoy.extensions.filters.network.thrift_proxy.v3.ThriftProxy";
@@ -92,6 +93,9 @@ message ThriftProxy {
 
   // Optional maximum requests for a single downstream connection. If not specified, there is no limit.
   google.protobuf.UInt32Value max_requests_per_connection = 7;
+
+  // Use xDS to fetch the route configuration. If both route_config and rds defined, rds has priority.
+  Rds rds = 8;
 }
 
 // ThriftFilter configures a Thrift filter.
@@ -138,3 +142,12 @@ message ThriftProtocolOptions {
   // which is the default, causes the proxy to use the same protocol as the downstream connection.
   ProtocolType protocol = 2 [(validate.rules).enum = {defined_only: true}];
 }
+
+message Rds {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.extensions.filters.network.thrift_proxy.v3.Rds";
+
+  config.core.v4alpha.ConfigSource config_source = 1 [(validate.rules).message = {required: true}];
+
+  string route_config_name = 2;
+}

source/extensions/filters/network/thrift_proxy/BUILD

@@ -55,6 +55,7 @@ envoy_cc_extension(
         "//source/extensions/filters/network:well_known_names",
         "//source/extensions/filters/network/common:factory_base_lib",
         "//source/extensions/filters/network/thrift_proxy/filters:filter_config_interface",
+        "//source/extensions/filters/network/thrift_proxy/router:rds_lib",
         "//source/extensions/filters/network/thrift_proxy/router:router_lib",
         "@envoy_api//envoy/extensions/filters/network/thrift_proxy/v3:pkg_cc_proto",
     ],

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

@@ -16,6 +16,7 @@
 #include "source/extensions/filters/network/thrift_proxy/decoder.h"
 #include "source/extensions/filters/network/thrift_proxy/filters/filter_config.h"
 #include "source/extensions/filters/network/thrift_proxy/framed_transport_impl.h"
+#include "source/extensions/filters/network/thrift_proxy/router/rds_impl.h"
 #include "source/extensions/filters/network/thrift_proxy/stats.h"
 #include "source/extensions/filters/network/thrift_proxy/unframed_transport_impl.h"
 
@@ -96,12 +97,22 @@ ProtocolType ProtocolOptionsConfigImpl::protocol(ProtocolType downstream_protoco
   return (protocol_ == ProtocolType::Auto) ? downstream_protocol : protocol_;
 }
 
+SINGLETON_MANAGER_REGISTRATION(thrift_route_config_provider_manager);
+
 Network::FilterFactoryCb ThriftProxyFilterConfigFactory::createFilterFactoryFromProtoTyped(
     const envoy::extensions::filters::network::thrift_proxy::v3::ThriftProxy& proto_config,
     Server::Configuration::FactoryContext& context) {
-  std::shared_ptr<Config> filter_config(new ConfigImpl(proto_config, context));
+  std::shared_ptr<Router::RouteConfigProviderManager> route_config_provider_manager =
+      context.singletonManager().getTyped<Router::RouteConfigProviderManager>(
+          SINGLETON_MANAGER_REGISTERED_NAME(thrift_route_config_provider_manager), [&context] {
+            return std::make_shared<Router::RouteConfigProviderManagerImpl>(context.admin());
+          });
+
+  std::shared_ptr<Config> filter_config(
+      new ConfigImpl(proto_config, context, *route_config_provider_manager));
 
-  return [filter_config, &context](Network::FilterManager& filter_manager) -> void {
+  return [route_config_provider_manager, filter_config,
+          &context](Network::FilterManager& filter_manager) -> void {
     filter_manager.addReadFilter(std::make_shared<ConnectionManager>(
         *filter_config, context.api().randomGenerator(), context.dispatcher().timeSource()));
   };
@@ -115,11 +126,11 @@ REGISTER_FACTORY(ThriftProxyFilterConfigFactory,
 
 ConfigImpl::ConfigImpl(
     const envoy::extensions::filters::network::thrift_proxy::v3::ThriftProxy& config,
-    Server::Configuration::FactoryContext& context)
+    Server::Configuration::FactoryContext& context,
+    Router::RouteConfigProviderManager& route_config_provider_manager)
     : context_(context), stats_prefix_(fmt::format("thrift.{}.", config.stat_prefix())),
       stats_(ThriftFilterStats::generateStats(stats_prefix_, context_.scope())),
       transport_(lookupTransport(config.transport())), proto_(lookupProtocol(config.protocol())),
-      route_matcher_(new Router::RouteMatcher(config.route_config())),
       payload_passthrough_(config.payload_passthrough()),
       max_requests_per_connection_(config.max_requests_per_connection().value()) {
 
@@ -134,6 +145,14 @@ ConfigImpl::ConfigImpl(
       processFilter(filter);
     }
   }
+
+  if (config.has_rds()) {
+    route_config_provider_ = route_config_provider_manager.createRdsRouteConfigProvider(
+        config.rds(), context_.getServerFactoryContext(), stats_prefix_, context_.initManager());
+  } else {
+    route_config_provider_ = route_config_provider_manager.createStaticRouteConfigProvider(
+        config.route_config(), context_.getServerFactoryContext());
+  }
 }
 
 void ConfigImpl::createFilterChain(ThriftFilters::FilterChainFactoryCallbacks& callbacks) {

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

@@ -10,6 +10,8 @@
 #include "source/extensions/filters/network/thrift_proxy/conn_manager.h"
 #include "source/extensions/filters/network/thrift_proxy/filters/filter.h"
 #include "source/extensions/filters/network/thrift_proxy/protocol_options_config.h"
+#include "source/extensions/filters/network/thrift_proxy/router/rds.h"
+#include "source/extensions/filters/network/thrift_proxy/router/route_config_provider_manager.h"
 #include "source/extensions/filters/network/thrift_proxy/router/router_impl.h"
 #include "source/extensions/filters/network/well_known_names.h"
 
@@ -65,15 +67,16 @@ class ConfigImpl : public Config,
                    Logger::Loggable<Logger::Id::config> {
 public:
   ConfigImpl(const envoy::extensions::filters::network::thrift_proxy::v3::ThriftProxy& config,
-             Server::Configuration::FactoryContext& context);
+             Server::Configuration::FactoryContext& context,
+             Router::RouteConfigProviderManager& route_config_provider_manager);
 
   // ThriftFilters::FilterChainFactory
   void createFilterChain(ThriftFilters::FilterChainFactoryCallbacks& callbacks) override;
 
   // Router::Config
   Router::RouteConstSharedPtr route(const MessageMetadata& metadata,
                                     uint64_t random_value) const override {
-    return route_matcher_->route(metadata, random_value);
+    return route_config_provider_->config()->route(metadata, random_value);
   }
 
   // Config
@@ -94,7 +97,7 @@ class ConfigImpl : public Config,
   ThriftFilterStats stats_;
   const TransportType transport_;
   const ProtocolType proto_;
-  std::unique_ptr<Router::RouteMatcher> route_matcher_;
+  Router::RouteConfigProviderSharedPtr route_config_provider_;
 
   std::list<ThriftFilters::FilterFactoryCb> filter_factories_;
   const bool payload_passthrough_;

source/extensions/filters/network/thrift_proxy/router/BUILD

@@ -127,3 +127,44 @@ envoy_cc_library(
         "@envoy_api//envoy/config/route/v3:pkg_cc_proto",
     ],
 )
+
+envoy_cc_library(
+    name = "rds_interface",
+    hdrs = ["rds.h"],
+    deps = [
+        ":router_interface",
+        "@envoy_api//envoy/extensions/filters/network/thrift_proxy/v3:pkg_cc_proto",
+    ],
+)
+
+envoy_cc_library(
+    name = "rds_lib",
+    srcs = [
+        "rds_impl.cc",
+        "route_config_update_receiver_impl.cc",
+    ],
+    hdrs = [
+        "rds_impl.h",
+        "route_config_provider_manager.h",
+        "route_config_update_receiver.h",
+        "route_config_update_receiver_impl.h",
+    ],
+    deps = [
+        ":config",
+        ":rds_interface",
+        "//envoy/common:time_interface",
+        "//envoy/config:subscription_interface",
+        "//envoy/local_info:local_info_interface",
+        "//source/common/config:api_version_lib",
+        "//source/common/config:subscription_base_interface",
+        "//source/common/config:utility_lib",
+        "//source/common/init:manager_lib",
+        "//source/common/init:target_lib",
+        "//source/common/protobuf:utility_lib",
+        "@envoy_api//envoy/admin/v3:pkg_cc_proto",
+        "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
+        "@envoy_api//envoy/config/route/v3:pkg_cc_proto",
+        "@envoy_api//envoy/extensions/filters/network/thrift_proxy/v3:pkg_cc_proto",
+        "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto",
+    ],
+)

source/extensions/filters/network/thrift_proxy/router/config.h

@@ -4,6 +4,7 @@
 #include "envoy/extensions/filters/network/thrift_proxy/router/v3/router.pb.validate.h"
 
 #include "source/extensions/filters/network/thrift_proxy/filters/factory_base.h"
+#include "source/extensions/filters/network/thrift_proxy/router/router_impl.h"
 
 namespace Envoy {
 namespace Extensions {
@@ -23,6 +24,26 @@ class RouterFilterConfig
       const std::string& stat_prefix, Server::Configuration::FactoryContext& context) override;
 };
 
+class ConfigImpl : public Config, Logger::Loggable<Logger::Id::config> {
+public:
+  ConfigImpl(
+      const envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration& config)
+      : route_matcher_(new RouteMatcher(config)) {}
+
+  // Config
+  RouteConstSharedPtr route(const MessageMetadata& metadata, uint64_t random_value) const override {
+    return route_matcher_->route(metadata, random_value);
+  }
+
+private:
+  std::unique_ptr<RouteMatcher> route_matcher_;
+};
+
+class NullConfigImpl : public Config {
+public:
+  RouteConstSharedPtr route(const MessageMetadata&, uint64_t) const override { return nullptr; }
+};
+
 } // namespace Router
 } // namespace ThriftProxy
 } // namespace NetworkFilters