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

Jump to bottom

config: fully validating terminal filter ordering for L4 #7904

Merged
merged 3 commits into from
Aug 14, 2019
Merged

config: fully validating terminal filter ordering for L4 #7904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef103b9
config: finishing filter order validation
alyssawilk Aug 13, 2019
26d1ba7
Merge branch 'refs/heads/master' into terminalv2
alyssawilk Aug 14, 2019
5d70fc0
bumping envoy-filter-example branch
alyssawilk Aug 14, 2019
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
2 changes: 1 addition & 1 deletion ci/build_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ if [ "$1" != "-nofetch" ]; then
fi

# This is the hash on https://github.com/envoyproxy/envoy-filter-example.git we pin to.
(cd "${ENVOY_FILTER_EXAMPLE_SRCDIR}" && git fetch origin && git checkout -f dcd3374baa9365ab7ab505018232994d6c8a8d81)
(cd "${ENVOY_FILTER_EXAMPLE_SRCDIR}" && git fetch origin && git checkout -f 1995c1e0eccea84bbb39f64e75ef3e9102d1ae82)
sed -e "s|{ENVOY_SRCDIR}|${ENVOY_SRCDIR}|" "${ENVOY_SRCDIR}"/ci/WORKSPACE.filter.example > "${ENVOY_FILTER_EXAMPLE_SRCDIR}"/WORKSPACE
fi

Expand Down
7 changes: 2 additions & 5 deletions source/server/listener_manager_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,8 @@ std::vector<Network::FilterFactoryCb> ProdListenerComponentFactory::createNetwor
Config::Utility::getAndCheckFactory<Configuration::NamedNetworkFilterConfigFactory>(
string_name);

// TODO(alyssar) replace this block and reinstate TerminalNotLast test once echo2 is updated
if (factory.isTerminalFilter() && i != filters.size() - 1) {
throw EnvoyException(
fmt::format("Error: {} must be the terminal network filter.", filters[i].name()));
}
Config::Utility::validateTerminalFilters(filters[i].name(), "network",
factory.isTerminalFilter(), i == filters.size() - 1);

Network::FilterFactoryCb callback;
if (Config::Utility::allowDeprecatedV1Config(context.runtime(), *filter_config)) {
Expand Down
2 changes: 1 addition & 1 deletion test/server/listener_manager_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ class NonTerminalFilterFactory : public Configuration::NamedNetworkFilterConfigF
std::string name() override { return "non_terminal"; }
};

TEST_F(ListenerManagerImplWithRealFiltersTest, DISABLED_TerminalNotLast) {
TEST_F(ListenerManagerImplWithRealFiltersTest, TerminalNotLast) {
Registry::RegisterFactory<NonTerminalFilterFactory,
Configuration::NamedNetworkFilterConfigFactory>
registered;
Expand Down