diff --git a/api/envoy/api/v2/listener/listener_components.proto b/api/envoy/api/v2/listener/listener_components.proto index d9c8cfbfcb9b..ec889d7f4f46 100644 --- a/api/envoy/api/v2/listener/listener_components.proto +++ b/api/envoy/api/v2/listener/listener_components.proto @@ -136,7 +136,7 @@ message FilterChainMatch { // Suggested values include: // // * ``raw_buffer`` - default, used when no transport protocol is detected, - // * ``tls`` - set by :ref:`envoy.listener.tls_inspector ` + // * ``tls`` - set by :ref:`envoy.filters.listener.tls_inspector ` // when TLS protocol is detected. string transport_protocol = 9; @@ -146,9 +146,9 @@ message FilterChainMatch { // // Suggested values include: // - // * ``http/1.1`` - set by :ref:`envoy.listener.tls_inspector + // * ``http/1.1`` - set by :ref:`envoy.filters.listener.tls_inspector // `, - // * ``h2`` - set by :ref:`envoy.listener.tls_inspector ` + // * ``h2`` - set by :ref:`envoy.filters.listener.tls_inspector ` // // .. attention:: // diff --git a/api/envoy/config/listener/v3/listener_components.proto b/api/envoy/config/listener/v3/listener_components.proto index 0ee19a9cd78b..6ba993b65132 100644 --- a/api/envoy/config/listener/v3/listener_components.proto +++ b/api/envoy/config/listener/v3/listener_components.proto @@ -138,7 +138,7 @@ message FilterChainMatch { // Suggested values include: // // * ``raw_buffer`` - default, used when no transport protocol is detected, - // * ``tls`` - set by :ref:`envoy.listener.tls_inspector ` + // * ``tls`` - set by :ref:`envoy.filters.listener.tls_inspector ` // when TLS protocol is detected. string transport_protocol = 9; @@ -148,9 +148,9 @@ message FilterChainMatch { // // Suggested values include: // - // * ``http/1.1`` - set by :ref:`envoy.listener.tls_inspector + // * ``http/1.1`` - set by :ref:`envoy.filters.listener.tls_inspector // `, - // * ``h2`` - set by :ref:`envoy.listener.tls_inspector ` + // * ``h2`` - set by :ref:`envoy.filters.listener.tls_inspector ` // // .. attention:: // diff --git a/configs/original-dst-cluster/proxy_config.yaml b/configs/original-dst-cluster/proxy_config.yaml index 17a37e7f6836..7ac1ea020fdd 100644 --- a/configs/original-dst-cluster/proxy_config.yaml +++ b/configs/original-dst-cluster/proxy_config.yaml @@ -26,7 +26,7 @@ static_resources: typed_config: {} codec_type: auto listener_filters: - - name: envoy.listener.original_dst + - name: envoy.filters.listener.original_dst typed_config: {} clusters: - name: cluster1 diff --git a/docs/root/configuration/best_practices/edge.rst b/docs/root/configuration/best_practices/edge.rst index 9d35f7613b23..a073a38d5227 100644 --- a/docs/root/configuration/best_practices/edge.rst +++ b/docs/root/configuration/best_practices/edge.rst @@ -62,7 +62,7 @@ The following is a YAML example of the above recommendation. address: 0.0.0.0 port_value: 443 listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" typed_config: {} per_connection_buffer_limit_bytes: 32768 # 32 KiB filter_chains: diff --git a/docs/root/configuration/listeners/listener_filters/http_inspector.rst b/docs/root/configuration/listeners/listener_filters/http_inspector.rst index be4055039ac5..7fc1b620414e 100644 --- a/docs/root/configuration/listeners/listener_filters/http_inspector.rst +++ b/docs/root/configuration/listeners/listener_filters/http_inspector.rst @@ -9,7 +9,7 @@ and if it is HTTP, it detects the HTTP protocol (HTTP/1.x or HTTP/2) further. Th of a :ref:`FilterChainMatch `. * :ref:`Listener filter v2 API reference ` -* This filter should be configured with the name *envoy.listener.http_inspector*. +* This filter should be configured with the name *envoy.filters.listener.http_inspector*. Example ------- @@ -19,7 +19,7 @@ A sample filter configuration could be: .. code-block:: yaml listener_filters: - - name: "envoy.listener.http_inspector" + - name: "envoy.filters.listener.http_inspector" typed_config: {} Statistics diff --git a/docs/root/configuration/listeners/listener_filters/original_dst_filter.rst b/docs/root/configuration/listeners/listener_filters/original_dst_filter.rst index 50b1beaad2ad..fba1d5cb4817 100644 --- a/docs/root/configuration/listeners/listener_filters/original_dst_filter.rst +++ b/docs/root/configuration/listeners/listener_filters/original_dst_filter.rst @@ -12,4 +12,4 @@ destination cluster forward HTTP requests or TCP connections to the restored destination address. * :ref:`v2 API reference ` -* This filter should be configured with the name *envoy.listener.original_dst*. +* This filter should be configured with the name *envoy.filters.listener.original_dst*. diff --git a/docs/root/configuration/listeners/listener_filters/original_src_filter.rst b/docs/root/configuration/listeners/listener_filters/original_src_filter.rst index 73b81947ee54..72f98dd97e18 100644 --- a/docs/root/configuration/listeners/listener_filters/original_src_filter.rst +++ b/docs/root/configuration/listeners/listener_filters/original_src_filter.rst @@ -4,7 +4,7 @@ Original Source =============== * :ref:`Listener filter v2 API reference ` -* This filter should be configured with the name *envoy.listener.original_src*. +* This filter should be configured with the name *envoy.filters.listener.original_src*. The original source listener filter replicates the downstream remote address of the connection on the upstream side of Envoy. For example, if a downstream connection connects to Envoy with IP @@ -71,8 +71,8 @@ marked with 123. address: 0.0.0.0 port_value: 8888 listener_filters: - - name: envoy.listener.proxy_protocol - - name: envoy.listener.original_src + - name: envoy.filters.listener.proxy_protocol + - name: envoy.filters.listener.original_src typed_config: "@type": type.googleapis.com/envoy.config.filter.listener.original_src.v2alpha1.OriginalSrc mark: 123 diff --git a/docs/root/configuration/listeners/listener_filters/proxy_protocol.rst b/docs/root/configuration/listeners/listener_filters/proxy_protocol.rst index c786aeab8068..e679607debb7 100644 --- a/docs/root/configuration/listeners/listener_filters/proxy_protocol.rst +++ b/docs/root/configuration/listeners/listener_filters/proxy_protocol.rst @@ -24,7 +24,7 @@ If there is a protocol error or an unsupported address family (e.g. AF_UNIX) the connection will be closed and an error thrown. * :ref:`v2 API reference ` -* This filter should be configured with the name *envoy.listener.proxy_protocol*. +* This filter should be configured with the name *envoy.filters.listener.proxy_protocol*. Statistics ---------- diff --git a/docs/root/configuration/listeners/listener_filters/tls_inspector.rst b/docs/root/configuration/listeners/listener_filters/tls_inspector.rst index 0f3c3c655d61..5aba1cea0b2c 100644 --- a/docs/root/configuration/listeners/listener_filters/tls_inspector.rst +++ b/docs/root/configuration/listeners/listener_filters/tls_inspector.rst @@ -16,7 +16,7 @@ of a :ref:`FilterChainMatch `. * :ref:`SNI ` * :ref:`v2 API reference ` -* This filter should be configured with the name *envoy.listener.tls_inspector*. +* This filter should be configured with the name *envoy.filters.listener.tls_inspector*. Example ------- @@ -26,7 +26,7 @@ A sample filter configuration could be: .. code-block:: yaml listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" typed_config: {} Statistics diff --git a/docs/root/faq/configuration/sni.rst b/docs/root/faq/configuration/sni.rst index 242985ba37a0..7cc8cf799e20 100644 --- a/docs/root/faq/configuration/sni.rst +++ b/docs/root/faq/configuration/sni.rst @@ -18,7 +18,7 @@ The following is a YAML example of the above requirement. address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" typed_config: {} filter_chains: - filter_chain_match: diff --git a/docs/root/intro/deprecated.rst b/docs/root/intro/deprecated.rst index 9aa6dc90a4ca..0f66796607b9 100644 --- a/docs/root/intro/deprecated.rst +++ b/docs/root/intro/deprecated.rst @@ -15,11 +15,11 @@ Deprecated items below are listed in chronological order. * The previous behavior for upstream connection pool circuit breaking described `here `_ has been deprecated in favor of the new behavior described :ref:`here `. -* Access Logger, HTTP Filter, Network Filter, Stats Sink, and Tracer names have been deprecated in - favor of the extension name from the envoy build system. Disable the runtime feature - "envoy.deprecated_features.allow_deprecated_extension_names" to disallow the deprecated names. - Use of these extension names generates a log message and increments the "deprecated_feature_use" - metric in stats. +* Access Logger, Listener Filter, HTTP Filter, Network Filter, Stats Sink, and Tracer names have + been deprecated in favor of the extension name from the envoy build system. Disable the runtime + feature "envoy.deprecated_features.allow_deprecated_extension_names" to disallow the deprecated + names. Use of these extension names generates a log message and increments the + "deprecated_feature_use" metric in stats. .. csv-table:: :header: Canonical Names, Deprecated Names @@ -44,6 +44,11 @@ Deprecated items below are listed in chronological order. envoy.filters.http.ratelimit, envoy.rate_limit envoy.filters.http.router, envoy.router envoy.filters.http.squash, envoy.squash + envoy.filters.listener.http_inspector, envoy.listener.http_inspector + envoy.filters.listener.original_dst, envoy.listener.original_dst + envoy.filters.listener.original_src, envoy.listener.original_src + envoy.filters.listener.proxy_protocol, envoy.listener.proxy_protocol + envoy.filters.listener.tls_inspector, envoy.listener.tls_inspector envoy.filters.network.client_ssl_auth, envoy.client_ssl_auth envoy.filters.network.echo, envoy.echo envoy.filters.network.ext_authz, envoy.ext_authz diff --git a/docs/root/intro/version_history.rst b/docs/root/intro/version_history.rst index a86b96b98b5a..a89749281c23 100644 --- a/docs/root/intro/version_history.rst +++ b/docs/root/intro/version_history.rst @@ -15,6 +15,8 @@ Version history * ext_authz: disabled the use of lowercase string matcher for headers matching in HTTP-based `ext_authz`. Can be reverted temporarily by setting runtime feature `envoy.reloadable_features.ext_authz_http_service_enable_case_sensitive_string_matcher` to false. * http: fixing a bug in HTTP/1.0 responses where Connection: keep-alive was not appended for connections which were kept alive. +* listener filters: listener filter extensions use the "envoy.filters.listener" name space. A + mapping of extension names is available in the :ref:`deprecated ` documentation. * mongo: the stat emitted for queries without a max time set in the :ref:`MongoDB filter` was modified to emit correctly for Mongo v3.2+. * network filters: network filter extensions use the "envoy.filters.network" name space. A mapping of extension names is available in the :ref:`deprecated ` documentation. diff --git a/generated_api_shadow/envoy/api/v2/listener/listener_components.proto b/generated_api_shadow/envoy/api/v2/listener/listener_components.proto index d9c8cfbfcb9b..ec889d7f4f46 100644 --- a/generated_api_shadow/envoy/api/v2/listener/listener_components.proto +++ b/generated_api_shadow/envoy/api/v2/listener/listener_components.proto @@ -136,7 +136,7 @@ message FilterChainMatch { // Suggested values include: // // * ``raw_buffer`` - default, used when no transport protocol is detected, - // * ``tls`` - set by :ref:`envoy.listener.tls_inspector ` + // * ``tls`` - set by :ref:`envoy.filters.listener.tls_inspector ` // when TLS protocol is detected. string transport_protocol = 9; @@ -146,9 +146,9 @@ message FilterChainMatch { // // Suggested values include: // - // * ``http/1.1`` - set by :ref:`envoy.listener.tls_inspector + // * ``http/1.1`` - set by :ref:`envoy.filters.listener.tls_inspector // `, - // * ``h2`` - set by :ref:`envoy.listener.tls_inspector ` + // * ``h2`` - set by :ref:`envoy.filters.listener.tls_inspector ` // // .. attention:: // diff --git a/generated_api_shadow/envoy/config/listener/v3/listener_components.proto b/generated_api_shadow/envoy/config/listener/v3/listener_components.proto index b429dfadaba3..efbe0cee68be 100644 --- a/generated_api_shadow/envoy/config/listener/v3/listener_components.proto +++ b/generated_api_shadow/envoy/config/listener/v3/listener_components.proto @@ -139,7 +139,7 @@ message FilterChainMatch { // Suggested values include: // // * ``raw_buffer`` - default, used when no transport protocol is detected, - // * ``tls`` - set by :ref:`envoy.listener.tls_inspector ` + // * ``tls`` - set by :ref:`envoy.filters.listener.tls_inspector ` // when TLS protocol is detected. string transport_protocol = 9; @@ -149,9 +149,9 @@ message FilterChainMatch { // // Suggested values include: // - // * ``http/1.1`` - set by :ref:`envoy.listener.tls_inspector + // * ``http/1.1`` - set by :ref:`envoy.filters.listener.tls_inspector // `, - // * ``h2`` - set by :ref:`envoy.listener.tls_inspector ` + // * ``h2`` - set by :ref:`envoy.filters.listener.tls_inspector ` // // .. attention:: // diff --git a/source/extensions/filters/listener/http_inspector/config.cc b/source/extensions/filters/listener/http_inspector/config.cc index a1ed1e37cd05..6e4f30ae1646 100644 --- a/source/extensions/filters/listener/http_inspector/config.cc +++ b/source/extensions/filters/listener/http_inspector/config.cc @@ -38,7 +38,8 @@ class HttpInspectorConfigFactory : public Server::Configuration::NamedListenerFi * Static registration for the http inspector filter. @see RegisterFactory. */ REGISTER_FACTORY(HttpInspectorConfigFactory, - Server::Configuration::NamedListenerFilterConfigFactory); + Server::Configuration::NamedListenerFilterConfigFactory){ + "envoy.listener.http_inspector"}; } // namespace HttpInspector } // namespace ListenerFilters diff --git a/source/extensions/filters/listener/original_dst/config.cc b/source/extensions/filters/listener/original_dst/config.cc index d07be61bc09d..c484c6d8bd59 100644 --- a/source/extensions/filters/listener/original_dst/config.cc +++ b/source/extensions/filters/listener/original_dst/config.cc @@ -37,7 +37,8 @@ class OriginalDstConfigFactory : public Server::Configuration::NamedListenerFilt /** * Static registration for the original dst filter. @see RegisterFactory. */ -REGISTER_FACTORY(OriginalDstConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory); +REGISTER_FACTORY(OriginalDstConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory){ + "envoy.listener.original_dst"}; } // namespace OriginalDst } // namespace ListenerFilters diff --git a/source/extensions/filters/listener/original_src/original_src_config_factory.cc b/source/extensions/filters/listener/original_src/original_src_config_factory.cc index 49184bb76faa..77f0d7aad30a 100644 --- a/source/extensions/filters/listener/original_src/original_src_config_factory.cc +++ b/source/extensions/filters/listener/original_src/original_src_config_factory.cc @@ -30,7 +30,8 @@ ProtobufTypes::MessagePtr OriginalSrcConfigFactory::createEmptyConfigProto() { /** * Static registration for the original_src filter. @see RegisterFactory. */ -REGISTER_FACTORY(OriginalSrcConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory); +REGISTER_FACTORY(OriginalSrcConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory){ + "envoy.listener.original_src"}; } // namespace OriginalSrc } // namespace ListenerFilters diff --git a/source/extensions/filters/listener/proxy_protocol/config.cc b/source/extensions/filters/listener/proxy_protocol/config.cc index 3c5e8dc4996f..d50eeb87c541 100644 --- a/source/extensions/filters/listener/proxy_protocol/config.cc +++ b/source/extensions/filters/listener/proxy_protocol/config.cc @@ -38,7 +38,8 @@ class ProxyProtocolConfigFactory : public Server::Configuration::NamedListenerFi * Static registration for the proxy protocol filter. @see RegisterFactory. */ REGISTER_FACTORY(ProxyProtocolConfigFactory, - Server::Configuration::NamedListenerFilterConfigFactory); + Server::Configuration::NamedListenerFilterConfigFactory){ + "envoy.listener.proxy_protocol"}; } // namespace ProxyProtocol } // namespace ListenerFilters diff --git a/source/extensions/filters/listener/tls_inspector/config.cc b/source/extensions/filters/listener/tls_inspector/config.cc index 31141d132b62..befd05e75855 100644 --- a/source/extensions/filters/listener/tls_inspector/config.cc +++ b/source/extensions/filters/listener/tls_inspector/config.cc @@ -40,7 +40,8 @@ class TlsInspectorConfigFactory : public Server::Configuration::NamedListenerFil * Static registration for the TLS inspector filter. @see RegisterFactory. */ REGISTER_FACTORY(TlsInspectorConfigFactory, - Server::Configuration::NamedListenerFilterConfigFactory); + Server::Configuration::NamedListenerFilterConfigFactory){ + "envoy.listener.tls_inspector"}; } // namespace TlsInspector } // namespace ListenerFilters diff --git a/source/extensions/filters/listener/well_known_names.h b/source/extensions/filters/listener/well_known_names.h index fa12272c598e..56c86d52620c 100644 --- a/source/extensions/filters/listener/well_known_names.h +++ b/source/extensions/filters/listener/well_known_names.h @@ -15,15 +15,15 @@ namespace ListenerFilters { class ListenerFilterNameValues { public: // HTTP Inspector listener filter - const std::string HttpInspector = "envoy.listener.http_inspector"; + const std::string HttpInspector = "envoy.filters.listener.http_inspector"; // Original destination listener filter - const std::string OriginalDst = "envoy.listener.original_dst"; + const std::string OriginalDst = "envoy.filters.listener.original_dst"; // Original source listener filter - const std::string OriginalSrc = "envoy.listener.original_src"; + const std::string OriginalSrc = "envoy.filters.listener.original_src"; // Proxy Protocol listener filter - const std::string ProxyProtocol = "envoy.listener.proxy_protocol"; + const std::string ProxyProtocol = "envoy.filters.listener.proxy_protocol"; // TLS Inspector listener filter - const std::string TlsInspector = "envoy.listener.tls_inspector"; + const std::string TlsInspector = "envoy.filters.listener.tls_inspector"; }; using ListenerFilterNames = ConstSingleton; diff --git a/source/server/listener_impl.cc b/source/server/listener_impl.cc index 5b6380066be8..781fe8e40c97 100644 --- a/source/server/listener_impl.cc +++ b/source/server/listener_impl.cc @@ -272,6 +272,7 @@ ListenerImpl::ListenerImpl(const envoy::config::listener::v3::Listener& config, factory.createFilterFactoryFromProto(Envoy::ProtobufWkt::Empty(), *this)); } + // TODO(zuercher) remove the deprecated TLS inspector name when the deprecated names are removed. const bool need_tls_inspector = std::any_of( config.filter_chains().begin(), config.filter_chains().end(), @@ -281,11 +282,13 @@ ListenerImpl::ListenerImpl(const envoy::config::listener::v3::Listener& config, (matcher.transport_protocol().empty() && (!matcher.server_names().empty() || !matcher.application_protocols().empty())); }) && - !std::any_of(config.listener_filters().begin(), config.listener_filters().end(), - [](const auto& filter) { - return filter.name() == - Extensions::ListenerFilters::ListenerFilterNames::get().TlsInspector; - }); + !std::any_of( + config.listener_filters().begin(), config.listener_filters().end(), + [](const auto& filter) { + return filter.name() == + Extensions::ListenerFilters::ListenerFilterNames::get().TlsInspector || + filter.name() == "envoy.listeners.tls_inspector"; + }); // Automatically inject TLS Inspector if it wasn't configured explicitly and it's needed. if (need_tls_inspector) { const std::string message = diff --git a/test/extensions/filters/listener/http_inspector/http_inspector_config_test.cc b/test/extensions/filters/listener/http_inspector/http_inspector_config_test.cc index 3e8bc84d4b72..12bca4c9eac6 100644 --- a/test/extensions/filters/listener/http_inspector/http_inspector_config_test.cc +++ b/test/extensions/filters/listener/http_inspector/http_inspector_config_test.cc @@ -45,6 +45,16 @@ TEST(HttpInspectorConfigFactoryTest, TestCreateFactory) { EXPECT_NE(dynamic_cast(added_filter.get()), nullptr); } +// Test that the deprecated extension name still functions. +TEST(HttpInspectorConfigFactoryTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { + const std::string deprecated_name = "envoy.listener.http_inspector"; + + ASSERT_NE( + nullptr, + Registry::FactoryRegistry< + Server::Configuration::NamedListenerFilterConfigFactory>::getFactory(deprecated_name)); +} + } // namespace } // namespace HttpInspector } // namespace ListenerFilters diff --git a/test/extensions/filters/listener/original_dst/BUILD b/test/extensions/filters/listener/original_dst/BUILD new file mode 100644 index 000000000000..aaed1667cdf1 --- /dev/null +++ b/test/extensions/filters/listener/original_dst/BUILD @@ -0,0 +1,22 @@ +licenses(["notice"]) # Apache 2 + +load( + "//bazel:envoy_build_system.bzl", + "envoy_package", +) +load( + "//test/extensions:extensions_build_system.bzl", + "envoy_extension_cc_test", +) + +envoy_package() + +envoy_extension_cc_test( + name = "config_test", + srcs = ["config_test.cc"], + extension_name = "envoy.filters.listener.original_dst", + deps = [ + "//source/extensions/filters/listener/original_dst:config", + "//test/test_common:utility_lib", + ], +) diff --git a/test/extensions/filters/listener/original_dst/config_test.cc b/test/extensions/filters/listener/original_dst/config_test.cc new file mode 100644 index 000000000000..0800e080ac33 --- /dev/null +++ b/test/extensions/filters/listener/original_dst/config_test.cc @@ -0,0 +1,28 @@ +#include "envoy/registry/registry.h" +#include "envoy/server/filter_config.h" + +#include "test/test_common/utility.h" + +#include "gtest/gtest.h" + +namespace Envoy { +namespace Extensions { +namespace ListenerFilters { +namespace OriginalDst { +namespace { + +// Test that the deprecated extension name still functions. +TEST(OriginalDstConfigFactoryTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { + const std::string deprecated_name = "envoy.listener.original_dst"; + + ASSERT_NE( + nullptr, + Registry::FactoryRegistry< + Server::Configuration::NamedListenerFilterConfigFactory>::getFactory(deprecated_name)); +} + +} // namespace +} // namespace OriginalDst +} // namespace ListenerFilters +} // namespace Extensions +} // namespace Envoy diff --git a/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc b/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc index 9137e986d914..9e2ebd4c1fcc 100644 --- a/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc +++ b/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc @@ -42,6 +42,16 @@ TEST(OriginalSrcConfigFactoryTest, TestCreateFactory) { EXPECT_NE(dynamic_cast(added_filter.get()), nullptr); } +// Test that the deprecated extension name still functions. +TEST(OriginalSrcConfigFactoryTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { + const std::string deprecated_name = "envoy.listener.original_src"; + + ASSERT_NE( + nullptr, + Registry::FactoryRegistry< + Server::Configuration::NamedListenerFilterConfigFactory>::getFactory(deprecated_name)); +} + } // namespace } // namespace OriginalSrc } // namespace ListenerFilters diff --git a/test/extensions/filters/listener/proxy_protocol/BUILD b/test/extensions/filters/listener/proxy_protocol/BUILD index 71a74c476979..0eb0eb4983eb 100644 --- a/test/extensions/filters/listener/proxy_protocol/BUILD +++ b/test/extensions/filters/listener/proxy_protocol/BUILD @@ -23,6 +23,7 @@ envoy_extension_cc_test( "//source/common/network:listener_lib", "//source/common/network:utility_lib", "//source/common/stats:stats_lib", + "//source/extensions/filters/listener/proxy_protocol:config", "//source/extensions/filters/listener/proxy_protocol:proxy_protocol_lib", "//source/server:connection_handler_lib", "//test/mocks/api:api_mocks", diff --git a/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc b/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc index bc27aa860ece..22039e230dc2 100644 --- a/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc +++ b/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc @@ -1132,6 +1132,16 @@ TEST_P(WildcardProxyProtocolTest, BasicV6) { disconnect(); } +// Test that the deprecated extension name still functions. +TEST(ProxyProtocolConfigFactoryTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { + const std::string deprecated_name = "envoy.listener.proxy_protocol"; + + ASSERT_NE( + nullptr, + Registry::FactoryRegistry< + Server::Configuration::NamedListenerFilterConfigFactory>::getFactory(deprecated_name)); +} + } // namespace } // namespace ProxyProtocol } // namespace ListenerFilters diff --git a/test/extensions/filters/listener/tls_inspector/BUILD b/test/extensions/filters/listener/tls_inspector/BUILD index 626ea5158969..5037554848a7 100644 --- a/test/extensions/filters/listener/tls_inspector/BUILD +++ b/test/extensions/filters/listener/tls_inspector/BUILD @@ -15,6 +15,7 @@ envoy_cc_test( srcs = ["tls_inspector_test.cc"], deps = [ ":tls_utility_lib", + "//source/extensions/filters/listener/tls_inspector:config", "//source/extensions/filters/listener/tls_inspector:tls_inspector_lib", "//test/mocks/api:api_mocks", "//test/mocks/network:network_mocks", diff --git a/test/extensions/filters/listener/tls_inspector/tls_inspector_test.cc b/test/extensions/filters/listener/tls_inspector/tls_inspector_test.cc index d33a11d578da..2c21b2116646 100644 --- a/test/extensions/filters/listener/tls_inspector/tls_inspector_test.cc +++ b/test/extensions/filters/listener/tls_inspector/tls_inspector_test.cc @@ -267,6 +267,17 @@ TEST_F(TlsInspectorTest, InlineReadSucceed) { EXPECT_CALL(socket_, setDetectedTransportProtocol(absl::string_view("tls"))); EXPECT_EQ(Network::FilterStatus::Continue, filter_->onAccept(cb_)); } + +// Test that the deprecated extension name still functions. +TEST(TlsInspectorConfigFactoryTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { + const std::string deprecated_name = "envoy.listener.tls_inspector"; + + ASSERT_NE( + nullptr, + Registry::FactoryRegistry< + Server::Configuration::NamedListenerFilterConfigFactory>::getFactory(deprecated_name)); +} + } // namespace } // namespace TlsInspector } // namespace ListenerFilters diff --git a/test/server/filter_chain_benchmark_test.cc b/test/server/filter_chain_benchmark_test.cc index 437b59eb73b4..a248c93e0444 100644 --- a/test/server/filter_chain_benchmark_test.cc +++ b/test/server/filter_chain_benchmark_test.cc @@ -112,7 +112,7 @@ const char YamlHeader[] = R"EOF( address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: diff --git a/test/server/listener_manager_impl_test.cc b/test/server/listener_manager_impl_test.cc index b43ff028f66d..63cc86ffe3f2 100644 --- a/test/server/listener_manager_impl_test.cc +++ b/test/server/listener_manager_impl_test.cc @@ -316,8 +316,8 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, BadListenerConfig2UDPListenerFilt address: 127.0.0.1 port_value: 1234 listener_filters: -- name: envoy.listener.tls_inspector -- name: envoy.listener.original_dst +- name: envoy.filters.listener.tls_inspector +- name: envoy.filters.listener.original_dst )EOF"; EXPECT_THROW_WITH_REGEX(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true), @@ -1719,7 +1719,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithDestinationP address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -1765,7 +1765,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithDestinationI address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -1811,7 +1811,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithServerNamesM address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -1858,7 +1858,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithTransportPro address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -1900,7 +1900,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithApplicationP address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -1944,7 +1944,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithSourceTypeMa address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -1999,7 +1999,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithSourceIpMatc address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -2055,7 +2055,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithSourceIpv6Ma address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -2095,7 +2095,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithSourcePortMa address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -2139,7 +2139,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainWithSourceType address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -2222,7 +2222,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithDestinati address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -2308,7 +2308,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithDestinati address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -2394,7 +2394,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithServerNam address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -2493,7 +2493,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithTransport address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -2538,7 +2538,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithApplicati address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -2584,7 +2584,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithMultipleR address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -2643,7 +2643,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithDifferent address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -2687,7 +2687,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -2727,7 +2727,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithInvalidDesti address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -2744,7 +2744,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithInvalidServe address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -2763,7 +2763,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithSameMatch address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -2785,7 +2785,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -2807,7 +2807,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithOverlappi address: socket_address: { address: 127.0.0.1, port_value: 1234 } listener_filters: - - name: "envoy.listener.tls_inspector" + - name: "envoy.filters.listener.tls_inspector" config: {} filter_chains: - filter_chain_match: @@ -3134,7 +3134,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, OriginalDstFilter) { socket_address: { address: 127.0.0.1, port_value: 1111 } filter_chains: {} listener_filters: - - name: "envoy.listener.original_dst" + - name: "envoy.filters.listener.original_dst" config: {} )EOF", Network::Address::IpVersion::v4);