Skip to content

ecds: rename last_filter_in_filter_config #17940

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
Sep 2, 2021
Merged

ecds: rename last_filter_in_filter_config #17940

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
12 changes: 6 additions & 6 deletions source/common/filter/config_discovery_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ void FilterConfigProviderManagerImplBase::applyLastOrDefaultConfig(
DynamicFilterConfigProviderPtr FilterConfigProviderManagerImpl::createDynamicFilterConfigProvider(
const envoy::config::core::v3::ExtensionConfigSource& config_source,
const std::string& filter_config_name, Server::Configuration::FactoryContext& factory_context,
const std::string& stat_prefix, bool last_filter_in_filter_config,
const std::string& stat_prefix, bool last_filter_in_filter_chain,
const std::string& filter_chain_type) {
auto subscription = getSubscription(config_source.config_source(), filter_config_name,
factory_context, stat_prefix);
Expand All @@ -268,13 +268,13 @@ DynamicFilterConfigProviderPtr FilterConfigProviderManagerImpl::createDynamicFil
Envoy::Http::FilterFactoryCb default_config = nullptr;
if (config_source.has_default_config()) {
default_config = getDefaultConfig(config_source.default_config(), filter_config_name,
factory_context, stat_prefix, last_filter_in_filter_config,
factory_context, stat_prefix, last_filter_in_filter_chain,
filter_chain_type, require_type_urls);
}

auto provider = std::make_unique<DynamicFilterConfigProviderImpl>(
subscription, require_type_urls, factory_context, default_config,
last_filter_in_filter_config, filter_chain_type);
subscription, require_type_urls, factory_context, default_config, last_filter_in_filter_chain,
filter_chain_type);

// Ensure the subscription starts if it has not already.
if (config_source.apply_default_config_without_warming()) {
Expand All @@ -287,7 +287,7 @@ DynamicFilterConfigProviderPtr FilterConfigProviderManagerImpl::createDynamicFil
Http::FilterFactoryCb HttpFilterConfigProviderManagerImpl::getDefaultConfig(
const ProtobufWkt::Any& proto_config, const std::string& filter_config_name,
Server::Configuration::FactoryContext& factory_context, const std::string& stat_prefix,
bool last_filter_in_filter_config, const std::string& filter_chain_type,
bool last_filter_in_filter_chain, const std::string& filter_chain_type,
const absl::flat_hash_set<std::string> require_type_urls) const {
auto* default_factory =
Config::Utility::getFactoryByType<Server::Configuration::NamedHttpFilterConfigFactory>(
Expand All @@ -303,7 +303,7 @@ Http::FilterFactoryCb HttpFilterConfigProviderManagerImpl::getDefaultConfig(
Config::Utility::validateTerminalFilters(
filter_config_name, default_factory->name(), filter_chain_type,
default_factory->isTerminalFilterByProto(*message, factory_context),
last_filter_in_filter_config);
last_filter_in_filter_chain);
return default_factory->createFilterFactoryFromProto(*message, stat_prefix, factory_context);
}

Expand Down
6 changes: 3 additions & 3 deletions source/common/filter/config_discovery_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ class FilterConfigProviderManagerImpl : public FilterConfigProviderManagerImplBa
DynamicFilterConfigProviderPtr createDynamicFilterConfigProvider(
const envoy::config::core::v3::ExtensionConfigSource& config_source,
const std::string& filter_config_name, Server::Configuration::FactoryContext& factory_context,
const std::string& stat_prefix, bool last_filter_in_filter_config,
const std::string& stat_prefix, bool last_filter_in_filter_chain,
const std::string& filter_chain_type) override;

FilterConfigProviderPtr
Expand All @@ -274,7 +274,7 @@ class FilterConfigProviderManagerImpl : public FilterConfigProviderManagerImplBa
virtual Http::FilterFactoryCb
getDefaultConfig(const ProtobufWkt::Any& proto_config, const std::string& filter_config_name,
Server::Configuration::FactoryContext& factory_context,
const std::string& stat_prefix, bool last_filter_in_filter_config,
const std::string& stat_prefix, bool last_filter_in_filter_chain,
const std::string& filter_chain_type,
const absl::flat_hash_set<std::string> require_type_urls) const PURE;
};
Expand All @@ -284,7 +284,7 @@ class HttpFilterConfigProviderManagerImpl : public FilterConfigProviderManagerIm
Http::FilterFactoryCb
getDefaultConfig(const ProtobufWkt::Any& proto_config, const std::string& filter_config_name,
Server::Configuration::FactoryContext& factory_context,
const std::string& stat_prefix, bool last_filter_in_filter_config,
const std::string& stat_prefix, bool last_filter_in_filter_chain,
const std::string& filter_chain_type,
const absl::flat_hash_set<std::string> require_type_urls) const override;
};
Expand Down