windows compilation: ensure thrift_proxy tests/mocks do not fail to c…

…ompile with missing Validate method on google::protobuf::Struct (#10780)

ThriftFilters::FactoryBase.createFilterFactoryFromProto() calls protobuf
utility validation (Validate() method) on the template parameter class
ConfigProto.

Risk Level: Low
Testing: Modifies existing test mocks
Docs Changes: N/A
Release Notes: N/A

Co-authored-by: William A Rowe Jr <wrowe@pivotal.io>
Signed-off-by: William A Rowe Jr <wrowe@pivotal.io>
Co-authored-by: Sunjay Bhatia <sbhatia@pivotal.io>
Signed-off-by: Sunjay Bhatia <sbhatia@pivotal.io>

test/extensions/filters/network/thrift_proxy/mocks.cc

@@ -92,22 +92,21 @@ MockDecoderFilterCallbacks::MockDecoderFilterCallbacks() {
 }
 MockDecoderFilterCallbacks::~MockDecoderFilterCallbacks() = default;
 
-MockFilterConfigFactory::MockFilterConfigFactory()
-    : FactoryBase("envoy.filters.thrift.mock_filter") {
+MockFilterConfigFactory::MockFilterConfigFactory() : name_("envoy.filters.thrift.mock_filter") {
   mock_filter_ = std::make_shared<NiceMock<MockDecoderFilter>>();
 }
 
 MockFilterConfigFactory::~MockFilterConfigFactory() = default;
 
-FilterFactoryCb MockFilterConfigFactory::createFilterFactoryFromProtoTyped(
-    const ProtobufWkt::Struct& proto_config, const std::string& stat_prefix,
+FilterFactoryCb MockFilterConfigFactory::createFilterFactoryFromProto(
+    const Protobuf::Message& proto_config, const std::string& stats_prefix,
     Server::Configuration::FactoryContext& context) {
   UNREFERENCED_PARAMETER(context);
 
-  config_struct_ = proto_config;
-  config_stat_prefix_ = stat_prefix;
+  config_struct_ = dynamic_cast<const ProtobufWkt::Struct&>(proto_config);
+  config_stat_prefix_ = stats_prefix;
 
-  return [this](ThriftFilters::FilterChainFactoryCallbacks& callbacks) -> void {
+  return [this](FilterChainFactoryCallbacks& callbacks) -> void {
     callbacks.addDecoderFilter(mock_filter_);
   };
 }

test/extensions/filters/network/thrift_proxy/mocks.h

@@ -258,19 +258,28 @@ class MockDecoderFilterCallbacks : public DecoderFilterCallbacks {
   std::shared_ptr<Router::MockRoute> route_;
 };
 
-class MockFilterConfigFactory : public ThriftFilters::FactoryBase<ProtobufWkt::Struct> {
+class MockFilterConfigFactory : public NamedThriftFilterConfigFactory {
 public:
   MockFilterConfigFactory();
   ~MockFilterConfigFactory() override;
 
-  ThriftFilters::FilterFactoryCb
-  createFilterFactoryFromProtoTyped(const ProtobufWkt::Struct& proto_config,
-                                    const std::string& stat_prefix,
-                                    Server::Configuration::FactoryContext& context) override;
+  FilterFactoryCb
+  createFilterFactoryFromProto(const Protobuf::Message& proto_config,
+                               const std::string& stats_prefix,
+                               Server::Configuration::FactoryContext& context) override;
+
+  ProtobufTypes::MessagePtr createEmptyConfigProto() override {
+    return std::make_unique<ProtobufWkt::Struct>();
+  }
+
+  std::string name() const override { return name_; }
 
-  std::shared_ptr<MockDecoderFilter> mock_filter_;
   ProtobufWkt::Struct config_struct_;
   std::string config_stat_prefix_;
+
+private:
+  std::shared_ptr<MockDecoderFilter> mock_filter_;
+  const std::string name_;
 };
 
 } // namespace ThriftFilters