fix test

Signed-off-by: wangbaiping(wbpcode) <[email protected]>

Author: wangbaiping(wbpcode)

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

@@ -2,11 +2,10 @@
 
 #include "source/common/access_log/access_log_impl.h"
 #include "source/common/tracing/tracer_manager_impl.h"
+#include "source/extensions/filters/network/generic_proxy/access_log.h"
 #include "source/extensions/filters/network/generic_proxy/rds.h"
 #include "source/extensions/filters/network/generic_proxy/rds_impl.h"
 
-#include "source/extensions/filters/network/generic_proxy/access_log.h"
-
 namespace Envoy {
 namespace Extensions {
 namespace NetworkFilters {

test/extensions/filters/network/generic_proxy/BUILD

@@ -49,6 +49,7 @@ envoy_cc_test(
     rbe_pool = "6gig",
     deps = [
         ":fake_codec_lib",
+        "//source/common/access_log:access_log_lib",
         "//source/common/buffer:buffer_lib",
         "//source/common/formatter:formatter_extension_lib",
         "//source/common/formatter:substitution_format_string_lib",
@@ -60,7 +61,6 @@ envoy_cc_test(
         "//test/mocks/server:factory_context_mocks",
         "//test/test_common:registry_lib",
         "//test/test_common:utility_lib",
-        "//source/common/access_log:access_log_lib",
     ],
 )
 

test/extensions/filters/network/generic_proxy/config_test.cc

@@ -496,10 +496,11 @@ TEST(BasicFilterConfigTest, TestConfigurationWithAccessLogAndLogFilter1) {
   EXPECT_CALL(codec_factory_config, createCodecFactory(_, _))
       .WillOnce(Return(testing::ByMove(std::move(mock_codec_factory))));
 
-  EXPECT_THROW_WITH_MESSAGE(
-      { auto status_or = factory.createFilterFactoryFromProto(config, factory_context); },
-      EnvoyException,
-      "Access log filter: only extension filter is supported by non-HTTP access loggers.");
+  Network::FilterFactoryCb cb =
+      factory.createFilterFactoryFromProto(config, factory_context).value();
+  EXPECT_NE(nullptr, cb);
+  NiceMock<Network::MockFilterManager> filter_manager;
+  cb(filter_manager);
 }
 
 TEST(BasicFilterConfigTest, TestConfigurationWithAccessLogAndLogFilter2) {

test/extensions/filters/network/generic_proxy/proxy_test.cc

@@ -2,11 +2,11 @@
 #include <string>
 #include <utility>
 
+#include "source/common/access_log/access_log_impl.h"
 #include "source/common/formatter/substitution_format_string.h"
 #include "source/common/tracing/tracer_manager_impl.h"
 #include "source/extensions/access_loggers/common/file_access_log_impl.h"
 #include "source/extensions/filters/network/generic_proxy/proxy.h"
-#include "source/common/access_log/access_log_impl.h"
 
 #include "test/extensions/filters/network/generic_proxy/fake_codec.h"
 #include "test/extensions/filters/network/generic_proxy/mocks/codec.h"
@@ -114,7 +114,11 @@ class FilterConfigTest : public testing::Test {
     envoy::config::accesslog::v3::AccessLog config;
     config.mutable_typed_config()->PackFrom(file_log_config);
     config.set_name("file");
-    return AccessLog::AccessLogFactory::fromProto(config, factory_context_);
+
+    std::vector<Formatter::CommandParserPtr> command_parsers;
+    command_parsers.push_back(createGenericProxyCommandParser());
+    return AccessLog::AccessLogFactory::fromProto(config, factory_context_,
+                                                  std::move(command_parsers));
   }
 
   NiceMock<Server::Configuration::MockFactoryContext> factory_context_;