diff --git a/source/extensions/health_checkers/BUILD b/source/extensions/health_checkers/BUILD deleted file mode 100644 index 40a5e79b39d3b..0000000000000 --- a/source/extensions/health_checkers/BUILD +++ /dev/null @@ -1,19 +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 = "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/singleton:const_singleton", - ], -) diff --git a/source/extensions/health_checkers/redis/BUILD b/source/extensions/health_checkers/redis/BUILD index 8689cbecb1076..e1a9372473b43 100644 --- a/source/extensions/health_checkers/redis/BUILD +++ b/source/extensions/health_checkers/redis/BUILD @@ -39,7 +39,6 @@ envoy_cc_extension( "//include/envoy/registry", "//include/envoy/server:health_checker_config_interface", "//source/common/common:assert_lib", - "//source/extensions/health_checkers:well_known_names", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/network/redis_proxy/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/health_checkers/redis/v3:pkg_cc_proto", diff --git a/source/extensions/health_checkers/redis/config.h b/source/extensions/health_checkers/redis/config.h index e51cb8b256cbb..919bd158be0b6 100644 --- a/source/extensions/health_checkers/redis/config.h +++ b/source/extensions/health_checkers/redis/config.h @@ -8,7 +8,6 @@ #include "envoy/server/health_checker_config.h" #include "extensions/health_checkers/redis/redis.h" -#include "extensions/health_checkers/well_known_names.h" namespace Envoy { namespace Extensions { @@ -24,7 +23,7 @@ class RedisHealthCheckerFactory : public Server::Configuration::CustomHealthChec createCustomHealthChecker(const envoy::config::core::v3::HealthCheck& config, Server::Configuration::HealthCheckerFactoryContext& context) override; - std::string name() const override { return HealthCheckerNames::get().RedisHealthChecker; } + std::string name() const override { return "envoy.health_checkers.redis"; } ProtobufTypes::MessagePtr createEmptyConfigProto() override { return ProtobufTypes::MessagePtr{new envoy::extensions::health_checkers::redis::v3::Redis()}; } diff --git a/source/extensions/health_checkers/well_known_names.h b/source/extensions/health_checkers/well_known_names.h deleted file mode 100644 index e17e4a2349a40..0000000000000 --- a/source/extensions/health_checkers/well_known_names.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include - -#include "common/singleton/const_singleton.h" - -namespace Envoy { -namespace Extensions { -namespace HealthCheckers { - -/** - * Well-known health checker names. - * NOTE: New health checkers should use the well known name: envoy.health_checkers.name. - */ -class HealthCheckerNameValues { -public: - // Redis health checker. - const std::string RedisHealthChecker = "envoy.health_checkers.redis"; -}; - -using HealthCheckerNames = ConstSingleton; - -} // namespace HealthCheckers -} // namespace Extensions -} // namespace Envoy