Skip to content

clusters: remove well_known_names #16741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snowp merged 1 commit into from
Jun 2, 2021
Merged

clusters: remove well_known_names #16741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions source/common/upstream/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
],
Expand Down Expand Up @@ -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",
],
Expand Down
10 changes: 5 additions & 5 deletions source/common/upstream/cluster_factory_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@ std::pair<ClusterSharedPtr, ThreadAwareLoadBalancerPtr> 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;
Expand Down
2 changes: 0 additions & 2 deletions source/common/upstream/cluster_factory_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 1 addition & 3 deletions source/common/upstream/eds.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -89,7 +87,7 @@ using EdsClusterImplSharedPtr = std::shared_ptr<EdsClusterImpl>;

class EdsClusterFactory : public ClusterFactoryImplBase {
public:
EdsClusterFactory() : ClusterFactoryImplBase(Extensions::Clusters::ClusterTypes::get().Eds) {}
EdsClusterFactory() : ClusterFactoryImplBase("envoy.cluster.eds") {}

private:
std::pair<ClusterImplBaseSharedPtr, ThreadAwareLoadBalancerPtr> createClusterImpl(
Expand Down
5 changes: 1 addition & 4 deletions source/common/upstream/logical_dns_cluster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -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<ClusterImplBaseSharedPtr, ThreadAwareLoadBalancerPtr> createClusterImpl(
Expand Down
5 changes: 1 addition & 4 deletions source/common/upstream/original_dst_cluster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -120,8 +118,7 @@ using OriginalDstClusterSharedPtr = std::shared_ptr<OriginalDstCluster>;

class OriginalDstClusterFactory : public ClusterFactoryImplBase {
public:
OriginalDstClusterFactory()
: ClusterFactoryImplBase(Extensions::Clusters::ClusterTypes::get().OriginalDst) {}
OriginalDstClusterFactory() : ClusterFactoryImplBase("envoy.cluster.original_dst") {}

private:
std::pair<ClusterImplBaseSharedPtr, ThreadAwareLoadBalancerPtr> createClusterImpl(
Expand Down
3 changes: 1 addition & 2 deletions source/common/upstream/static_cluster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<ClusterImplBaseSharedPtr, ThreadAwareLoadBalancerPtr> createClusterImpl(
Expand Down
3 changes: 1 addition & 2 deletions source/common/upstream/strict_dns_cluster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<ClusterImplBaseSharedPtr, ThreadAwareLoadBalancerPtr> createClusterImpl(
Expand Down
12 changes: 0 additions & 12 deletions source/extensions/clusters/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
],
)
1 change: 0 additions & 1 deletion source/extensions/clusters/aggregate/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
3 changes: 1 addition & 2 deletions source/extensions/clusters/aggregate/cluster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Upstream::ClusterImplBaseSharedPtr, Upstream::ThreadAwareLoadBalancerPtr>
Expand Down
1 change: 0 additions & 1 deletion source/extensions/clusters/dynamic_forward_proxy/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 1 addition & 4 deletions source/extensions/clusters/dynamic_forward_proxy/cluster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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<Upstream::ClusterImplBaseSharedPtr, Upstream::ThreadAwareLoadBalancerPtr>
Expand Down
2 changes: 0 additions & 2 deletions source/extensions/clusters/redis/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions source/extensions/clusters/redis/redis_cluster.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions source/extensions/clusters/redis/redis_cluster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion source/extensions/clusters/redis/redis_cluster_lb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
48 changes: 0 additions & 48 deletions source/extensions/clusters/well_known_names.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion source/extensions/filters/http/dynamic_forward_proxy/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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;
}

Expand Down
3 changes: 1 addition & 2 deletions source/extensions/filters/network/redis_proxy/conn_pool_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion test/extensions/filters/http/dynamic_forward_proxy/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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;
Expand Down