Skip to content

Fix header-to-metadata if clause #11747

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 4 commits into from
Jun 30, 2020
Merged

Fix header-to-metadata if clause #11747

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
808d885
Add a test case.
Jun 25, 2020
1e726b4
Fix if clause.
Jun 25, 2020
bdb6feb
Review feedback: give a value to the test header.
Jun 25, 2020
3209562
Merge branch 'master' into fix_htm_if_clause
Jun 26, 2020
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
3 changes: 2 additions & 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 @@ -185,7 +185,8 @@ void HeaderToMetadataFilter::writeHeaderToMetadata(Http::HeaderMap& headers,
if (rule.remove()) {
headers.remove(header);
}
} else if (rule.has_on_header_missing()) {
}
if (header_entry == nullptr && rule.has_on_header_missing()) {
// Add metadata for the header missing case.
const auto& keyval = rule.on_header_missing();

Expand Down
21 changes: 21 additions & 0 deletions test/extensions/filters/http/header_to_metadata/header_to_metadata_filter_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,27 @@ TEST_F(HeaderToMetadataTest, NoEmptyValues) {
EXPECT_EQ(Http::FilterHeadersStatus::Continue, filter_->decodeHeaders(headers, false));
}

/**
* Missing case is not executed when header is present.
*/
TEST_F(HeaderToMetadataTest, NoMissingWhenHeaderIsPresent) {
const std::string config = R"EOF(
request_rules:
- header: x-version
on_header_missing:
metadata_namespace: envoy.lb
key: version
value: some_value
type: STRING
)EOF";
initializeFilter(config);
Http::TestRequestHeaderMapImpl headers{{"x-version", ""}};

@rgs1 rgs1 Jun 25, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: add value to the header (to avoid conflating with the internal handling of headers without a value).

@nahratzah nahratzah Jun 25, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated the PR. <3


EXPECT_CALL(decoder_callbacks_, streamInfo()).WillRepeatedly(ReturnRef(req_info_));
EXPECT_CALL(req_info_, setDynamicMetadata(_, _)).Times(0);
EXPECT_EQ(Http::FilterHeadersStatus::Continue, filter_->decodeHeaders(headers, false));
}

} // namespace HeaderToMetadataFilter
} // namespace HttpFilters
} // namespace Extensions
Expand Down