Skip to content
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

extensions: move well known names from ALL_CAPS to CamelCase #3893

Merged
merged 1 commit into from
Jul 18, 2018
Merged

extensions: move well known names from ALL_CAPS to CamelCase #3893

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
4 changes: 2 additions & 2 deletions source/common/config/bootstrap_json.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ void BootstrapJson::translateBootstrap(const Json::Object& json_config,
auto* stats_sinks = bootstrap.mutable_stats_sinks();
if (json_config.hasObject("statsd_udp_ip_address")) {
auto* stats_sink = stats_sinks->Add();
stats_sink->set_name(Extensions::StatSinks::StatsSinkNames::get().STATSD);
stats_sink->set_name(Extensions::StatSinks::StatsSinkNames::get().Statsd);
envoy::config::metrics::v2::StatsdSink statsd_sink;
AddressJson::translateAddress(json_config.getString("statsd_udp_ip_address"), false, true,
*statsd_sink.mutable_address());
Expand All @@ -87,7 +87,7 @@ void BootstrapJson::translateBootstrap(const Json::Object& json_config,

if (json_config.hasObject("statsd_tcp_cluster_name")) {
auto* stats_sink = stats_sinks->Add();
stats_sink->set_name(Extensions::StatSinks::StatsSinkNames::get().STATSD);
stats_sink->set_name(Extensions::StatSinks::StatsSinkNames::get().Statsd);
envoy::config::metrics::v2::StatsdSink statsd_sink;
statsd_sink.set_tcp_cluster_name(json_config.getString("statsd_tcp_cluster_name"));
MessageUtil::jsonConvert(statsd_sink, *stats_sink->mutable_config());
Expand Down
2 changes: 1 addition & 1 deletion source/common/config/filter_json.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ void FilterJson::translateAccessLog(const Json::Object& json_config,

// Statically registered access logs are a v2-only feature, so use the standard internal file
// access log for json config conversion.
proto_config.set_name(Extensions::AccessLoggers::AccessLogNames::get().FILE);
proto_config.set_name(Extensions::AccessLoggers::AccessLogNames::get().File);

if (json_config.hasObject("filter")) {
translateAccessLogFilter(*json_config.getObject("filter"), *proto_config.mutable_filter());
Expand Down
2 changes: 1 addition & 1 deletion source/common/config/rds_json.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ void RdsJson::translateRoute(const Json::Object& json_route, envoy::api::v2::rou
const Json::ObjectSharedPtr obj = json_route.getObject("opaque_config");
auto& filter_metadata =
(*route.mutable_metadata()
->mutable_filter_metadata())[Extensions::HttpFilters::HttpFilterNames::get().ROUTER];
->mutable_filter_metadata())[Extensions::HttpFilters::HttpFilterNames::get().Router];
obj->iterate([&filter_metadata](const std::string& name, const Json::Object& value) {
(*filter_metadata.mutable_fields())[name].set_string_value(value.asString());
return true;
Expand Down
2 changes: 1 addition & 1 deletion source/common/router/config_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ RouteEntryImplBase::parseOpaqueConfig(const envoy::api::v2::route::Route& route)
std::multimap<std::string, std::string> ret;
if (route.has_metadata()) {
const auto filter_metadata = route.metadata().filter_metadata().find(
Extensions::HttpFilters::HttpFilterNames::get().ROUTER);
Extensions::HttpFilters::HttpFilterNames::get().Router);
if (filter_metadata == route.metadata().filter_metadata().end()) {
return ret;
}
Expand Down
2 changes: 1 addition & 1 deletion source/common/upstream/health_checker_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ HealthCheckerFactory::create(const envoy::api::v2::core::HealthCheck& hc_config,
auto& factory =
Config::Utility::getAndCheckFactory<Server::Configuration::CustomHealthCheckerFactory>(
hc_config.has_redis_health_check()
? Extensions::HealthCheckers::HealthCheckerNames::get().REDIS_HEALTH_CHECKER
? Extensions::HealthCheckers::HealthCheckerNames::get().RedisHealthChecker
: std::string(hc_config.custom_health_check().name()));
std::unique_ptr<Server::Configuration::HealthCheckerFactoryContext> context(
new HealthCheckerFactoryContextImpl(cluster, runtime, random, dispatcher,
Expand Down
4 changes: 2 additions & 2 deletions source/common/upstream/upstream_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,11 +299,11 @@ ClusterInfoImpl::ClusterInfoImpl(const envoy::api::v2::Cluster& config,
auto transport_socket = config.transport_socket();
if (!config.has_transport_socket()) {
if (config.has_tls_context()) {
transport_socket.set_name(Extensions::TransportSockets::TransportSocketNames::get().TLS);
transport_socket.set_name(Extensions::TransportSockets::TransportSocketNames::get().Tls);
MessageUtil::jsonConvert(config.tls_context(), *transport_socket.mutable_config());
} else {
transport_socket.set_name(
Extensions::TransportSockets::TransportSocketNames::get().RAW_BUFFER);
Extensions::TransportSockets::TransportSocketNames::get().RawBuffer);
}
}

Expand Down
2 changes: 1 addition & 1 deletion source/extensions/access_loggers/file/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ ProtobufTypes::MessagePtr FileAccessLogFactory::createEmptyConfigProto() {
return ProtobufTypes::MessagePtr{new envoy::config::accesslog::v2::FileAccessLog()};
}

std::string FileAccessLogFactory::name() const { return AccessLogNames::get().FILE; }
std::string FileAccessLogFactory::name() const { return AccessLogNames::get().File; }

/**
* Static registration for the file access log. @see RegisterFactory.
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/access_loggers/http_grpc/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ProtobufTypes::MessagePtr HttpGrpcAccessLogFactory::createEmptyConfigProto() {
return ProtobufTypes::MessagePtr{new envoy::config::accesslog::v2::HttpGrpcAccessLogConfig()};
}

std::string HttpGrpcAccessLogFactory::name() const { return AccessLogNames::get().HTTP_GRPC; }
std::string HttpGrpcAccessLogFactory::name() const { return AccessLogNames::get().HttpGrpc; }

/**
* Static registration for the HTTP gRPC access log. @see RegisterFactory.
Expand Down
4 changes: 2 additions & 2 deletions source/extensions/access_loggers/well_known_names.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ namespace AccessLoggers {
class AccessLogNameValues {
public:
// File access log
const std::string FILE = "envoy.file_access_log";
const std::string File = "envoy.file_access_log";
// HTTP gRPC access log
const std::string HTTP_GRPC = "envoy.http_grpc_access_log";
const std::string HttpGrpc = "envoy.http_grpc_access_log";
};

typedef ConstSingleton<AccessLogNameValues> AccessLogNames;
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/buffer/buffer_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void BufferFilter::initConfig() {
return;
}

const std::string& name = HttpFilterNames::get().BUFFER;
const std::string& name = HttpFilterNames::get().Buffer;
const auto* entry = callbacks_->route()->routeEntry();

const BufferFilterSettings* route_local =
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/buffer/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class BufferFilterFactory
: public Common::FactoryBase<envoy::config::filter::http::buffer::v2::Buffer,
envoy::config::filter::http::buffer::v2::BufferPerRoute> {
public:
BufferFilterFactory() : FactoryBase(HttpFilterNames::get().BUFFER) {}
BufferFilterFactory() : FactoryBase(HttpFilterNames::get().Buffer) {}

Http::FilterFactoryCb
createFilterFactory(const Json::Object& json_config, const std::string& stats_prefix,
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/cors/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace Cors {
*/
class CorsFilterConfig : public Common::EmptyHttpFilterConfig {
public:
CorsFilterConfig() : Common::EmptyHttpFilterConfig(HttpFilterNames::get().CORS) {}
CorsFilterConfig() : Common::EmptyHttpFilterConfig(HttpFilterNames::get().Cors) {}

Http::FilterFactoryCb createFilter(const std::string&,
Server::Configuration::FactoryContext&) override;
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/dynamo/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace Dynamo {
*/
class DynamoFilterConfig : public Common::EmptyHttpFilterConfig {
public:
DynamoFilterConfig() : Common::EmptyHttpFilterConfig(HttpFilterNames::get().DYNAMO) {}
DynamoFilterConfig() : Common::EmptyHttpFilterConfig(HttpFilterNames::get().Dynamo) {}

Http::FilterFactoryCb createFilter(const std::string& stat_prefix,
Server::Configuration::FactoryContext& context) override;
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/ext_authz/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace ExtAuthz {
class ExtAuthzFilterConfig
: public Common::FactoryBase<envoy::config::filter::http::ext_authz::v2alpha::ExtAuthz> {
public:
ExtAuthzFilterConfig() : FactoryBase(HttpFilterNames::get().EXT_AUTHORIZATION) {}
ExtAuthzFilterConfig() : FactoryBase(HttpFilterNames::get().ExtAuthorization) {}

private:
static constexpr uint64_t DefaultTimeout = 200;
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/fault/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace Fault {
class FaultFilterFactory
: public Common::FactoryBase<envoy::config::filter::http::fault::v2::HTTPFault> {
public:
FaultFilterFactory() : FactoryBase(HttpFilterNames::get().FAULT) {}
FaultFilterFactory() : FactoryBase(HttpFilterNames::get().Fault) {}

Http::FilterFactoryCb
createFilterFactory(const Json::Object& json_config, const std::string& stats_prefix,
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/fault/fault_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Http::FilterHeadersStatus FaultFilter::decodeHeaders(Http::HeaderMap& headers, b
// configured at the filter level.
fault_settings_ = config_->settings();
if (callbacks_->route() && callbacks_->route()->routeEntry()) {
const std::string& name = Extensions::HttpFilters::HttpFilterNames::get().FAULT;
const std::string& name = Extensions::HttpFilters::HttpFilterNames::get().Fault;
const auto* route_entry = callbacks_->route()->routeEntry();

const FaultSettings* per_route_settings_ =
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/grpc_http1_bridge/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace GrpcHttp1Bridge {
class GrpcHttp1BridgeFilterConfig : public Common::EmptyHttpFilterConfig {
public:
GrpcHttp1BridgeFilterConfig()
: Common::EmptyHttpFilterConfig(HttpFilterNames::get().GRPC_HTTP1_BRIDGE) {}
: Common::EmptyHttpFilterConfig(HttpFilterNames::get().GrpcHttp1Bridge) {}

Http::FilterFactoryCb createFilter(const std::string&,
Server::Configuration::FactoryContext& context) override;
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/grpc_json_transcoder/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace GrpcJsonTranscoder {
class GrpcJsonTranscoderFilterConfig
: public Common::FactoryBase<envoy::config::filter::http::transcoder::v2::GrpcJsonTranscoder> {
public:
GrpcJsonTranscoderFilterConfig() : FactoryBase(HttpFilterNames::get().GRPC_JSON_TRANSCODER) {}
GrpcJsonTranscoderFilterConfig() : FactoryBase(HttpFilterNames::get().GrpcJsonTranscoder) {}

Http::FilterFactoryCb
createFilterFactory(const Json::Object& json_config, const std::string& stats_prefix,
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/grpc_web/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace GrpcWeb {

class GrpcWebFilterConfig : public Common::EmptyHttpFilterConfig {
public:
GrpcWebFilterConfig() : Common::EmptyHttpFilterConfig(HttpFilterNames::get().GRPC_WEB) {}
GrpcWebFilterConfig() : Common::EmptyHttpFilterConfig(HttpFilterNames::get().GrpcWeb) {}

Http::FilterFactoryCb createFilter(const std::string&,
Server::Configuration::FactoryContext& context) override;
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/gzip/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace Gzip {
*/
class GzipFilterFactory : public Common::FactoryBase<envoy::config::filter::http::gzip::v2::Gzip> {
public:
GzipFilterFactory() : FactoryBase(HttpFilterNames::get().ENVOY_GZIP) {}
GzipFilterFactory() : FactoryBase(HttpFilterNames::get().EnvoyGzip) {}

private:
Http::FilterFactoryCb
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/header_to_metadata/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace HeaderToMetadataFilter {
class HeaderToMetadataConfig
: public Common::FactoryBase<envoy::config::filter::http::header_to_metadata::v2::Config> {
public:
HeaderToMetadataConfig() : FactoryBase(HttpFilterNames::get().HEADER_TO_METADATA) {}
HeaderToMetadataConfig() : FactoryBase(HttpFilterNames::get().HeaderToMetadata) {}

private:
Http::FilterFactoryCb createFilterFactoryFromProtoTyped(
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ bool HeaderToMetadataFilter::addMetadata(StructMap& map, const std::string& meta
}

const std::string& HeaderToMetadataFilter::decideNamespace(const std::string& nspace) const {
return nspace.empty() ? HttpFilterNames::get().HEADER_TO_METADATA : nspace;
return nspace.empty() ? HttpFilterNames::get().HeaderToMetadata : nspace;
}

void HeaderToMetadataFilter::writeHeaderToMetadata(Http::HeaderMap& headers,
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/health_check/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace HealthCheck {
class HealthCheckFilterConfig
: public Common::FactoryBase<envoy::config::filter::http::health_check::v2::HealthCheck> {
public:
HealthCheckFilterConfig() : FactoryBase(HttpFilterNames::get().HEALTH_CHECK) {}
HealthCheckFilterConfig() : FactoryBase(HttpFilterNames::get().HealthCheck) {}

Http::FilterFactoryCb
createFilterFactory(const Json::Object& json_config, const std::string&,
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/ip_tagging/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace IpTagging {
class IpTaggingFilterFactory
: public Common::FactoryBase<envoy::config::filter::http::ip_tagging::v2::IPTagging> {
public:
IpTaggingFilterFactory() : FactoryBase(HttpFilterNames::get().IP_TAGGING) {}
IpTaggingFilterFactory() : FactoryBase(HttpFilterNames::get().IpTagging) {}

private:
Http::FilterFactoryCb createFilterFactoryFromProtoTyped(
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/jwt_authn/filter_factory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace JwtAuthn {
class FilterFactory : public Common::FactoryBase<
::envoy::config::filter::http::jwt_authn::v2alpha::JwtAuthentication> {
public:
FilterFactory() : FactoryBase(HttpFilterNames::get().JWT_AUTHN) {}
FilterFactory() : FactoryBase(HttpFilterNames::get().JwtAuthn) {}

private:
Http::FilterFactoryCb createFilterFactoryFromProtoTyped(
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/lua/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace Lua {
*/
class LuaFilterConfig : public Common::FactoryBase<envoy::config::filter::http::lua::v2::Lua> {
public:
LuaFilterConfig() : FactoryBase(HttpFilterNames::get().LUA) {}
LuaFilterConfig() : FactoryBase(HttpFilterNames::get().Lua) {}

Http::FilterFactoryCb
createFilterFactory(const Json::Object& json_config, const std::string& stats_prefix,
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/lua/lua_filter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const ProtobufWkt::Struct& getMetadata(Http::StreamFilterCallbacks* callbacks) {
return ProtobufWkt::Struct::default_instance();
}
const auto& metadata = callbacks->route()->routeEntry()->metadata();
const auto& filter_it = metadata.filter_metadata().find(HttpFilterNames::get().LUA);
const auto& filter_it = metadata.filter_metadata().find(HttpFilterNames::get().Lua);
if (filter_it == metadata.filter_metadata().end()) {
return ProtobufWkt::Struct::default_instance();
}
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/ratelimit/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace RateLimitFilter {
class RateLimitFilterConfig
: public Common::FactoryBase<envoy::config::filter::http::rate_limit::v2::RateLimit> {
public:
RateLimitFilterConfig() : FactoryBase(HttpFilterNames::get().RATE_LIMIT) {}
RateLimitFilterConfig() : FactoryBase(HttpFilterNames::get().RateLimit) {}

Http::FilterFactoryCb
createFilterFactory(const Json::Object& json_config, const std::string&,
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/rbac/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class RoleBasedAccessControlFilterConfigFactory
: public Common::FactoryBase<envoy::config::filter::http::rbac::v2::RBAC,
envoy::config::filter::http::rbac::v2::RBACPerRoute> {
public:
RoleBasedAccessControlFilterConfigFactory() : FactoryBase(HttpFilterNames::get().RBAC) {}
RoleBasedAccessControlFilterConfigFactory() : FactoryBase(HttpFilterNames::get().Rbac) {}

private:
Http::FilterFactoryCb
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/rbac/rbac_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RoleBasedAccessControlFilterConfig::engine(const Router::RouteConstSharedPtr rou
return engine(mode);
}

const std::string& name = HttpFilterNames::get().RBAC;
const std::string& name = HttpFilterNames::get().Rbac;
const auto* entry = route->routeEntry();

const auto* route_local =
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/router/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace RouterFilter {
class RouterFilterConfig
: public Common::FactoryBase<envoy::config::filter::http::router::v2::Router> {
public:
RouterFilterConfig() : FactoryBase(HttpFilterNames::get().ROUTER) {}
RouterFilterConfig() : FactoryBase(HttpFilterNames::get().Router) {}

Http::FilterFactoryCb
createFilterFactory(const Json::Object& json_config, const std::string& stat_prefix,
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/http/squash/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace Squash {
class SquashFilterConfigFactory
: public Common::FactoryBase<envoy::config::filter::http::squash::v2::Squash> {
public:
SquashFilterConfigFactory() : FactoryBase(HttpFilterNames::get().SQUASH) {}
SquashFilterConfigFactory() : FactoryBase(HttpFilterNames::get().Squash) {}

Http::FilterFactoryCb
createFilterFactory(const Json::Object& json_config, const std::string&,
Expand Down
42 changes: 21 additions & 21 deletions source/extensions/filters/http/well_known_names.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,50 +13,50 @@ namespace HttpFilters {
class HttpFilterNameValues {
public:
// Buffer filter
const std::string BUFFER = "envoy.buffer";
const std::string Buffer = "envoy.buffer";
// CORS filter
const std::string CORS = "envoy.cors";
const std::string Cors = "envoy.cors";
// Dynamo filter
const std::string DYNAMO = "envoy.http_dynamo_filter";
const std::string Dynamo = "envoy.http_dynamo_filter";
// Fault filter
const std::string FAULT = "envoy.fault";
const std::string Fault = "envoy.fault";
// GRPC http1 bridge filter
const std::string GRPC_HTTP1_BRIDGE = "envoy.grpc_http1_bridge";
const std::string GrpcHttp1Bridge = "envoy.grpc_http1_bridge";
// GRPC json transcoder filter
const std::string GRPC_JSON_TRANSCODER = "envoy.grpc_json_transcoder";
const std::string GrpcJsonTranscoder = "envoy.grpc_json_transcoder";
// GRPC web filter
const std::string GRPC_WEB = "envoy.grpc_web";
const std::string GrpcWeb = "envoy.grpc_web";
// Gzip filter
const std::string ENVOY_GZIP = "envoy.gzip";
const std::string EnvoyGzip = "envoy.gzip";
// IP tagging filter
const std::string IP_TAGGING = "envoy.ip_tagging";
const std::string IpTagging = "envoy.ip_tagging";
// Rate limit filter
const std::string RATE_LIMIT = "envoy.rate_limit";
const std::string RateLimit = "envoy.rate_limit";
// Router filter
const std::string ROUTER = "envoy.router";
const std::string Router = "envoy.router";
// Health checking filter
const std::string HEALTH_CHECK = "envoy.health_check";
const std::string HealthCheck = "envoy.health_check";
// Lua filter
const std::string LUA = "envoy.lua";
const std::string Lua = "envoy.lua";
// Squash filter
const std::string SQUASH = "envoy.squash";
const std::string Squash = "envoy.squash";
// External Authorization filter
const std::string EXT_AUTHORIZATION = "envoy.ext_authz";
const std::string ExtAuthorization = "envoy.ext_authz";
// RBAC HTTP Authorization filter
const std::string RBAC = "envoy.filters.http.rbac";
const std::string Rbac = "envoy.filters.http.rbac";
// JWT authentication filter
const std::string JWT_AUTHN = "envoy.filters.http.jwt_authn";
const std::string JwtAuthn = "envoy.filters.http.jwt_authn";
// Header to metadata filter
const std::string HEADER_TO_METADATA = "envoy.filters.http.header_to_metadata";
const std::string HeaderToMetadata = "envoy.filters.http.header_to_metadata";

// Converts names from v1 to v2
const Config::V1Converter v1_converter_;

// NOTE: Do not add any new filters to this list. All future filters are v2 only.
HttpFilterNameValues()
: v1_converter_({BUFFER, CORS, DYNAMO, FAULT, GRPC_HTTP1_BRIDGE, GRPC_JSON_TRANSCODER,
GRPC_WEB, HEADER_TO_METADATA, HEALTH_CHECK, IP_TAGGING, RATE_LIMIT, ROUTER,
LUA, EXT_AUTHORIZATION}) {}
: v1_converter_({Buffer, Cors, Dynamo, Fault, GrpcHttp1Bridge, GrpcJsonTranscoder, GrpcWeb,
HeaderToMetadata, HealthCheck, IpTagging, RateLimit, Router, Lua,
ExtAuthorization}) {}
};

typedef ConstSingleton<HttpFilterNameValues> HttpFilterNames;
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/listener/original_dst/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class OriginalDstConfigFactory : public Server::Configuration::NamedListenerFilt
return std::make_unique<Envoy::ProtobufWkt::Empty>();
}

std::string name() override { return ListenerFilterNames::get().ORIGINAL_DST; }
std::string name() override { return ListenerFilterNames::get().OriginalDst; }
};

/**
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/listener/proxy_protocol/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class ProxyProtocolConfigFactory : public Server::Configuration::NamedListenerFi
return std::make_unique<Envoy::ProtobufWkt::Empty>();
}

std::string name() override { return ListenerFilterNames::get().PROXY_PROTOCOL; }
std::string name() override { return ListenerFilterNames::get().ProxyProtocol; }
};

/**
Expand Down
Loading