Skip to content

transport_sockets/tls/cert_validator: remove well_known_names #16762

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
mattklein123 merged 1 commit into from
Jun 2, 2021
Merged

transport_sockets/tls/cert_validator: remove well_known_names #16762

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
1 change: 0 additions & 1 deletion source/extensions/transport_sockets/tls/cert_validator/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ envoy_cc_library(
"default_validator.h",
"factory.h",
"utility.h",
"well_known_names.h",
],
external_deps = [
"ssl",
Expand Down
3 changes: 1 addition & 2 deletions source/extensions/transport_sockets/tls/cert_validator/default_validator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -472,7 +471,7 @@ class DefaultCertValidatorFactory : public CertValidatorFactory {
return std::make_unique<DefaultCertValidator>(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);
Expand Down
4 changes: 1 addition & 3 deletions source/extensions/transport_sockets/tls/cert_validator/factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -285,7 +284,7 @@ class SPIFFEValidatorFactory : public CertValidatorFactory {
return std::make_unique<SPIFFEValidator>(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);
Expand Down
29 changes: 0 additions & 29 deletions source/extensions/transport_sockets/tls/cert_validator/well_known_names.h
View file
Open in desktop

This file was deleted.