diff --git a/source/extensions/transport_sockets/tls/cert_validator/BUILD b/source/extensions/transport_sockets/tls/cert_validator/BUILD index de0fbd42c08ca..2b4901b8d17a9 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/BUILD +++ b/source/extensions/transport_sockets/tls/cert_validator/BUILD @@ -20,7 +20,6 @@ envoy_cc_library( "default_validator.h", "factory.h", "utility.h", - "well_known_names.h", ], external_deps = [ "ssl", diff --git a/source/extensions/transport_sockets/tls/cert_validator/default_validator.cc b/source/extensions/transport_sockets/tls/cert_validator/default_validator.cc index 001f93286d820..bb97cf0066578 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/default_validator.cc +++ b/source/extensions/transport_sockets/tls/cert_validator/default_validator.cc @@ -27,7 +27,6 @@ #include "extensions/transport_sockets/tls/cert_validator/cert_validator.h" #include "extensions/transport_sockets/tls/cert_validator/factory.h" #include "extensions/transport_sockets/tls/cert_validator/utility.h" -#include "extensions/transport_sockets/tls/cert_validator/well_known_names.h" #include "extensions/transport_sockets/tls/stats.h" #include "extensions/transport_sockets/tls/utility.h" @@ -472,7 +471,7 @@ class DefaultCertValidatorFactory : public CertValidatorFactory { return std::make_unique(config, stats, time_source); } - absl::string_view name() override { return CertValidatorNames::get().Default; } + absl::string_view name() override { return "envoy.tls.cert_validator.default"; } }; REGISTER_FACTORY(DefaultCertValidatorFactory, CertValidatorFactory); diff --git a/source/extensions/transport_sockets/tls/cert_validator/factory.cc b/source/extensions/transport_sockets/tls/cert_validator/factory.cc index 349b04e260b44..3ab5267ad4353 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/factory.cc +++ b/source/extensions/transport_sockets/tls/cert_validator/factory.cc @@ -2,8 +2,6 @@ #include "envoy/ssl/context_config.h" -#include "extensions/transport_sockets/tls/cert_validator/well_known_names.h" - namespace Envoy { namespace Extensions { namespace TransportSockets { @@ -12,7 +10,7 @@ namespace Tls { std::string getCertValidatorName(const Envoy::Ssl::CertificateValidationContextConfig* config) { return config != nullptr && config->customValidatorConfig().has_value() ? config->customValidatorConfig().value().name() - : CertValidatorNames::get().Default; + : "envoy.tls.cert_validator.default"; }; } // namespace Tls diff --git a/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.cc b/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.cc index f7d5639d40277..931fc398f0d65 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.cc +++ b/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.cc @@ -13,7 +13,6 @@ #include "extensions/transport_sockets/tls/cert_validator/factory.h" #include "extensions/transport_sockets/tls/cert_validator/utility.h" -#include "extensions/transport_sockets/tls/cert_validator/well_known_names.h" #include "extensions/transport_sockets/tls/stats.h" #include "extensions/transport_sockets/tls/utility.h" @@ -285,7 +284,7 @@ class SPIFFEValidatorFactory : public CertValidatorFactory { return std::make_unique(config, stats, time_source); } - absl::string_view name() override { return CertValidatorNames::get().SPIFFE; } + absl::string_view name() override { return "envoy.tls.cert_validator.spiffe"; } }; REGISTER_FACTORY(SPIFFEValidatorFactory, CertValidatorFactory); diff --git a/source/extensions/transport_sockets/tls/cert_validator/well_known_names.h b/source/extensions/transport_sockets/tls/cert_validator/well_known_names.h deleted file mode 100644 index 226830cd514c2..0000000000000 --- a/source/extensions/transport_sockets/tls/cert_validator/well_known_names.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include - -#include "common/singleton/const_singleton.h" - -namespace Envoy { -namespace Extensions { -namespace TransportSockets { -namespace Tls { - -/** - * Well-known certificate validator's names. - */ -class CertValidatorValues { -public: - // default certificate validator - const std::string Default = "envoy.tls.cert_validator.default"; - - // SPIFFE(https://github.com/spiffe/spiffe) - const std::string SPIFFE = "envoy.tls.cert_validator.spiffe"; -}; - -using CertValidatorNames = ConstSingleton; - -} // namespace Tls -} // namespace TransportSockets -} // namespace Extensions -} // namespace Envoy