From 85e7c188bfd516be52ff2f8396e71e652283b61c Mon Sep 17 00:00:00 2001 From: Long Dai Date: Thu, 27 May 2021 01:25:35 -0700 Subject: [PATCH] clusters: remove well_known_names Signed-off-by: Long Dai --- source/common/upstream/BUILD | 5 -- .../common/upstream/cluster_factory_impl.cc | 10 ++-- source/common/upstream/cluster_factory_impl.h | 2 - source/common/upstream/eds.h | 4 +- source/common/upstream/logical_dns_cluster.h | 5 +- source/common/upstream/original_dst_cluster.h | 5 +- source/common/upstream/static_cluster.h | 3 +- source/common/upstream/strict_dns_cluster.h | 3 +- source/extensions/clusters/BUILD | 12 ----- source/extensions/clusters/aggregate/BUILD | 1 - .../extensions/clusters/aggregate/cluster.h | 3 +- .../clusters/dynamic_forward_proxy/BUILD | 1 - .../clusters/dynamic_forward_proxy/cluster.h | 5 +- source/extensions/clusters/redis/BUILD | 2 - .../clusters/redis/redis_cluster.cc | 3 +- .../extensions/clusters/redis/redis_cluster.h | 4 +- .../clusters/redis/redis_cluster_lb.h | 1 - source/extensions/clusters/well_known_names.h | 48 ------------------- .../filters/http/dynamic_forward_proxy/BUILD | 1 - .../dynamic_forward_proxy/proxy_filter.cc | 4 +- .../network/redis_proxy/conn_pool_impl.cc | 3 +- .../filters/http/dynamic_forward_proxy/BUILD | 1 - .../proxy_filter_test.cc | 5 +- 23 files changed, 18 insertions(+), 113 deletions(-) delete mode 100644 source/extensions/clusters/well_known_names.h diff --git a/source/common/upstream/BUILD b/source/common/upstream/BUILD index e8b3693993742..3ed278bf859e3 100644 --- a/source/common/upstream/BUILD +++ b/source/common/upstream/BUILD @@ -293,7 +293,6 @@ envoy_cc_library( "//source/common/network:utility_lib", "//source/common/protobuf", "//source/common/protobuf:utility_lib", - "//source/extensions/clusters:well_known_names", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", @@ -312,7 +311,6 @@ envoy_cc_library( "//source/common/common:empty_string", "//source/common/network:address_lib", "//source/common/network:utility_lib", - "//source/extensions/clusters:well_known_names", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", @@ -415,7 +413,6 @@ envoy_cc_library( "//source/common/network:resolver_lib", "//source/common/network:utility_lib", "//source/common/protobuf:utility_lib", - "//source/extensions/clusters:well_known_names", "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -590,7 +587,6 @@ envoy_cc_library( "//source/common/network:utility_lib", "//source/common/protobuf", "//source/common/protobuf:utility_lib", - "//source/extensions/clusters:well_known_names", "//source/server:transport_socket_config_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", ], @@ -626,7 +622,6 @@ envoy_cc_library( "//source/common/config:well_known_names", "//source/common/stats:isolated_store_lib", "//source/common/stats:stats_lib", - "//source/extensions/clusters:well_known_names", "//source/server:transport_socket_config_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", ], diff --git a/source/common/upstream/cluster_factory_impl.cc b/source/common/upstream/cluster_factory_impl.cc index b9c21a75429ad..3053b5d2d7051 100644 --- a/source/common/upstream/cluster_factory_impl.cc +++ b/source/common/upstream/cluster_factory_impl.cc @@ -38,19 +38,19 @@ std::pair ClusterFactoryImplBase:: if (!cluster.has_cluster_type()) { switch (cluster.type()) { case envoy::config::cluster::v3::Cluster::STATIC: - cluster_type = Extensions::Clusters::ClusterTypes::get().Static; + cluster_type = "envoy.cluster.static"; break; case envoy::config::cluster::v3::Cluster::STRICT_DNS: - cluster_type = Extensions::Clusters::ClusterTypes::get().StrictDns; + cluster_type = "envoy.cluster.strict_dns"; break; case envoy::config::cluster::v3::Cluster::LOGICAL_DNS: - cluster_type = Extensions::Clusters::ClusterTypes::get().LogicalDns; + cluster_type = "envoy.cluster.logical_dns"; break; case envoy::config::cluster::v3::Cluster::ORIGINAL_DST: - cluster_type = Extensions::Clusters::ClusterTypes::get().OriginalDst; + cluster_type = "envoy.cluster.original_dst"; break; case envoy::config::cluster::v3::Cluster::EDS: - cluster_type = Extensions::Clusters::ClusterTypes::get().Eds; + cluster_type = "envoy.cluster.eds"; break; default: NOT_REACHED_GCOVR_EXCL_LINE; diff --git a/source/common/upstream/cluster_factory_impl.h b/source/common/upstream/cluster_factory_impl.h index 5a3e8b49cdcf6..c284e808a2fcf 100644 --- a/source/common/upstream/cluster_factory_impl.h +++ b/source/common/upstream/cluster_factory_impl.h @@ -44,8 +44,6 @@ #include "common/upstream/resource_manager_impl.h" #include "common/upstream/upstream_impl.h" -#include "extensions/clusters/well_known_names.h" - namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/eds.h b/source/common/upstream/eds.h index 224f0984e420c..314516cb49110 100644 --- a/source/common/upstream/eds.h +++ b/source/common/upstream/eds.h @@ -19,8 +19,6 @@ #include "common/upstream/cluster_factory_impl.h" #include "common/upstream/upstream_impl.h" -#include "extensions/clusters/well_known_names.h" - namespace Envoy { namespace Upstream { @@ -89,7 +87,7 @@ using EdsClusterImplSharedPtr = std::shared_ptr; class EdsClusterFactory : public ClusterFactoryImplBase { public: - EdsClusterFactory() : ClusterFactoryImplBase(Extensions::Clusters::ClusterTypes::get().Eds) {} + EdsClusterFactory() : ClusterFactoryImplBase("envoy.cluster.eds") {} private: std::pair createClusterImpl( diff --git a/source/common/upstream/logical_dns_cluster.h b/source/common/upstream/logical_dns_cluster.h index c0503cd891fdb..443523c53e2fb 100644 --- a/source/common/upstream/logical_dns_cluster.h +++ b/source/common/upstream/logical_dns_cluster.h @@ -15,8 +15,6 @@ #include "common/upstream/logical_host.h" #include "common/upstream/upstream_impl.h" -#include "extensions/clusters/well_known_names.h" - namespace Envoy { namespace Upstream { @@ -80,8 +78,7 @@ class LogicalDnsCluster : public ClusterImplBase { class LogicalDnsClusterFactory : public ClusterFactoryImplBase { public: - LogicalDnsClusterFactory() - : ClusterFactoryImplBase(Extensions::Clusters::ClusterTypes::get().LogicalDns) {} + LogicalDnsClusterFactory() : ClusterFactoryImplBase("envoy.cluster.logical_dns") {} private: std::pair createClusterImpl( diff --git a/source/common/upstream/original_dst_cluster.h b/source/common/upstream/original_dst_cluster.h index 0e1a3d992e7a7..36bdfe8af455d 100644 --- a/source/common/upstream/original_dst_cluster.h +++ b/source/common/upstream/original_dst_cluster.h @@ -15,8 +15,6 @@ #include "common/upstream/cluster_factory_impl.h" #include "common/upstream/upstream_impl.h" -#include "extensions/clusters/well_known_names.h" - namespace Envoy { namespace Upstream { @@ -120,8 +118,7 @@ using OriginalDstClusterSharedPtr = std::shared_ptr; class OriginalDstClusterFactory : public ClusterFactoryImplBase { public: - OriginalDstClusterFactory() - : ClusterFactoryImplBase(Extensions::Clusters::ClusterTypes::get().OriginalDst) {} + OriginalDstClusterFactory() : ClusterFactoryImplBase("envoy.cluster.original_dst") {} private: std::pair createClusterImpl( diff --git a/source/common/upstream/static_cluster.h b/source/common/upstream/static_cluster.h index b5de7b76b8dd6..0354f1f7df4fd 100644 --- a/source/common/upstream/static_cluster.h +++ b/source/common/upstream/static_cluster.h @@ -34,8 +34,7 @@ class StaticClusterImpl : public ClusterImplBase { */ class StaticClusterFactory : public ClusterFactoryImplBase { public: - StaticClusterFactory() - : ClusterFactoryImplBase(Extensions::Clusters::ClusterTypes::get().Static) {} + StaticClusterFactory() : ClusterFactoryImplBase("envoy.cluster.static") {} private: std::pair createClusterImpl( diff --git a/source/common/upstream/strict_dns_cluster.h b/source/common/upstream/strict_dns_cluster.h index 6895c411a5fb3..2c12344cf5a99 100644 --- a/source/common/upstream/strict_dns_cluster.h +++ b/source/common/upstream/strict_dns_cluster.h @@ -70,8 +70,7 @@ class StrictDnsClusterImpl : public BaseDynamicClusterImpl { */ class StrictDnsClusterFactory : public ClusterFactoryImplBase { public: - StrictDnsClusterFactory() - : ClusterFactoryImplBase(Extensions::Clusters::ClusterTypes::get().StrictDns) {} + StrictDnsClusterFactory() : ClusterFactoryImplBase("envoy.cluster.strict_dns") {} private: std::pair createClusterImpl( diff --git a/source/extensions/clusters/BUILD b/source/extensions/clusters/BUILD index 46709ec0c238c..90e061ad8da39 100644 --- a/source/extensions/clusters/BUILD +++ b/source/extensions/clusters/BUILD @@ -1,20 +1,8 @@ load( "//bazel:envoy_build_system.bzl", - "envoy_cc_library", "envoy_extension_package", ) licenses(["notice"]) # Apache 2 envoy_extension_package() - -envoy_cc_library( - name = "well_known_names", - hdrs = ["well_known_names.h"], - # well known names files are public as long as they exist. - visibility = ["//visibility:public"], - deps = [ - "//source/common/config:well_known_names", - "//source/common/singleton:const_singleton", - ], -) diff --git a/source/extensions/clusters/aggregate/BUILD b/source/extensions/clusters/aggregate/BUILD index 38f702f15543c..8a640940b7c76 100644 --- a/source/extensions/clusters/aggregate/BUILD +++ b/source/extensions/clusters/aggregate/BUILD @@ -18,7 +18,6 @@ envoy_cc_extension( deps = [ "//source/common/upstream:cluster_factory_lib", "//source/common/upstream:upstream_includes", - "//source/extensions/clusters:well_known_names", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/clusters/aggregate/v3:pkg_cc_proto", ], diff --git a/source/extensions/clusters/aggregate/cluster.h b/source/extensions/clusters/aggregate/cluster.h index 373897944b6c8..2d62ce594d0d6 100644 --- a/source/extensions/clusters/aggregate/cluster.h +++ b/source/extensions/clusters/aggregate/cluster.h @@ -160,8 +160,7 @@ struct AggregateThreadAwareLoadBalancer : public Upstream::ThreadAwareLoadBalanc class ClusterFactory : public Upstream::ConfigurableClusterFactoryBase< envoy::extensions::clusters::aggregate::v3::ClusterConfig> { public: - ClusterFactory() - : ConfigurableClusterFactoryBase(Extensions::Clusters::ClusterTypes::get().Aggregate) {} + ClusterFactory() : ConfigurableClusterFactoryBase("envoy.clusters.aggregate") {} private: std::pair diff --git a/source/extensions/clusters/dynamic_forward_proxy/BUILD b/source/extensions/clusters/dynamic_forward_proxy/BUILD index 36d74421839a1..44da3c9be55d9 100644 --- a/source/extensions/clusters/dynamic_forward_proxy/BUILD +++ b/source/extensions/clusters/dynamic_forward_proxy/BUILD @@ -16,7 +16,6 @@ envoy_cc_extension( "//source/common/network:transport_socket_options_lib", "//source/common/upstream:cluster_factory_lib", "//source/common/upstream:logical_host_lib", - "//source/extensions/clusters:well_known_names", "//source/extensions/common/dynamic_forward_proxy:dns_cache_interface", "//source/extensions/common/dynamic_forward_proxy:dns_cache_manager_impl", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", diff --git a/source/extensions/clusters/dynamic_forward_proxy/cluster.h b/source/extensions/clusters/dynamic_forward_proxy/cluster.h index 309da4ed44070..93f984c8dd59e 100644 --- a/source/extensions/clusters/dynamic_forward_proxy/cluster.h +++ b/source/extensions/clusters/dynamic_forward_proxy/cluster.h @@ -8,7 +8,6 @@ #include "common/upstream/cluster_factory_impl.h" #include "common/upstream/logical_host.h" -#include "extensions/clusters/well_known_names.h" #include "extensions/common/dynamic_forward_proxy/dns_cache.h" namespace Envoy { @@ -115,9 +114,7 @@ class Cluster : public Upstream::BaseDynamicClusterImpl, class ClusterFactory : public Upstream::ConfigurableClusterFactoryBase< envoy::extensions::clusters::dynamic_forward_proxy::v3::ClusterConfig> { public: - ClusterFactory() - : ConfigurableClusterFactoryBase( - Extensions::Clusters::ClusterTypes::get().DynamicForwardProxy) {} + ClusterFactory() : ConfigurableClusterFactoryBase("envoy.clusters.dynamic_forward_proxy") {} private: std::pair diff --git a/source/extensions/clusters/redis/BUILD b/source/extensions/clusters/redis/BUILD index 829f517516d24..3e01d5d9aa9ed 100644 --- a/source/extensions/clusters/redis/BUILD +++ b/source/extensions/clusters/redis/BUILD @@ -29,7 +29,6 @@ envoy_cc_library( "//include/envoy/upstream:upstream_interface", "//source/common/upstream:upstream_includes", "//source/common/upstream:upstream_lib", - "//source/extensions/clusters:well_known_names", "//source/extensions/filters/network/common/redis:client_interface", "//source/extensions/filters/network/common/redis:codec_interface", "//source/extensions/filters/network/common/redis:supported_commands_lib", @@ -59,7 +58,6 @@ envoy_cc_extension( "//source/common/upstream:cluster_factory_lib", "//source/common/upstream:upstream_includes", "//source/common/upstream:upstream_lib", - "//source/extensions/clusters:well_known_names", "//source/extensions/common/redis:cluster_refresh_manager_lib", "//source/extensions/filters/network/common/redis:client_interface", "//source/extensions/filters/network/common/redis:client_lib", diff --git a/source/extensions/clusters/redis/redis_cluster.cc b/source/extensions/clusters/redis/redis_cluster.cc index 822eab1166be6..2eb3207cad8f5 100644 --- a/source/extensions/clusters/redis/redis_cluster.cc +++ b/source/extensions/clusters/redis/redis_cluster.cc @@ -385,8 +385,7 @@ RedisClusterFactory::createClusterWithConfig( Upstream::ClusterFactoryContext& context, Envoy::Server::Configuration::TransportSocketFactoryContextImpl& socket_factory_context, Envoy::Stats::ScopePtr&& stats_scope) { - if (!cluster.has_cluster_type() || - cluster.cluster_type().name() != Extensions::Clusters::ClusterTypes::get().Redis) { + if (!cluster.has_cluster_type() || cluster.cluster_type().name() != "envoy.clusters.redis") { throw EnvoyException("Redis cluster can only created with redis cluster type."); } // TODO(hyang): This is needed to migrate existing cluster, disallow using other lb_policy diff --git a/source/extensions/clusters/redis/redis_cluster.h b/source/extensions/clusters/redis/redis_cluster.h index 49af6d50d1be9..f7729fddc47aa 100644 --- a/source/extensions/clusters/redis/redis_cluster.h +++ b/source/extensions/clusters/redis/redis_cluster.h @@ -59,7 +59,6 @@ #include "server/transport_socket_config_impl.h" -#include "extensions/clusters/well_known_names.h" #include "extensions/common/redis/cluster_refresh_manager_impl.h" #include "extensions/filters/network/common/redis/client.h" #include "extensions/filters/network/common/redis/client_impl.h" @@ -292,8 +291,7 @@ class RedisCluster : public Upstream::BaseDynamicClusterImpl { class RedisClusterFactory : public Upstream::ConfigurableClusterFactoryBase< envoy::extensions::clusters::redis::v3::RedisClusterConfig> { public: - RedisClusterFactory() - : ConfigurableClusterFactoryBase(Extensions::Clusters::ClusterTypes::get().Redis) {} + RedisClusterFactory() : ConfigurableClusterFactoryBase("envoy.clusters.redis") {} private: friend class RedisClusterTest; diff --git a/source/extensions/clusters/redis/redis_cluster_lb.h b/source/extensions/clusters/redis/redis_cluster_lb.h index 7ca27407d1612..77860938d581b 100644 --- a/source/extensions/clusters/redis/redis_cluster_lb.h +++ b/source/extensions/clusters/redis/redis_cluster_lb.h @@ -13,7 +13,6 @@ #include "source/extensions/clusters/redis/crc16.h" -#include "extensions/clusters/well_known_names.h" #include "extensions/filters/network/common/redis/client.h" #include "extensions/filters/network/common/redis/codec.h" #include "extensions/filters/network/common/redis/supported_commands.h" diff --git a/source/extensions/clusters/well_known_names.h b/source/extensions/clusters/well_known_names.h deleted file mode 100644 index a387cf32c735c..0000000000000 --- a/source/extensions/clusters/well_known_names.h +++ /dev/null @@ -1,48 +0,0 @@ -#pragma once - -#include "common/config/well_known_names.h" - -namespace Envoy { -namespace Extensions { -namespace Clusters { - -/** - * Well-known cluster types, this supersede the service discovery types - */ -class ClusterTypeValues { -public: - // Static clusters (cluster that have a fixed number of hosts with resolved IP addresses). - const std::string Static = "envoy.cluster.static"; - - // Strict DNS (cluster that periodic DNS resolution and updates the host member set if the DNS - // members change). - const std::string StrictDns = "envoy.cluster.strict_dns"; - - // Logical DNS (cluster that creates a single logical host that wraps an async DNS resolver). - const std::string LogicalDns = "envoy.cluster.logical_dns"; - - // Endpoint Discovery Service (dynamic cluster that reads host information from the Endpoint - // Discovery Service). - const std::string Eds = "envoy.cluster.eds"; - - // Original destination (dynamic cluster that automatically adds hosts as needed based on the - // original destination address of the downstream connection). - const std::string OriginalDst = "envoy.cluster.original_dst"; - - // Redis cluster (cluster that reads host information using the redis cluster protocol). - const std::string Redis = "envoy.clusters.redis"; - - // Dynamic forward proxy cluster. This cluster is designed to work directly with the - // dynamic forward proxy HTTP filter. - const std::string DynamicForwardProxy = "envoy.clusters.dynamic_forward_proxy"; - - // Aggregate cluster which may contain different types of clusters. It allows load balance between - // different type of clusters. - const std::string Aggregate = "envoy.clusters.aggregate"; -}; - -using ClusterTypes = ConstSingleton; - -} // namespace Clusters -} // namespace Extensions -} // namespace Envoy diff --git a/source/extensions/filters/http/dynamic_forward_proxy/BUILD b/source/extensions/filters/http/dynamic_forward_proxy/BUILD index 561f3e250f5e0..9b10214907852 100644 --- a/source/extensions/filters/http/dynamic_forward_proxy/BUILD +++ b/source/extensions/filters/http/dynamic_forward_proxy/BUILD @@ -16,7 +16,6 @@ envoy_cc_library( deps = [ "//include/envoy/http:filter_interface", "//source/common/http:header_utility_lib", - "//source/extensions/clusters:well_known_names", "//source/extensions/common/dynamic_forward_proxy:dns_cache_interface", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:pass_through_filter_lib", diff --git a/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.cc b/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.cc index c1ee980393d50..61cc51db154b2 100644 --- a/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.cc +++ b/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.cc @@ -6,7 +6,6 @@ #include "common/http/utility.h" -#include "extensions/clusters/well_known_names.h" #include "extensions/common/dynamic_forward_proxy/dns_cache.h" #include "extensions/filters/http/well_known_names.h" @@ -66,8 +65,7 @@ Http::FilterHeadersStatus ProxyFilter::decodeHeaders(Http::RequestHeaderMap& hea if (!cluster_type) { return Http::FilterHeadersStatus::Continue; } - if (cluster_type->name() != - Envoy::Extensions::Clusters::ClusterTypes::get().DynamicForwardProxy) { + if (cluster_type->name() != "envoy.clusters.dynamic_forward_proxy") { return Http::FilterHeadersStatus::Continue; } diff --git a/source/extensions/filters/network/redis_proxy/conn_pool_impl.cc b/source/extensions/filters/network/redis_proxy/conn_pool_impl.cc index 83c04e7bdb89f..f84a21702f1f9 100644 --- a/source/extensions/filters/network/redis_proxy/conn_pool_impl.cc +++ b/source/extensions/filters/network/redis_proxy/conn_pool_impl.cc @@ -153,8 +153,7 @@ void InstanceImpl::ThreadLocalPool::onClusterAddOrUpdateNonVirtual( Upstream::ClusterInfoConstSharedPtr info = cluster_->info(); const auto& cluster_type = info->clusterType(); is_redis_cluster_ = info->lbType() == Upstream::LoadBalancerType::ClusterProvided && - cluster_type.has_value() && - cluster_type->name() == Extensions::Clusters::ClusterTypes::get().Redis; + cluster_type.has_value() && cluster_type->name() == "envoy.clusters.redis"; } void InstanceImpl::ThreadLocalPool::onClusterRemoval(const std::string& cluster_name) { diff --git a/test/extensions/filters/http/dynamic_forward_proxy/BUILD b/test/extensions/filters/http/dynamic_forward_proxy/BUILD index 85b2553f2e339..f507231642e9b 100644 --- a/test/extensions/filters/http/dynamic_forward_proxy/BUILD +++ b/test/extensions/filters/http/dynamic_forward_proxy/BUILD @@ -29,7 +29,6 @@ envoy_extension_cc_test( extension_name = "envoy.filters.http.dynamic_forward_proxy", deps = [ "//source/common/stats:isolated_store_lib", - "//source/extensions/clusters:well_known_names", "//source/extensions/common/dynamic_forward_proxy:dns_cache_impl", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/dynamic_forward_proxy:config", diff --git a/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_test.cc b/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_test.cc index 1b912fe1329f9..275a603dc8b33 100644 --- a/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_test.cc +++ b/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_test.cc @@ -1,7 +1,6 @@ #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.h" -#include "extensions/clusters/well_known_names.h" #include "extensions/common/dynamic_forward_proxy/dns_cache_impl.h" #include "extensions/filters/http/dynamic_forward_proxy/proxy_filter.h" #include "extensions/filters/http/well_known_names.h" @@ -53,7 +52,7 @@ class ProxyFilterTest : public testing::Test, // Configure upstream cluster to be a Dynamic Forward Proxy since that's the // kind we need to do DNS entries for. CustomClusterType cluster_type; - cluster_type.set_name(Envoy::Extensions::Clusters::ClusterTypes::get().DynamicForwardProxy); + cluster_type.set_name("envoy.clusters.dynamic_forward_proxy"); cm_.thread_local_cluster_.cluster_.info_->cluster_type_ = cluster_type; // Configure max pending to 1 so we can test circuit breaking. @@ -262,7 +261,7 @@ TEST_F(ProxyFilterTest, NoClusterType) { // Cluster that isn't a dynamic forward proxy cluster TEST_F(ProxyFilterTest, NonDynamicForwardProxy) { CustomClusterType cluster_type; - cluster_type.set_name(Envoy::Extensions::Clusters::ClusterTypes::get().Static); + cluster_type.set_name("envoy.cluster.static"); cm_.thread_local_cluster_.cluster_.info_->cluster_type_ = cluster_type; InSequence s;