diff --git a/contrib/squash/filters/http/test/config_test.cc b/contrib/squash/filters/http/test/config_test.cc index 82647ecf664f..aac01c3117fe 100644 --- a/contrib/squash/filters/http/test/config_test.cc +++ b/contrib/squash/filters/http/test/config_test.cc @@ -36,17 +36,6 @@ TEST(SquashFilterConfigFactoryTest, SquashFilterCorrectYaml) { cb(filter_callback); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(SquashFilterConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.squash"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace } // namespace Squash } // namespace HttpFilters diff --git a/docs/root/version_history/current.rst b/docs/root/version_history/current.rst index 8db294c352e3..5b6516b43a5c 100644 --- a/docs/root/version_history/current.rst +++ b/docs/root/version_history/current.rst @@ -27,3 +27,5 @@ New Features Deprecated ---------- + +* http: removing support for long-deprecated old style filter names, e.g. envoy.router, envoy.lua. diff --git a/envoy/registry/BUILD b/envoy/registry/BUILD index b5d9e6e59cef..41f0a3bf30d9 100644 --- a/envoy/registry/BUILD +++ b/envoy/registry/BUILD @@ -15,7 +15,6 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/common/protobuf:utility_lib", - "//source/extensions/common:utility_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) diff --git a/envoy/registry/registry.h b/envoy/registry/registry.h index 941006d7d228..6a239841980e 100644 --- a/envoy/registry/registry.h +++ b/envoy/registry/registry.h @@ -14,7 +14,6 @@ #include "source/common/common/logger.h" #include "source/common/common/utility.h" #include "source/common/protobuf/utility.h" -#include "source/extensions/common/utility.h" #include "absl/base/attributes.h" #include "absl/container/flat_hash_map.h" @@ -281,9 +280,6 @@ template class FactoryRegistry : public Logger::Loggablesecond; } @@ -304,17 +300,6 @@ template class FactoryRegistry : public Logger::Loggablesecond; } - static bool checkDeprecated(absl::string_view name) { - auto it = deprecatedFactoryNames().find(name); - const bool deprecated = it != deprecatedFactoryNames().end(); - if (deprecated) { - return Extensions::Common::Utility::ExtensionNameUtil::allowDeprecatedExtensionName( - "", it->first, it->second); - } - - return true; - } - /** * @return true if the named factory was disabled. */ diff --git a/source/common/router/BUILD b/source/common/router/BUILD index c57f472630fa..6a59edfb8bfe 100644 --- a/source/common/router/BUILD +++ b/source/common/router/BUILD @@ -67,7 +67,6 @@ envoy_cc_library( "//source/common/tracing:custom_tag_lib", "//source/common/tracing:http_tracer_lib", "//source/common/upstream:retry_factory_lib", - "//source/extensions/filters/http/common:utility_lib", "@envoy_api//envoy/config/common/matcher/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", diff --git a/source/common/router/config_impl.cc b/source/common/router/config_impl.cc index 1bc216a8b5dd..98a63d7a71aa 100644 --- a/source/common/router/config_impl.cc +++ b/source/common/router/config_impl.cc @@ -45,7 +45,6 @@ #include "source/common/tracing/custom_tag_impl.h" #include "source/common/tracing/http_tracer_impl.h" #include "source/common/upstream/retry_factory.h" -#include "source/extensions/filters/http/common/utility.h" #include "absl/strings/match.h" @@ -53,8 +52,6 @@ namespace Envoy { namespace Router { namespace { -const std::string DEPRECATED_ROUTER_NAME = "envoy.router"; - constexpr uint32_t DEFAULT_MAX_DIRECT_RESPONSE_BODY_SIZE_BYTES = 4096; void mergeTransforms(Http::HeaderTransforms& dest, const Http::HeaderTransforms& src) { @@ -941,14 +938,7 @@ RouteEntryImplBase::parseOpaqueConfig(const envoy::config::route::v3::Route& rou if (route.has_metadata()) { auto filter_metadata = route.metadata().filter_metadata().find("envoy.filters.http.router"); if (filter_metadata == route.metadata().filter_metadata().end()) { - // TODO(zuercher): simply return `ret` when deprecated filter names are removed. - filter_metadata = route.metadata().filter_metadata().find(DEPRECATED_ROUTER_NAME); - if (filter_metadata == route.metadata().filter_metadata().end()) { - return ret; - } - - Extensions::Common::Utility::ExtensionNameUtil::checkDeprecatedExtensionName( - "http filter", DEPRECATED_ROUTER_NAME, "envoy.filters.http.router"); + return ret; } for (const auto& it : filter_metadata->second.fields()) { if (it.second.kind_case() == ProtobufWkt::Value::kStringValue) { @@ -1737,10 +1727,7 @@ PerFilterConfigs::PerFilterConfigs( Server::Configuration::ServerFactoryContext& factory_context, ProtobufMessage::ValidationVisitor& validator) { for (const auto& it : typed_configs) { - // TODO(zuercher): canonicalization may be removed when deprecated filter names are removed - const auto& name = - Extensions::HttpFilters::Common::FilterNameUtil::canonicalFilterName(it.first); - + const auto& name = it.first; auto object = createRouteSpecificFilterConfig(name, it.second, optional_http_filters, factory_context, validator); if (object != nullptr) { diff --git a/source/common/upstream/BUILD b/source/common/upstream/BUILD index eb64222b561a..8daa21b6f2d5 100644 --- a/source/common/upstream/BUILD +++ b/source/common/upstream/BUILD @@ -527,7 +527,6 @@ envoy_cc_library( "//source/common/protobuf", "//source/common/protobuf:utility_lib", "//source/common/runtime:runtime_lib", - "//source/extensions/filters/network/common:utility_lib", "//source/server:transport_socket_config_lib", ], ) diff --git a/source/common/upstream/upstream_impl.cc b/source/common/upstream/upstream_impl.cc index 828a843c609b..d9657782a807 100644 --- a/source/common/upstream/upstream_impl.cc +++ b/source/common/upstream/upstream_impl.cc @@ -49,7 +49,6 @@ #include "source/common/upstream/health_checker_impl.h" #include "source/common/upstream/logical_dns_cluster.h" #include "source/common/upstream/original_dst_cluster.h" -#include "source/extensions/filters/network/common/utility.h" #include "source/server/transport_socket_config_impl.h" #include "absl/container/node_hash_set.h" @@ -161,11 +160,7 @@ absl::flat_hash_map parseExten absl::flat_hash_map options; for (const auto& it : config.typed_extension_protocol_options()) { - // TODO(zuercher): canonicalization may be removed when deprecated filter names are removed - // We only handle deprecated network filter names here because no existing HTTP filter has - // protocol options. - auto& name = Extensions::NetworkFilters::Common::FilterNameUtil::canonicalFilterName(it.first); - + auto& name = it.first; auto object = createProtocolOptionsConfig(name, it.second, factory_context); if (object != nullptr) { options[name] = std::move(object); diff --git a/source/extensions/clusters/dynamic_forward_proxy/BUILD b/source/extensions/clusters/dynamic_forward_proxy/BUILD index 8e50111a9f6a..d249ed3f0cab 100644 --- a/source/extensions/clusters/dynamic_forward_proxy/BUILD +++ b/source/extensions/clusters/dynamic_forward_proxy/BUILD @@ -18,7 +18,6 @@ envoy_cc_extension( "//source/common/upstream:logical_host_lib", "//source/extensions/common/dynamic_forward_proxy:dns_cache_interface", "//source/extensions/common/dynamic_forward_proxy:dns_cache_manager_impl", - "//source/extensions/filters/network/common:utility_lib", "//source/extensions/transport_sockets/tls/cert_validator:cert_validator_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", diff --git a/source/extensions/clusters/dynamic_forward_proxy/cluster.cc b/source/extensions/clusters/dynamic_forward_proxy/cluster.cc index 915e0a4f2d8e..b00a2d339958 100644 --- a/source/extensions/clusters/dynamic_forward_proxy/cluster.cc +++ b/source/extensions/clusters/dynamic_forward_proxy/cluster.cc @@ -9,7 +9,6 @@ #include "source/common/http/utility.h" #include "source/common/network/transport_socket_options_impl.h" #include "source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h" -#include "source/extensions/filters/network/common/utility.h" #include "source/extensions/transport_sockets/tls/cert_validator/default_validator.h" #include "source/extensions/transport_sockets/tls/utility.h" diff --git a/source/extensions/common/BUILD b/source/extensions/common/BUILD deleted file mode 100644 index 70c9f76e7af4..000000000000 --- a/source/extensions/common/BUILD +++ /dev/null @@ -1,22 +0,0 @@ -load( - "//bazel:envoy_build_system.bzl", - "envoy_cc_library", - "envoy_extension_package", -) - -licenses(["notice"]) # Apache 2 - -envoy_extension_package() - -envoy_cc_library( - name = "utility_lib", - hdrs = ["utility.h"], - # Legacy. TODO(#9953) clean up. - visibility = ["//visibility:public"], - deps = [ - "//envoy/runtime:runtime_interface", - "//source/common/common:documentation_url_lib", - "//source/common/common:minimal_logger_lib", - "//source/common/common:utility_lib", - ], -) diff --git a/source/extensions/common/utility.h b/source/extensions/common/utility.h deleted file mode 100644 index 8e5d5a62f83b..000000000000 --- a/source/extensions/common/utility.h +++ /dev/null @@ -1,124 +0,0 @@ -#pragma once - -#include "envoy/common/exception.h" -#include "envoy/runtime/runtime.h" - -#include "source/common/common/documentation_url.h" -#include "source/common/common/logger.h" -#include "source/common/common/utility.h" - -namespace Envoy { -namespace Extensions { -namespace Common { -namespace Utility { - -/** - * ExtensionNameUtil provides utilities for extension names. - */ -class ExtensionNameUtil { -public: - enum class Status { Warn, Block }; - - /** - * Checks the status of deprecated extension names and increments the deprecated feature stats - * counter if deprecated names are allowed. - * - * @param runtime Runtime::Loader used to determine if deprecated extension names are allowed. - * @return Status::Warn (allowed, warn) or Status::Block (disallowed, error) - */ - static Status deprecatedExtensionNameStatus( - Runtime::Loader* runtime = Runtime::LoaderSingleton::getExisting()) { -#ifdef ENVOY_DISABLE_DEPRECATED_FEATURES - UNREFERENCED_PARAMETER(runtime); - return Status::Block; -#else - const bool warn_only = - runtime && runtime->snapshot().deprecatedFeatureEnabled( - "envoy.deprecated_features.allow_deprecated_extension_names", false); - - return warn_only ? Status::Warn : Status::Block; -#endif - } - - /** - * Checks the status of deprecated extension names. If deprecated extension names are allowed, - * it increments the deprecated feature stats counter. Generates a warning or error log message - * based on whether the name is allowed (warning) or not (error). The string parameters are used - * only to generate the log message. - * - * @param extension_type absl::string_view that contains the extension type, for logging - * @param deprecated_name absl::string_view that contains the deprecated name, for logging - * @param canonical_name absl::string_view that contains the canonical name, for logging - * @param runtime Runtime::Loader used to determine if deprecated extension names are allowed. - * @return true if deprecated extensions are allowed, false otherwise. - */ - static bool - allowDeprecatedExtensionName(absl::string_view extension_type, absl::string_view deprecated_name, - absl::string_view canonical_name, - Runtime::Loader* runtime = Runtime::LoaderSingleton::getExisting()) { - auto status = deprecatedExtensionNameStatus(runtime); - - if (status == Status::Warn) { - ENVOY_LOG_MISC(warn, "{}", message(extension_type, deprecated_name, canonical_name)); - return true; - } - - ENVOY_LOG_MISC(error, "{}", fatalMessage(extension_type, deprecated_name, canonical_name)); - return false; - } - - /** - * Checks the status of deprecated extension names. If deprecated extension names are allowed, - * it increments the deprecated feature stats counter and generates a log message. If not allowed, - * an exception is thrown. The passed strings are used only to generate the log or exception - * message. - * - * @param extension_type absl::string_view that contains the extension type, for logging - * @param deprecated_name absl::string_view that contains the deprecated name, for logging - * @param canonical_name absl::string_view that contains the canonical name, for logging - * @param runtime Runtime::Loader used to determine if deprecated extension names are allowed. - * @throw EnvoyException if the use of deprecated extension names is not allowed. - */ - static void - checkDeprecatedExtensionName(absl::string_view extension_type, absl::string_view deprecated_name, - absl::string_view canonical_name, - Runtime::Loader* runtime = Runtime::LoaderSingleton::getExisting()) { - auto status = deprecatedExtensionNameStatus(runtime); - - if (status == Status::Warn) { - ENVOY_LOG_MISC(warn, "{}", message(extension_type, deprecated_name, canonical_name)); - return; - } - - ExceptionUtil::throwEnvoyException( - fatalMessage(extension_type, deprecated_name, canonical_name)); - } - -private: - static std::string message(absl::string_view extension_type, absl::string_view deprecated_name, - absl::string_view canonical_name) { - absl::string_view spacing = extension_type.empty() ? "" : " "; - - return fmt::format( - "Using deprecated {}{}extension name '{}' for '{}'. This name will be removed from Envoy " - "soon. Please see {} for details.", - extension_type, spacing, deprecated_name, canonical_name, ENVOY_DOC_URL_VERSION_HISTORY); - } - - static std::string fatalMessage(absl::string_view extension_type, - absl::string_view deprecated_name, - absl::string_view canonical_name) { - std::string err = message(extension_type, deprecated_name, canonical_name); - - const char fatal_error[] = " If continued use of this filter name is absolutely necessary, " - "see " ENVOY_DOC_URL_RUNTIME_OVERRIDE_DEPRECATED " for " - "how to apply a temporary and highly discouraged override."; - - return err + fatal_error; - } -}; - -} // namespace Utility -} // namespace Common -} // namespace Extensions -} // namespace Envoy diff --git a/source/extensions/filters/http/common/BUILD b/source/extensions/filters/http/common/BUILD index 1f619d332ea9..140a0787a749 100644 --- a/source/extensions/filters/http/common/BUILD +++ b/source/extensions/filters/http/common/BUILD @@ -42,21 +42,6 @@ envoy_cc_library( ], ) -envoy_cc_library( - name = "utility_lib", - hdrs = ["utility.h"], - # Used by the router filter. TODO(#9953) clean up. - visibility = [ - "//source:__subpackages__", - "//test:__subpackages__", - ], - deps = [ - "//envoy/runtime:runtime_interface", - "//source/common/common:macros", - "//source/extensions/common:utility_lib", - ], -) - envoy_cc_library( name = "stream_rate_limiter_lib", srcs = ["stream_rate_limiter.cc"], diff --git a/source/extensions/filters/http/common/utility.h b/source/extensions/filters/http/common/utility.h deleted file mode 100644 index b9de816ccfd0..000000000000 --- a/source/extensions/filters/http/common/utility.h +++ /dev/null @@ -1,70 +0,0 @@ -#pragma once - -#include "source/common/common/macros.h" -#include "source/extensions/common/utility.h" - -namespace Envoy { -namespace Extensions { -namespace HttpFilters { -namespace Common { - -/** - * FilterNameUtil provides utilities for handling HTTP filter - * extension names (e.g., "envoy.filters.http.buffer"). - */ -class FilterNameUtil { -public: - /** - * Given a deprecated HTTP filter extension name, return the - * canonical name. Any name not defined in the deprecated map is - * returned without modification. If deprecated extension names are - * disabled, throws EnvoyException. - * - * @return const std::string& canonical filter name - * @throw EnvoyException if deprecated names are disabled - */ - static const std::string& - canonicalFilterName(const std::string& name, - Runtime::Loader* runtime = Runtime::LoaderSingleton::getExisting()) { - const auto& it = deprecatedNameMap().find(name); - if (it == deprecatedNameMap().end()) { - return name; - } - - Extensions::Common::Utility::ExtensionNameUtil::checkDeprecatedExtensionName( - "http filter", name, it->second, runtime); - - return it->second; - } - -private: - using DeprecatedNameMap = absl::flat_hash_map; - - static const DeprecatedNameMap& deprecatedNameMap() { - CONSTRUCT_ON_FIRST_USE( - DeprecatedNameMap, - { - {"envoy.buffer", "envoy.filters.http.buffer"}, - {"envoy.cors", "envoy.filters.http.cors"}, - {"envoy.csrf", "envoy.filters.http.csrf"}, - {"envoy.ext_authz", "envoy.filters.http.ext_authz"}, - {"envoy.fault", "envoy.filters.http.fault"}, - {"envoy.grpc_http1_bridge", "envoy.filters.http.grpc_http1_bridge"}, - {"envoy.grpc_json_transcoder", "envoy.filters.http.grpc_json_transcoder"}, - {"envoy.grpc_web", "envoy.filters.http.grpc_web"}, - {"envoy.gzip", "envoy.filters.http.gzip"}, - {"envoy.health_check", "envoy.filters.http.health_check"}, - {"envoy.http_dynamic_filter", "envoy.filters.http.dynamo"}, - {"envoy.ip_tagging", "envoy.filters.http.ip_tagging"}, - {"envoy.lua", "envoy.filters.http.lua"}, - {"envoy.rate_limit", "envoy.filters.http.ratelimit"}, - {"envoy.router", "envoy.filters.http.router"}, - {"envoy.squash", "envoy.filters.http.squash"}, - }); - } -}; - -} // namespace Common -} // namespace HttpFilters -} // namespace Extensions -} // namespace Envoy diff --git a/source/extensions/filters/http/lua/BUILD b/source/extensions/filters/http/lua/BUILD index a1cc788c104f..468ae8f3846e 100644 --- a/source/extensions/filters/http/lua/BUILD +++ b/source/extensions/filters/http/lua/BUILD @@ -26,7 +26,6 @@ envoy_cc_library( "//source/common/config:datasource_lib", "//source/common/crypto:utility_lib", "//source/common/http:message_lib", - "//source/extensions/common:utility_lib", "//source/extensions/filters/common/lua:lua_lib", "//source/extensions/filters/common/lua:wrappers_lib", "//source/extensions/filters/http/common:factory_base_lib", diff --git a/source/extensions/filters/http/lua/lua_filter.cc b/source/extensions/filters/http/lua/lua_filter.cc index bf437d3bc4d8..1be488f4426f 100644 --- a/source/extensions/filters/http/lua/lua_filter.cc +++ b/source/extensions/filters/http/lua/lua_filter.cc @@ -27,29 +27,6 @@ struct HttpResponseCodeDetailValues { }; using HttpResponseCodeDetails = ConstSingleton; -const std::string DEPRECATED_LUA_NAME = "envoy.lua"; - -std::atomic& deprecatedNameLogged() { - MUTABLE_CONSTRUCT_ON_FIRST_USE(std::atomic, false); -} - -// Checks if deprecated metadata names are allowed. On the first check only it will log either -// a warning (indicating the name should be updated) or an error (the feature is off and the -// name is not allowed). When warning, the deprecated feature stat is incremented. Subsequent -// checks do not log since this check is done in potentially high-volume request paths. -bool allowDeprecatedMetadataName() { - if (!deprecatedNameLogged().exchange(true)) { - // Have not logged yet, so use the logging test. - return Extensions::Common::Utility::ExtensionNameUtil::allowDeprecatedExtensionName( - "http filter", DEPRECATED_LUA_NAME, "envoy.filters.http.lua"); - } - - // We have logged (or another thread will do so momentarily), so just check whether the - // deprecated name is allowed. - auto status = Extensions::Common::Utility::ExtensionNameUtil::deprecatedExtensionNameStatus(); - return status == Extensions::Common::Utility::ExtensionNameUtil::Status::Warn; -} - const ProtobufWkt::Struct& getMetadata(Http::StreamFilterCallbacks* callbacks) { if (callbacks->route() == nullptr) { return ProtobufWkt::Struct::default_instance(); @@ -63,17 +40,6 @@ const ProtobufWkt::Struct& getMetadata(Http::StreamFilterCallbacks* callbacks) { } } - // TODO(zuercher): Remove this block when deprecated filter names are removed. - { - const auto& filter_it = metadata.filter_metadata().find(DEPRECATED_LUA_NAME); - if (filter_it != metadata.filter_metadata().end()) { - // Use the non-throwing check here because this happens at request time. - if (allowDeprecatedMetadataName()) { - return filter_it->second; - } - } - } - return ProtobufWkt::Struct::default_instance(); } diff --git a/source/extensions/filters/http/lua/lua_filter.h b/source/extensions/filters/http/lua/lua_filter.h index c67e4f74560e..841210f93327 100644 --- a/source/extensions/filters/http/lua/lua_filter.h +++ b/source/extensions/filters/http/lua/lua_filter.h @@ -6,7 +6,6 @@ #include "source/common/crypto/utility.h" #include "source/common/http/utility.h" -#include "source/extensions/common/utility.h" #include "source/extensions/filters/common/lua/wrappers.h" #include "source/extensions/filters/http/common/factory_base.h" #include "source/extensions/filters/http/lua/wrappers.h" diff --git a/source/extensions/filters/network/common/BUILD b/source/extensions/filters/network/common/BUILD index be7c50d2fa1f..a8f22ea767b1 100644 --- a/source/extensions/filters/network/common/BUILD +++ b/source/extensions/filters/network/common/BUILD @@ -15,19 +15,5 @@ envoy_cc_library( visibility = ["//visibility:public"], deps = [ "//envoy/server:filter_config_interface", - "//source/extensions/common:utility_lib", - ], -) - -envoy_cc_library( - name = "utility_lib", - hdrs = ["utility.h"], - # Used by core. TODO(#9953) clean up. - visibility = ["//visibility:public"], - deps = [ - "//envoy/runtime:runtime_interface", - "//source/common/common:macros", - "//source/extensions/common:utility_lib", - "//source/extensions/filters/network:well_known_names", ], ) diff --git a/source/extensions/filters/network/common/utility.h b/source/extensions/filters/network/common/utility.h deleted file mode 100644 index 1f43a2375c2c..000000000000 --- a/source/extensions/filters/network/common/utility.h +++ /dev/null @@ -1,56 +0,0 @@ -#pragma once - -#include "source/common/common/macros.h" -#include "source/extensions/common/utility.h" -#include "source/extensions/filters/network/well_known_names.h" - -namespace Envoy { -namespace Extensions { -namespace NetworkFilters { -namespace Common { - -/** - * FilterNameUtil provides utilities for handling Network filter - * extension names (e.g., "envoy.filters.network.redis_proxy"). - */ -class FilterNameUtil { -public: - /** - * Given a deprecated network filter extension name, return the - * canonical name. Any name not defined in the deprecated map is - * returned without modification. If deprecated extension names are - * disabled, throws EnvoyException. - * - * @return const std::string& canonical filter name - * @throw EnvoyException if deprecated names are disabled - */ - static const std::string& - canonicalFilterName(const std::string& name, - Runtime::Loader* runtime = Runtime::LoaderSingleton::getExisting()) { - const auto& it = deprecatedNameMap().find(name); - if (it == deprecatedNameMap().end()) { - return name; - } - - Extensions::Common::Utility::ExtensionNameUtil::checkDeprecatedExtensionName( - "network filter", name, it->second, runtime); - - return it->second; - } - -private: - using DeprecatedNameMap = absl::flat_hash_map; - - static const DeprecatedNameMap& deprecatedNameMap() { - CONSTRUCT_ON_FIRST_USE( - DeprecatedNameMap, - { - {"envoy.redis_proxy", NetworkFilters::NetworkFilterNames::get().RedisProxy}, - }); - } -}; - -} // namespace Common -} // namespace NetworkFilters -} // namespace Extensions -} // namespace Envoy diff --git a/test/common/access_log/access_log_impl_test.cc b/test/common/access_log/access_log_impl_test.cc index 48f8dcf72aba..e8180c0507a9 100644 --- a/test/common/access_log/access_log_impl_test.cc +++ b/test/common/access_log/access_log_impl_test.cc @@ -1664,40 +1664,6 @@ name: accesslog } #endif // USE_CEL_PARSER -// Test that the deprecated extension names are disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST_F(AccessLogImplTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - { - envoy::config::accesslog::v3::AccessLog config; - config.set_name("envoy.file_access_log"); - - EXPECT_THROW( - Config::Utility::getAndCheckFactory( - config), - EnvoyException); - } - - { - envoy::config::accesslog::v3::AccessLog config; - config.set_name("envoy.http_grpc_access_log"); - - EXPECT_THROW( - Config::Utility::getAndCheckFactory( - config), - EnvoyException); - } - - { - envoy::config::accesslog::v3::AccessLog config; - config.set_name("envoy.tcp_grpc_access_log"); - - EXPECT_THROW( - Config::Utility::getAndCheckFactory( - config), - EnvoyException); - } -} - } // namespace } // namespace AccessLog } // namespace Envoy diff --git a/test/common/config/registry_test.cc b/test/common/config/registry_test.cc index 9bc9c434e8ad..cbbbc900e71a 100644 --- a/test/common/config/registry_test.cc +++ b/test/common/config/registry_test.cc @@ -83,32 +83,6 @@ TEST(RegistryTest, DefaultFactoryPublished) { EXPECT_FALSE(version.has_value()); } -class TestWithDeprecatedPublishedFactory : public PublishedFactory { -public: - std::string name() const override { return "testing.published.instead_name"; } -}; - -REGISTER_FACTORY(TestWithDeprecatedPublishedFactory, - PublishedFactory){"testing.published.deprecated_name"}; - -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(RegistryTest, DEPRECATED_FEATURE_TEST(WithDeprecatedFactoryPublished)) { - EXPECT_EQ(nullptr, Envoy::Registry::FactoryRegistry::getFactory( - "testing.published.deprecated_name")); -} - -class NoNamePublishedFactory : public PublishedFactory { -public: - std::string name() const override { return ""; } -}; - -TEST(RegistryTest, DEPRECATED_FEATURE_TEST(AssertsIfNoDeprecatedNameGiven)) { - // Expects an assert to raise if we register a factory that has an empty name - // and no associated deprecated names. - EXPECT_DEBUG_DEATH((Registry::RegisterFactory({})), - "Attempted to register a factory without a name or deprecated name"); -} - class TestVersionedFactory : public PublishedFactory { public: std::string name() const override { return "testing.published.versioned"; } @@ -142,86 +116,12 @@ TEST(RegistryTest, VersionedFactory) { EXPECT_EQ("alpha", version.value().metadata().fields().at("build.label").string_value()); } -class TestVersionedWithDeprecatedNamesFactory : public PublishedFactory { -public: - std::string name() const override { return "testing.published.versioned.instead_name"; } -}; - -REGISTER_FACTORY(TestVersionedWithDeprecatedNamesFactory, - PublishedFactory){FACTORY_VERSION(0, 0, 1, {{"build.kind", "private"}}), - {"testing.published.versioned.deprecated_name"}}; - -// Test registration of versioned factory that also uses deprecated names -TEST(RegistryTest, DEPRECATED_FEATURE_TEST(VersionedWithDeprecatedNamesFactory)) { - EXPECT_EQ(nullptr, Envoy::Registry::FactoryRegistry::getFactory( - "testing.published.versioned.deprecated_name")); - - const auto& factories = Envoy::Registry::FactoryCategoryRegistry::registeredFactories(); - auto version = factories.find("testing.published") - ->second->getFactoryVersion("testing.published.versioned.instead_name"); - EXPECT_TRUE(version.has_value()); - EXPECT_EQ(0, version.value().version().major_number()); - EXPECT_EQ(0, version.value().version().minor_number()); - EXPECT_EQ(1, version.value().version().patch()); - EXPECT_EQ(1, version.value().metadata().fields().size()); - EXPECT_EQ("private", version.value().metadata().fields().at("build.kind").string_value()); - // Get the version using deprecated name and check that it matches the - // version obtained through the new name. - auto deprecated_version = - factories.find("testing.published") - ->second->getFactoryVersion("testing.published.versioned.deprecated_name"); - EXPECT_TRUE(deprecated_version.has_value()); - EXPECT_THAT(deprecated_version.value(), ProtoEq(version.value())); -} - TEST(RegistryTest, TestDoubleRegistrationByName) { EXPECT_THROW_WITH_MESSAGE((Registry::RegisterFactory()), EnvoyException, "Double registration for name: 'testing.published.test'"); } -class PublishedFactoryWithNameAndCategory : public PublishedFactory { -public: - std::string category() const override { return "testing.published.additional.category"; } - std::string name() const override { - return "testing.published.versioned.instead_name_and_category"; - } -}; - -TEST(RegistryTest, DEPRECATED_FEATURE_TEST(VersionedWithDeprecatedNamesFactoryAndNewCategory)) { - PublishedFactoryWithNameAndCategory test; - - // Check the category is not registered - ASSERT_FALSE(Registry::FactoryCategoryRegistry::isRegistered(test.category())); - - auto factory = Registry::RegisterFactory( - FACTORY_VERSION(0, 0, 1, {{"build.kind", "private"}}), - {"testing.published.versioned.deprecated_name_and_category"}); - - // Check the category now registered - ASSERT_TRUE(Registry::FactoryCategoryRegistry::isRegistered(test.category())); - - const auto& factories = Envoy::Registry::FactoryCategoryRegistry::registeredFactories(); - - auto version = - factories.find("testing.published.additional.category") - ->second->getFactoryVersion("testing.published.versioned.instead_name_and_category"); - - ASSERT_TRUE(version.has_value()); - EXPECT_EQ(0, version.value().version().major_number()); - EXPECT_EQ(0, version.value().version().minor_number()); - EXPECT_EQ(1, version.value().version().patch()); - EXPECT_EQ(1, version.value().metadata().fields().size()); - EXPECT_EQ("private", version.value().metadata().fields().at("build.kind").string_value()); - - // Get the version using deprecated name and check that it matches the - // version obtained through the new name. - auto deprecated_version = - factories.find("testing.published.additional.category") - ->second->getFactoryVersion("testing.published.versioned.deprecated_name_and_category"); - EXPECT_THAT(deprecated_version, Optional(ProtoEq(version.value()))); -} - } // namespace } // namespace Config } // namespace Envoy diff --git a/test/common/router/config_impl_test.cc b/test/common/router/config_impl_test.cc index 7d8262f3e3d2..877c97757a33 100644 --- a/test/common/router/config_impl_test.cc +++ b/test/common/router/config_impl_test.cc @@ -5826,31 +5826,6 @@ TEST_F(RouteMatcherTest, TestOpaqueConfig) { EXPECT_EQ(opaque_config.find("name2")->second, "value2"); } -// Test that the deprecated name no longer works by default for opaque configs. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST_F(RouteMatcherTest, DEPRECATED_FEATURE_TEST(TestOpaqueConfigUsingDeprecatedName)) { - const std::string yaml = R"EOF( -virtual_hosts: -- name: default - domains: - - "*" - routes: - - match: - prefix: "/api" - route: - cluster: ats - metadata: - filter_metadata: - envoy.router: - name1: value1 - name2: value2 -)EOF"; - - factory_context_.cluster_manager_.initializeClusters({"ats"}, {}); - EXPECT_THROW(TestConfigImpl(parseRouteConfigurationFromYaml(yaml), factory_context_, true), - EnvoyException); -} - class RoutePropertyTest : public testing::Test, public ConfigImplTestBase {}; TEST_F(RoutePropertyTest, DEPRECATED_FEATURE_TEST(ExcludeVHRateLimits)) { diff --git a/test/extensions/common/BUILD b/test/extensions/common/BUILD deleted file mode 100644 index e976a4fc4c1b..000000000000 --- a/test/extensions/common/BUILD +++ /dev/null @@ -1,22 +0,0 @@ -load( - "//bazel:envoy_build_system.bzl", - "envoy_cc_test", - "envoy_package", -) - -licenses(["notice"]) # Apache 2 - -envoy_package() - -envoy_cc_test( - name = "utility_test", - srcs = [ - "utility_test.cc", - ], - deps = [ - "//source/extensions/common:utility_lib", - "//test/mocks/runtime:runtime_mocks", - "//test/test_common:logging_lib", - "//test/test_common:utility_lib", - ], -) diff --git a/test/extensions/common/utility_test.cc b/test/extensions/common/utility_test.cc deleted file mode 100644 index 0c22d1187bff..000000000000 --- a/test/extensions/common/utility_test.cc +++ /dev/null @@ -1,152 +0,0 @@ -#include "source/extensions/common/utility.h" - -#include "test/mocks/runtime/mocks.h" -#include "test/test_common/logging.h" -#include "test/test_common/utility.h" - -#include "gmock/gmock.h" -#include "gtest/gtest.h" - -using testing::_; -using testing::NiceMock; -using testing::Return; - -namespace Envoy { -namespace Extensions { -namespace Common { -namespace Utility { -namespace { - -// Test that deprecated names indicate warning or block depending on runtime flags. -TEST(ExtensionNameUtilTest, DEPRECATED_FEATURE_TEST(TestDeprecatedExtensionNameStatus)) { - // Validate that no runtime available results in block. - { - EXPECT_EQ(ExtensionNameUtil::Status::Block, - ExtensionNameUtil::deprecatedExtensionNameStatus(nullptr)); - } - - // If deprecated feature is enabled, warn. - { - NiceMock runtime; - - EXPECT_CALL( - runtime.snapshot_, - deprecatedFeatureEnabled("envoy.deprecated_features.allow_deprecated_extension_names", _)) - .WillRepeatedly(Return(true)); - - EXPECT_EQ(ExtensionNameUtil::Status::Warn, - ExtensionNameUtil::deprecatedExtensionNameStatus(&runtime)); - } - - // If deprecated feature is disabled, block. - { - NiceMock runtime; - - EXPECT_CALL( - runtime.snapshot_, - deprecatedFeatureEnabled("envoy.deprecated_features.allow_deprecated_extension_names", _)) - .WillRepeatedly(Return(false)); - - EXPECT_EQ(ExtensionNameUtil::Status::Block, - ExtensionNameUtil::deprecatedExtensionNameStatus(&runtime)); - } -} - -// Test that deprecated names trigger an exception. -TEST(ExtensionNameUtilTest, DEPRECATED_FEATURE_TEST(TestCheckDeprecatedExtensionNameThrows)) { - // Validate that no runtime available results in exception. - { - EXPECT_THROW_WITH_REGEX( - ExtensionNameUtil::checkDeprecatedExtensionName("XXX", "deprecated", "canonical", nullptr), - EnvoyException, "Using deprecated XXX extension name 'deprecated' for 'canonical'.*"); - } - - // If deprecated feature is enabled, warn. - { - NiceMock runtime; - - EXPECT_CALL( - runtime.snapshot_, - deprecatedFeatureEnabled("envoy.deprecated_features.allow_deprecated_extension_names", _)) - .WillRepeatedly(Return(true)); - - auto test = [&]() { - ExtensionNameUtil::checkDeprecatedExtensionName("XXX", "deprecated", "canonical", &runtime); - }; - EXPECT_NO_THROW(test()); - - EXPECT_LOG_CONTAINS("warn", "Using deprecated XXX extension name 'deprecated' for 'canonical'.", - test()); - } - - // If deprecated feature is disabled, throw. - { - NiceMock runtime; - - EXPECT_CALL( - runtime.snapshot_, - deprecatedFeatureEnabled("envoy.deprecated_features.allow_deprecated_extension_names", _)) - .WillRepeatedly(Return(false)); - - EXPECT_THROW_WITH_REGEX( - ExtensionNameUtil::checkDeprecatedExtensionName("XXX", "deprecated", "canonical", &runtime), - EnvoyException, "Using deprecated XXX extension name 'deprecated' for 'canonical'.*"); - } -} - -// Test that deprecated names are reported as allowed or not, with logging. -TEST(ExtensionNameUtilTest, DEPRECATED_FEATURE_TEST(TestAllowDeprecatedExtensionName)) { - // Validate that no runtime available results in a log message and returns false. - { - auto test = []() { - return ExtensionNameUtil::allowDeprecatedExtensionName("XXX", "deprecated", "canonical", - nullptr); - }; - EXPECT_FALSE(test()); - - EXPECT_LOG_CONTAINS("error", "#using-runtime-overrides-for-deprecated-features", test()); - } - - // If deprecated feature is enabled, log and return true. - { - NiceMock runtime; - - EXPECT_CALL( - runtime.snapshot_, - deprecatedFeatureEnabled("envoy.deprecated_features.allow_deprecated_extension_names", _)) - .WillRepeatedly(Return(true)); - - auto test = [&]() { - return ExtensionNameUtil::allowDeprecatedExtensionName("XXX", "deprecated", "canonical", - &runtime); - }; - EXPECT_TRUE(test()); - - EXPECT_LOG_CONTAINS("warn", "Using deprecated XXX extension name 'deprecated' for 'canonical'.", - test()); - } - - // If deprecated feature is disabled, log and return false. - { - NiceMock runtime; - - EXPECT_CALL( - runtime.snapshot_, - deprecatedFeatureEnabled("envoy.deprecated_features.allow_deprecated_extension_names", _)) - .WillRepeatedly(Return(false)); - - auto test = [&]() { - return ExtensionNameUtil::allowDeprecatedExtensionName("XXX", "deprecated", "canonical", - &runtime); - }; - EXPECT_FALSE(test()); - - EXPECT_LOG_CONTAINS("error", "#using-runtime-overrides-for-deprecated-features", test()); - } -} - -} // namespace -} // namespace Utility -} // namespace Common -} // namespace Extensions -} // namespace Envoy diff --git a/test/extensions/filters/http/buffer/config_test.cc b/test/extensions/filters/http/buffer/config_test.cc index e2cd5d071f44..a92b31c3c51f 100644 --- a/test/extensions/filters/http/buffer/config_test.cc +++ b/test/extensions/filters/http/buffer/config_test.cc @@ -100,17 +100,6 @@ TEST(BufferFilterFactoryTest, BufferFilterRouteSpecificConfig) { EXPECT_TRUE(inflated); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(BufferFilterFactoryTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.buffer"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace } // namespace BufferFilter } // namespace HttpFilters diff --git a/test/extensions/filters/http/common/BUILD b/test/extensions/filters/http/common/BUILD index 598dccde48eb..d414adf79d57 100644 --- a/test/extensions/filters/http/common/BUILD +++ b/test/extensions/filters/http/common/BUILD @@ -72,15 +72,3 @@ envoy_cc_test( "//test/test_common:utility_lib", ], ) - -envoy_cc_test( - name = "utility_test", - srcs = [ - "utility_test.cc", - ], - deps = [ - "//source/extensions/filters/http/common:utility_lib", - "//test/mocks/runtime:runtime_mocks", - "//test/test_common:utility_lib", - ], -) diff --git a/test/extensions/filters/http/common/fuzz/BUILD b/test/extensions/filters/http/common/fuzz/BUILD index 339951337bc6..88b90ccd2146 100644 --- a/test/extensions/filters/http/common/fuzz/BUILD +++ b/test/extensions/filters/http/common/fuzz/BUILD @@ -49,7 +49,6 @@ envoy_cc_test_library( "//source/common/http:utility_lib", "//source/common/protobuf:utility_lib", "//source/common/tracing:http_tracer_lib", - "//source/extensions/filters/http/common:utility_lib", "//test/mocks/buffer:buffer_mocks", "//test/mocks/http:http_mocks", "//test/mocks/server:factory_context_mocks", diff --git a/test/extensions/filters/http/common/fuzz/uber_per_filter.cc b/test/extensions/filters/http/common/fuzz/uber_per_filter.cc index c75446f2266f..4e3527b8cb46 100644 --- a/test/extensions/filters/http/common/fuzz/uber_per_filter.cc +++ b/test/extensions/filters/http/common/fuzz/uber_per_filter.cc @@ -3,7 +3,6 @@ #include "envoy/extensions/filters/http/tap/v3/tap.pb.h" #include "source/common/tracing/http_tracer_impl.h" -#include "source/extensions/filters/http/common/utility.h" #include "test/extensions/filters/http/common/fuzz/uber_filter.h" #include "test/proto/bookstore.pb.h" @@ -94,13 +93,11 @@ void cleanTapConfig(Protobuf::Message* message) { void UberFilterFuzzer::cleanFuzzedConfig(absl::string_view filter_name, Protobuf::Message* message) { - const std::string name = Extensions::HttpFilters::Common::FilterNameUtil::canonicalFilterName( - std::string(filter_name)); // Map filter name to clean-up function. if (filter_name == "envoy.filters.http.grpc_json_transcoder") { // Add a valid service proto descriptor. addBookstoreProtoDescriptor(message); - } else if (name == "envoy.filters.http.tap") { + } else if (filter_name == "envoy.filters.http.tap") { // TapDS oneof field and OutputSinkType StreamingGrpc not implemented cleanTapConfig(message); } diff --git a/test/extensions/filters/http/common/utility_test.cc b/test/extensions/filters/http/common/utility_test.cc deleted file mode 100644 index 0aa3a35cad86..000000000000 --- a/test/extensions/filters/http/common/utility_test.cc +++ /dev/null @@ -1,64 +0,0 @@ -#include "source/extensions/filters/http/common/utility.h" - -#include "test/mocks/runtime/mocks.h" -#include "test/test_common/utility.h" - -#include "gmock/gmock.h" -#include "gtest/gtest.h" - -using testing::_; -using testing::NiceMock; -using testing::Return; - -namespace Envoy { -namespace Extensions { -namespace HttpFilters { -namespace Common { -namespace { - -// Test that canonical (or unknown) names are returned unmodified. -TEST(FilterNameUtilTest, TestIgnoreCanonicalName) { - NiceMock runtime; - - EXPECT_EQ("envoy.filters.http.buffer", - FilterNameUtil::canonicalFilterName("envoy.filters.http.buffer", &runtime)); - EXPECT_EQ("canonical.name", FilterNameUtil::canonicalFilterName("canonical.name", &runtime)); -} - -// Test that deprecated names are canonicalized. -TEST(FilterNameUtilTest, DEPRECATED_FEATURE_TEST(TestDeprecatedName)) { - NiceMock runtime; - - EXPECT_CALL( - runtime.snapshot_, - deprecatedFeatureEnabled("envoy.deprecated_features.allow_deprecated_extension_names", _)) - .WillRepeatedly(Return(true)); - - EXPECT_EQ("envoy.filters.http.buffer", - FilterNameUtil::canonicalFilterName("envoy.buffer", &runtime)); - EXPECT_EQ("envoy.filters.http.squash", - FilterNameUtil::canonicalFilterName("envoy.squash", &runtime)); -} - -// Test that deprecated names trigger an exception if the deprecated name feature is disabled. -TEST(FilterNameUtilTest, TestDeprecatedNameThrows) { - NiceMock runtime; - - EXPECT_CALL( - runtime.snapshot_, - deprecatedFeatureEnabled("envoy.deprecated_features.allow_deprecated_extension_names", _)) - .WillRepeatedly(Return(false)); - - EXPECT_THROW_WITH_REGEX(FilterNameUtil::canonicalFilterName("envoy.buffer", &runtime), - EnvoyException, - "Using deprecated http filter extension name 'envoy.buffer' .*"); - EXPECT_THROW_WITH_REGEX(FilterNameUtil::canonicalFilterName("envoy.squash", &runtime), - EnvoyException, - "Using deprecated http filter extension name 'envoy.squash' .*"); -} - -} // namespace -} // namespace Common -} // namespace HttpFilters -} // namespace Extensions -} // namespace Envoy diff --git a/test/extensions/filters/http/cors/cors_filter_test.cc b/test/extensions/filters/http/cors/cors_filter_test.cc index 1a9dd4ed6f74..43e74f222f1a 100644 --- a/test/extensions/filters/http/cors/cors_filter_test.cc +++ b/test/extensions/filters/http/cors/cors_filter_test.cc @@ -703,17 +703,6 @@ TEST_F(CorsFilterTest, OptionsRequestNotMatchingOriginByRegex) { EXPECT_EQ(Http::FilterTrailersStatus::Continue, filter_.encodeTrailers(response_trailers_)); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(CorsFilterConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.cors"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace Cors } // namespace HttpFilters } // namespace Extensions diff --git a/test/extensions/filters/http/csrf/csrf_filter_test.cc b/test/extensions/filters/http/csrf/csrf_filter_test.cc index e9be66e11618..62de86682b5f 100644 --- a/test/extensions/filters/http/csrf/csrf_filter_test.cc +++ b/test/extensions/filters/http/csrf/csrf_filter_test.cc @@ -450,17 +450,6 @@ TEST_F(CsrfFilterTest, RequestFromInvalidAdditionalRegexOrigin) { EXPECT_EQ(0U, config_->stats().request_valid_.value()); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(CsrfFilterConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.csrf"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace Csrf } // namespace HttpFilters } // namespace Extensions diff --git a/test/extensions/filters/http/dynamo/config_test.cc b/test/extensions/filters/http/dynamo/config_test.cc index 36abb93545c6..e7658d3e26bb 100644 --- a/test/extensions/filters/http/dynamo/config_test.cc +++ b/test/extensions/filters/http/dynamo/config_test.cc @@ -26,17 +26,6 @@ TEST(DynamoFilterConfigTest, DynamoFilter) { cb(filter_callback); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(DynamoFilterConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.http_dynamo_filter"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace } // namespace Dynamo } // namespace HttpFilters diff --git a/test/extensions/filters/http/ext_authz/config_test.cc b/test/extensions/filters/http/ext_authz/config_test.cc index da59c41c5125..0843ced89623 100644 --- a/test/extensions/filters/http/ext_authz/config_test.cc +++ b/test/extensions/filters/http/ext_authz/config_test.cc @@ -241,17 +241,6 @@ TEST_F(ExtAuthzFilterGrpcTest, GoogleGrpc) { testFilterFactoryAndFilterWithGrpcClient(ext_authz_config_yaml); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(HttpExtAuthzConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.ext_authz"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace ExtAuthz } // namespace HttpFilters } // namespace Extensions diff --git a/test/extensions/filters/http/fault/config_test.cc b/test/extensions/filters/http/fault/config_test.cc index 6bf877d09d2c..0dcef3419f74 100644 --- a/test/extensions/filters/http/fault/config_test.cc +++ b/test/extensions/filters/http/fault/config_test.cc @@ -69,17 +69,6 @@ TEST(FaultFilterConfigTest, FaultFilterEmptyProto) { cb(filter_callback); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(FaultFilterConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.fault"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace } // namespace Fault } // namespace HttpFilters diff --git a/test/extensions/filters/http/grpc_http1_bridge/config_test.cc b/test/extensions/filters/http/grpc_http1_bridge/config_test.cc index 07214e4a544f..f54d81de6f94 100644 --- a/test/extensions/filters/http/grpc_http1_bridge/config_test.cc +++ b/test/extensions/filters/http/grpc_http1_bridge/config_test.cc @@ -23,17 +23,6 @@ TEST(GrpcHttp1BridgeFilterConfigTest, GrpcHttp1BridgeFilter) { cb(filter_callback); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(GrpcHttp1BridgeFilterConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.grpc_http1_bridge"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace } // namespace GrpcHttp1Bridge } // namespace HttpFilters diff --git a/test/extensions/filters/http/grpc_json_transcoder/config_test.cc b/test/extensions/filters/http/grpc_json_transcoder/config_test.cc index 690040c33b8d..014bec89bbaf 100644 --- a/test/extensions/filters/http/grpc_json_transcoder/config_test.cc +++ b/test/extensions/filters/http/grpc_json_transcoder/config_test.cc @@ -22,17 +22,6 @@ TEST(GrpcJsonTranscoderFilterConfigTest, ValidateFail) { ProtoValidationException); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(GrpcJsonTranscoderFilterConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.grpc_json_transcoder"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace } // namespace GrpcJsonTranscoder } // namespace HttpFilters diff --git a/test/extensions/filters/http/grpc_web/config_test.cc b/test/extensions/filters/http/grpc_web/config_test.cc index 400fec0fd124..32be18ff29b7 100644 --- a/test/extensions/filters/http/grpc_web/config_test.cc +++ b/test/extensions/filters/http/grpc_web/config_test.cc @@ -23,17 +23,6 @@ TEST(GrpcWebFilterConfigTest, GrpcWebFilter) { cb(filter_callback); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(GrpcWebFilterConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.grpc_web"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace } // namespace GrpcWeb } // namespace HttpFilters diff --git a/test/extensions/filters/http/health_check/config_test.cc b/test/extensions/filters/http/health_check/config_test.cc index 3eb5204b0fff..7913ffec1754 100644 --- a/test/extensions/filters/http/health_check/config_test.cc +++ b/test/extensions/filters/http/health_check/config_test.cc @@ -270,17 +270,6 @@ TEST(HealthCheckFilterConfig, HealthCheckFilterDuplicateNoMatch) { testHealthCheckHeaderMatch(config, headers, false); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(HealthCheckFilterConfig, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.health_check"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace } // namespace HealthCheck } // namespace HttpFilters diff --git a/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc b/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc index e4923236c688..3ec1ffa7ab7e 100644 --- a/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc +++ b/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc @@ -286,17 +286,6 @@ TEST_F(IpTaggingFilterTest, ClearRouteCache) { EXPECT_FALSE(request_headers.has(Http::Headers::get().EnvoyIpTags)); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(IpTaggingFilterConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.ip_tagging"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace } // namespace IpTagging } // namespace HttpFilters diff --git a/test/extensions/filters/http/lua/config_test.cc b/test/extensions/filters/http/lua/config_test.cc index 68582e11ae7e..71c2ba8137fa 100644 --- a/test/extensions/filters/http/lua/config_test.cc +++ b/test/extensions/filters/http/lua/config_test.cc @@ -41,17 +41,6 @@ TEST(LuaFilterConfigTest, LuaFilterInJson) { cb(filter_callback); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(LuaFilterConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.lua"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace } // namespace Lua } // namespace HttpFilters diff --git a/test/extensions/filters/http/lua/lua_filter_test.cc b/test/extensions/filters/http/lua/lua_filter_test.cc index f1438a29cb25..962c890c10cb 100644 --- a/test/extensions/filters/http/lua/lua_filter_test.cc +++ b/test/extensions/filters/http/lua/lua_filter_test.cc @@ -1676,31 +1676,6 @@ TEST_F(LuaHttpFilterTest, GetMetadataFromHandle) { EXPECT_EQ(Http::FilterHeadersStatus::Continue, filter_->decodeHeaders(request_headers, true)); } -// Test that the deprecated filter is disabled by default for metadata. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST_F(LuaHttpFilterTest, DEPRECATED_FEATURE_TEST(GetMetadataFromHandleUsingDeprecatedName)) { - const std::string SCRIPT{R"EOF( - function envoy_on_request(request_handle) - request_handle:logTrace(request_handle:metadata():get("foo.bar")["name"]) - end - )EOF"}; - - const std::string METADATA{R"EOF( - filter_metadata: - envoy.lua: - foo.bar: - name: foo - )EOF"}; - - InSequence s; - setup(SCRIPT); - setupMetadata(METADATA); - - // Logs deprecation warning the first time. - Http::TestRequestHeaderMapImpl request_headers{{":path", "/"}}; - EXPECT_CALL(*filter_, scriptLog(spdlog::level::trace, StrEq("foo"))).Times(0); -} - // No available metadata on route. TEST_F(LuaHttpFilterTest, GetMetadataFromHandleNoRoute) { const std::string SCRIPT{R"EOF( diff --git a/test/extensions/filters/http/ratelimit/config_test.cc b/test/extensions/filters/http/ratelimit/config_test.cc index feeebbf19dd5..461806635152 100644 --- a/test/extensions/filters/http/ratelimit/config_test.cc +++ b/test/extensions/filters/http/ratelimit/config_test.cc @@ -81,17 +81,6 @@ TEST(RateLimitFilterConfigTest, BadRateLimitFilterConfig) { "route_key: Cannot find field"); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(RateLimitFilterConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.rate_limit"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace } // namespace RateLimitFilter } // namespace HttpFilters diff --git a/test/extensions/filters/http/router/config_test.cc b/test/extensions/filters/http/router/config_test.cc index 912f2f912822..2f3b8f41d100 100644 --- a/test/extensions/filters/http/router/config_test.cc +++ b/test/extensions/filters/http/router/config_test.cc @@ -86,17 +86,6 @@ TEST(RouterFilterConfigTest, RouterFilterWithEmptyProtoConfig) { cb(filter_callback); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(RouterFilterConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.router"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace } // namespace RouterFilter } // namespace HttpFilters 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 97e71eb11844..ada1005d9330 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,17 +45,6 @@ TEST(HttpInspectorConfigFactoryTest, TestCreateFactory) { EXPECT_NE(dynamic_cast(added_filter.get()), nullptr); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(HttpInspectorConfigFactoryTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.listener.http_inspector"; - - ASSERT_EQ( - 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 index 4c46dcf6898b..9a17b57d40f4 100644 --- a/test/extensions/filters/listener/original_dst/BUILD +++ b/test/extensions/filters/listener/original_dst/BUILD @@ -3,25 +3,11 @@ load( "envoy_cc_fuzz_test", "envoy_package", ) -load( - "//test/extensions:extensions_build_system.bzl", - "envoy_extension_cc_test", -) licenses(["notice"]) # Apache 2 envoy_package() -envoy_extension_cc_test( - name = "config_test", - srcs = ["config_test.cc"], - extension_names = ["envoy.filters.listener.original_dst"], - deps = [ - "//source/extensions/filters/listener/original_dst:config", - "//test/test_common:utility_lib", - ], -) - envoy_cc_fuzz_test( name = "original_dst_fuzz_test", srcs = ["original_dst_fuzz_test.cc"], diff --git a/test/extensions/filters/listener/original_dst/config_test.cc b/test/extensions/filters/listener/original_dst/config_test.cc deleted file mode 100644 index 167303d1ca40..000000000000 --- a/test/extensions/filters/listener/original_dst/config_test.cc +++ /dev/null @@ -1,29 +0,0 @@ -#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 is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(OriginalDstConfigFactoryTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.listener.original_dst"; - - ASSERT_EQ( - 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 5369367dba95..758442c7e919 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 @@ -43,17 +43,6 @@ TEST(OriginalSrcConfigFactoryTest, TestCreateFactory) { EXPECT_NE(dynamic_cast(added_filter.get()), nullptr); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(OriginalSrcConfigFactoryTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.listener.original_src"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry< - Server::Configuration::NamedListenerFilterConfigFactory>::getFactory(deprecated_name)); -} - } // namespace } // namespace OriginalSrc } // namespace ListenerFilters 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 76c835a727d8..941c474ece02 100644 --- a/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc +++ b/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc @@ -1560,17 +1560,6 @@ TEST(ProxyProtocolConfigFactoryTest, TestCreateFactory) { EXPECT_NE(dynamic_cast(added_filter.get()), nullptr); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(ProxyProtocolConfigFactoryTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.listener.proxy_protocol"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry< - Server::Configuration::NamedListenerFilterConfigFactory>::getFactory(deprecated_name)); -} - } // namespace } // namespace ProxyProtocol } // namespace ListenerFilters 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 5a1b214dbe20..33ef557dbc63 100644 --- a/test/extensions/filters/listener/tls_inspector/tls_inspector_test.cc +++ b/test/extensions/filters/listener/tls_inspector/tls_inspector_test.cc @@ -405,17 +405,6 @@ TEST_P(TlsInspectorTest, InlineReadSucceed) { EXPECT_EQ(Network::FilterStatus::Continue, filter_->onAccept(cb_)); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(TlsInspectorConfigFactoryTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.listener.tls_inspector"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry< - Server::Configuration::NamedListenerFilterConfigFactory>::getFactory(deprecated_name)); -} - } // namespace } // namespace TlsInspector } // namespace ListenerFilters diff --git a/test/extensions/filters/network/client_ssl_auth/config_test.cc b/test/extensions/filters/network/client_ssl_auth/config_test.cc index 81702113a179..5ad528590baf 100644 --- a/test/extensions/filters/network/client_ssl_auth/config_test.cc +++ b/test/extensions/filters/network/client_ssl_auth/config_test.cc @@ -101,17 +101,6 @@ TEST(ClientSslAuthConfigFactoryTest, ValidateFail) { ProtoValidationException); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(ClientSslAuthConfigFactoryTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.client_ssl_auth"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace ClientSslAuth } // namespace NetworkFilters } // namespace Extensions diff --git a/test/extensions/filters/network/common/BUILD b/test/extensions/filters/network/common/BUILD deleted file mode 100644 index 046af1acac14..000000000000 --- a/test/extensions/filters/network/common/BUILD +++ /dev/null @@ -1,21 +0,0 @@ -load( - "//bazel:envoy_build_system.bzl", - "envoy_cc_test", - "envoy_package", -) - -licenses(["notice"]) # Apache 2 - -envoy_package() - -envoy_cc_test( - name = "utility_test", - srcs = [ - "utility_test.cc", - ], - deps = [ - "//source/extensions/filters/network/common:utility_lib", - "//test/mocks/runtime:runtime_mocks", - "//test/test_common:utility_lib", - ], -) diff --git a/test/extensions/filters/network/common/fuzz/BUILD b/test/extensions/filters/network/common/fuzz/BUILD index 1ca89bf59f76..43f0e0a0c9cc 100644 --- a/test/extensions/filters/network/common/fuzz/BUILD +++ b/test/extensions/filters/network/common/fuzz/BUILD @@ -49,7 +49,6 @@ envoy_cc_test_library( "//source/common/network:address_lib", "//source/extensions/filters/common/ratelimit:ratelimit_lib", "//source/extensions/filters/network:well_known_names", - "//source/extensions/filters/network/common:utility_lib", "//test/extensions/filters/common/ext_authz:ext_authz_test_common", "//test/extensions/filters/network/common/fuzz/utils:network_filter_fuzzer_fakes_lib", "//test/fuzz:utility_lib", @@ -86,7 +85,6 @@ envoy_cc_test_library( ":network_writefilter_fuzz_proto_cc_proto", "//source/common/config:utility_lib", "//source/extensions/filters/network:well_known_names", - "//source/extensions/filters/network/common:utility_lib", "//test/extensions/filters/network/common/fuzz/utils:network_filter_fuzzer_fakes_lib", "//test/fuzz:utility_lib", "//test/mocks/network:network_mocks", diff --git a/test/extensions/filters/network/common/fuzz/uber_per_readfilter.cc b/test/extensions/filters/network/common/fuzz/uber_per_readfilter.cc index db7af7eb32ea..c63165bc81f3 100644 --- a/test/extensions/filters/network/common/fuzz/uber_per_readfilter.cc +++ b/test/extensions/filters/network/common/fuzz/uber_per_readfilter.cc @@ -3,7 +3,6 @@ #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.h" #include "source/extensions/filters/common/ratelimit/ratelimit_impl.h" -#include "source/extensions/filters/network/common/utility.h" #include "source/extensions/filters/network/well_known_names.h" #include "test/extensions/filters/common/ext_authz/test_common.h" @@ -119,8 +118,6 @@ void UberFilterFuzzer::checkInvalidInputForFuzzer(const std::string& filter_name // mock/fake objects are also prohibited. We could also avoid fuzzing some unfinished features by // checking them here. For now there are only three filters {DirectResponse, LocalRateLimit, // HttpConnectionManager} on which we have constraints. - const std::string name = Extensions::NetworkFilters::Common::FilterNameUtil::canonicalFilterName( - std::string(filter_name)); if (filter_name == NetworkFilterNames::get().DirectResponse) { envoy::extensions::filters::network::direct_response::v3::Config& config = dynamic_cast( diff --git a/test/extensions/filters/network/common/fuzz/uber_per_writefilter.cc b/test/extensions/filters/network/common/fuzz/uber_per_writefilter.cc index 350673901bfe..24babee1697d 100644 --- a/test/extensions/filters/network/common/fuzz/uber_per_writefilter.cc +++ b/test/extensions/filters/network/common/fuzz/uber_per_writefilter.cc @@ -1,4 +1,3 @@ -#include "source/extensions/filters/network/common/utility.h" #include "source/extensions/filters/network/well_known_names.h" #include "test/extensions/filters/network/common/fuzz/uber_writefilter.h" diff --git a/test/extensions/filters/network/common/utility_test.cc b/test/extensions/filters/network/common/utility_test.cc deleted file mode 100644 index 05c6e9d815a7..000000000000 --- a/test/extensions/filters/network/common/utility_test.cc +++ /dev/null @@ -1,60 +0,0 @@ -#include "source/extensions/filters/network/common/utility.h" -#include "source/extensions/filters/network/well_known_names.h" - -#include "test/mocks/runtime/mocks.h" -#include "test/test_common/utility.h" - -#include "gmock/gmock.h" -#include "gtest/gtest.h" - -using testing::_; -using testing::NiceMock; -using testing::Return; - -namespace Envoy { -namespace Extensions { -namespace NetworkFilters { -namespace Common { -namespace { - -// Test that canonical (or unknown) names are returned unmodified. -TEST(FilterNameUtilTest, TestIgnoreCanonicalName) { - NiceMock runtime; - - EXPECT_EQ(NetworkFilterNames::get().RedisProxy, - FilterNameUtil::canonicalFilterName(NetworkFilterNames::get().RedisProxy, &runtime)); - EXPECT_EQ("canonical.name", FilterNameUtil::canonicalFilterName("canonical.name", &runtime)); -} - -// Test that deprecated names are canonicalized. -TEST(FilterNameUtilTest, DEPRECATED_FEATURE_TEST(TestDeprecatedName)) { - NiceMock runtime; - - EXPECT_CALL( - runtime.snapshot_, - deprecatedFeatureEnabled("envoy.deprecated_features.allow_deprecated_extension_names", _)) - .WillRepeatedly(Return(true)); - - EXPECT_EQ(NetworkFilterNames::get().RedisProxy, - FilterNameUtil::canonicalFilterName("envoy.redis_proxy", &runtime)); -} - -// Test that deprecated names trigger an exception if the deprecated name feature is disabled. -TEST(FilterNameUtilTest, TestDeprecatedNameThrows) { - NiceMock runtime; - - EXPECT_CALL( - runtime.snapshot_, - deprecatedFeatureEnabled("envoy.deprecated_features.allow_deprecated_extension_names", _)) - .WillRepeatedly(Return(false)); - - EXPECT_THROW_WITH_REGEX(FilterNameUtil::canonicalFilterName("envoy.redis_proxy", &runtime), - EnvoyException, - "Using deprecated network filter extension name 'envoy.redis_proxy' .*"); -} - -} // namespace -} // namespace Common -} // namespace NetworkFilters -} // namespace Extensions -} // namespace Envoy diff --git a/test/extensions/filters/network/ext_authz/config_test.cc b/test/extensions/filters/network/ext_authz/config_test.cc index 518162f43026..73e2bc677a7d 100644 --- a/test/extensions/filters/network/ext_authz/config_test.cc +++ b/test/extensions/filters/network/ext_authz/config_test.cc @@ -64,17 +64,6 @@ TEST(ExtAuthzFilterConfigTest, ValidateFail) { TEST(ExtAuthzFilterConfigTest, ExtAuthzCorrectProto) { expectCorrectProto(); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(ExtAuthzConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.ext_authz"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace ExtAuthz } // namespace NetworkFilters } // namespace Extensions diff --git a/test/extensions/filters/network/http_connection_manager/config_test.cc b/test/extensions/filters/network/http_connection_manager/config_test.cc index acd03ec923d1..2410e338e87d 100644 --- a/test/extensions/filters/network/http_connection_manager/config_test.cc +++ b/test/extensions/filters/network/http_connection_manager/config_test.cc @@ -1707,17 +1707,6 @@ stat_prefix: my_stat_prefix R"(inconsistent HTTP/2 custom SETTINGS parameter\(s\) detected; identifiers = \{0x0a\})"); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST_F(HttpConnectionManagerConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.http_connection_manager"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - TEST_F(HttpConnectionManagerConfigTest, AlwaysSetRequestIdInResponseDefault) { const std::string yaml_string = R"EOF( stat_prefix: ingress_http diff --git a/test/extensions/filters/network/mongo_proxy/config_test.cc b/test/extensions/filters/network/mongo_proxy/config_test.cc index 0548d72ca721..6db4d42e7994 100644 --- a/test/extensions/filters/network/mongo_proxy/config_test.cc +++ b/test/extensions/filters/network/mongo_proxy/config_test.cc @@ -226,17 +226,6 @@ TEST(MongoFilterConfigTest, CorrectFaultConfigurationInProto) { cb(connection); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(MongoFilterConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.mongo_proxy"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace MongoProxy } // namespace NetworkFilters } // namespace Extensions diff --git a/test/extensions/filters/network/ratelimit/config_test.cc b/test/extensions/filters/network/ratelimit/config_test.cc index c92b14ca2763..3d560c784049 100644 --- a/test/extensions/filters/network/ratelimit/config_test.cc +++ b/test/extensions/filters/network/ratelimit/config_test.cc @@ -88,17 +88,6 @@ ip_allowlist: '12' "ip_allowlist: Cannot find field"); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(RateLimitFilterConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.ratelimit"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace RateLimitFilter } // namespace NetworkFilters } // namespace Extensions diff --git a/test/extensions/filters/network/redis_proxy/config_test.cc b/test/extensions/filters/network/redis_proxy/config_test.cc index 2b517317a6bd..f46ba13cfeab 100644 --- a/test/extensions/filters/network/redis_proxy/config_test.cc +++ b/test/extensions/filters/network/redis_proxy/config_test.cc @@ -148,17 +148,6 @@ stat_prefix: foo cb(connection); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(RedisProxyFilterConfigFactoryTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.redis_proxy"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace RedisProxy } // namespace NetworkFilters } // namespace Extensions diff --git a/test/extensions/filters/network/tcp_proxy/config_test.cc b/test/extensions/filters/network/tcp_proxy/config_test.cc index ff3457f2cf7c..aa7f208bf642 100644 --- a/test/extensions/filters/network/tcp_proxy/config_test.cc +++ b/test/extensions/filters/network/tcp_proxy/config_test.cc @@ -72,17 +72,6 @@ TEST(ConfigTest, ConfigTest) { cb(connection); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(ConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.tcp_proxy"; - - ASSERT_EQ( - nullptr, - Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace TcpProxy } // namespace NetworkFilters } // namespace Extensions diff --git a/test/extensions/stats_sinks/dog_statsd/config_test.cc b/test/extensions/stats_sinks/dog_statsd/config_test.cc index 86721e448853..7e4e4c5bd062 100644 --- a/test/extensions/stats_sinks/dog_statsd/config_test.cc +++ b/test/extensions/stats_sinks/dog_statsd/config_test.cc @@ -142,13 +142,6 @@ TEST_P(DogStatsdConfigLoopbackTest, WithCustomPrefix) { EXPECT_EQ(udp_sink->getPrefix(), customPrefix); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(DogStatsdConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - ASSERT_EQ(nullptr, Registry::FactoryRegistry::getFactory( - "envoy.dog_statsd")); -} - } // namespace } // namespace DogStatsd } // namespace StatSinks diff --git a/test/extensions/stats_sinks/metrics_service/BUILD b/test/extensions/stats_sinks/metrics_service/BUILD index fc7e62fc65ae..f9dd2bb49efc 100644 --- a/test/extensions/stats_sinks/metrics_service/BUILD +++ b/test/extensions/stats_sinks/metrics_service/BUILD @@ -11,17 +11,6 @@ licenses(["notice"]) # Apache 2 envoy_package() -envoy_extension_cc_test( - name = "config_test", - srcs = ["config_test.cc"], - extension_names = ["envoy.stat_sinks.metrics_service"], - deps = [ - "//envoy/registry", - "//source/extensions/stat_sinks/metrics_service:config", - "//test/test_common:utility_lib", - ], -) - envoy_extension_cc_test( name = "metrics_service_test", srcs = ["grpc_metrics_service_impl_test.cc"], diff --git a/test/extensions/stats_sinks/metrics_service/config_test.cc b/test/extensions/stats_sinks/metrics_service/config_test.cc deleted file mode 100644 index 313ac51b60c7..000000000000 --- a/test/extensions/stats_sinks/metrics_service/config_test.cc +++ /dev/null @@ -1,26 +0,0 @@ -#include "envoy/registry/registry.h" - -#include "source/extensions/stat_sinks/metrics_service/config.h" - -#include "test/test_common/utility.h" - -#include "gtest/gtest.h" - -namespace Envoy { -namespace Extensions { -namespace StatSinks { -namespace MetricsService { -namespace { - -// Test that the extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(MetricsServiceConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - ASSERT_EQ(nullptr, Registry::FactoryRegistry::getFactory( - "envoy.metrics_service")); -} - -} // namespace -} // namespace MetricsService -} // namespace StatSinks -} // namespace Extensions -} // namespace Envoy diff --git a/test/extensions/stats_sinks/statsd/config_test.cc b/test/extensions/stats_sinks/statsd/config_test.cc index 97d7dd87f821..3bf1c7fde5e1 100644 --- a/test/extensions/stats_sinks/statsd/config_test.cc +++ b/test/extensions/stats_sinks/statsd/config_test.cc @@ -42,15 +42,6 @@ TEST(StatsConfigTest, ValidTcpStatsd) { EXPECT_NE(dynamic_cast(sink.get()), nullptr); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(StatsConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.statsd"; - - ASSERT_EQ(nullptr, Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - class StatsConfigParameterizedTest : public testing::TestWithParam {}; INSTANTIATE_TEST_SUITE_P(IpVersions, StatsConfigParameterizedTest, diff --git a/test/extensions/tracers/dynamic_ot/config_test.cc b/test/extensions/tracers/dynamic_ot/config_test.cc index 06c81d180b05..d8a1acb4a90c 100644 --- a/test/extensions/tracers/dynamic_ot/config_test.cc +++ b/test/extensions/tracers/dynamic_ot/config_test.cc @@ -53,15 +53,6 @@ TEST(DynamicOtTracerConfigTest, DynamicOpentracingHttpTracer) { EXPECT_NE(nullptr, tracer); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(DynamicOtTracerConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.dynamic.ot"; - - ASSERT_EQ(nullptr, Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace } // namespace DynamicOt } // namespace Tracers diff --git a/test/extensions/tracers/lightstep/config_test.cc b/test/extensions/tracers/lightstep/config_test.cc index d25e23e07de6..3bb4fb867517 100644 --- a/test/extensions/tracers/lightstep/config_test.cc +++ b/test/extensions/tracers/lightstep/config_test.cc @@ -70,15 +70,6 @@ TEST(LightstepTracerConfigTest, LightstepHttpTracerAccessToken) { EXPECT_NE(nullptr, lightstep_tracer); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(LightstepTracerConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.lightstep"; - - ASSERT_EQ(nullptr, Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace } // namespace Lightstep } // namespace Tracers diff --git a/test/extensions/tracers/zipkin/config_test.cc b/test/extensions/tracers/zipkin/config_test.cc index 1d7f222d5f5c..7a44de3aca28 100644 --- a/test/extensions/tracers/zipkin/config_test.cc +++ b/test/extensions/tracers/zipkin/config_test.cc @@ -67,15 +67,6 @@ TEST(ZipkinTracerConfigTest, ZipkinHttpTracerWithTypedConfig) { EXPECT_NE(nullptr, zipkin_tracer); } -// Test that the deprecated extension name is disabled by default. -// TODO(zuercher): remove when envoy.deprecated_features.allow_deprecated_extension_names is removed -TEST(ZipkinTracerConfigTest, DEPRECATED_FEATURE_TEST(DeprecatedExtensionFilterName)) { - const std::string deprecated_name = "envoy.zipkin"; - - ASSERT_EQ(nullptr, Registry::FactoryRegistry::getFactory( - deprecated_name)); -} - } // namespace } // namespace Zipkin } // namespace Tracers diff --git a/test/server/options_impl_test.cc b/test/server/options_impl_test.cc index 06b4b4a02f7d..49b9b95d3643 100644 --- a/test/server/options_impl_test.cc +++ b/test/server/options_impl_test.cc @@ -621,58 +621,5 @@ class TestingFactory : public Config::TypedFactory { } }; -class TestTestingFactory : public TestingFactory { -public: - std::string name() const override { return "test"; } -}; - -TEST(DisableExtensions, DEPRECATED_FEATURE_TEST(IsDisabled)) { - TestTestFactory testTestFactory; - Registry::InjectFactoryCategory testTestCategory(testTestFactory); - Registry::InjectFactory testTestRegistration(testTestFactory, {"test-1", "test-2"}); - - TestTestingFactory testTestingFactory; - Registry::InjectFactoryCategory testTestingCategory(testTestingFactory); - Registry::InjectFactory testTestingRegistration(testTestingFactory, - {"test-1", "test-2"}); - - EXPECT_LOG_CONTAINS("warning", "failed to disable invalid extension name 'not.a.factory'", - OptionsImpl::disableExtensions({"not.a.factory"})); - - EXPECT_LOG_CONTAINS("warning", "failed to disable unknown extension 'no/such.factory'", - OptionsImpl::disableExtensions({"no/such.factory"})); - - EXPECT_NE(Registry::FactoryRegistry::getFactory("test"), nullptr); - EXPECT_EQ(Registry::FactoryRegistry::getFactory("test-1"), nullptr); - EXPECT_EQ(Registry::FactoryRegistry::getFactory("test-2"), nullptr); - EXPECT_NE(Registry::FactoryRegistry::getFactoryByType("google.protobuf.StringValue"), - nullptr); - - EXPECT_NE(Registry::FactoryRegistry::getFactory("test"), nullptr); - EXPECT_EQ(Registry::FactoryRegistry::getFactory("test-1"), nullptr); - EXPECT_EQ(Registry::FactoryRegistry::getFactory("test-2"), nullptr); - - OptionsImpl::disableExtensions({"test/test", "testing/test-2"}); - - // Simulate the initial construction of the type mappings. - testTestRegistration.resetTypeMappings(); - testTestingRegistration.resetTypeMappings(); - - // When we disable an extension, all its aliases should also be disabled. - EXPECT_EQ(Registry::FactoryRegistry::getFactory("test"), nullptr); - EXPECT_EQ(Registry::FactoryRegistry::getFactory("test-1"), nullptr); - EXPECT_EQ(Registry::FactoryRegistry::getFactory("test-2"), nullptr); - - // When we disable an extension, all its aliases should also be disabled. - EXPECT_EQ(Registry::FactoryRegistry::getFactory("test"), nullptr); - EXPECT_EQ(Registry::FactoryRegistry::getFactory("test-1"), nullptr); - EXPECT_EQ(Registry::FactoryRegistry::getFactory("test-2"), nullptr); - - // Typing map for TestingFactory should be constructed here after disabling - EXPECT_EQ( - Registry::FactoryRegistry::getFactoryByType("google.protobuf.StringValue"), - nullptr); -} - } // namespace } // namespace Envoy