Skip to content

[Wasm] Add cluster metadata fallback and upstream host metadata #13477

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 7 commits into from
Oct 14, 2020
Merged

[Wasm] Add cluster metadata fallback and upstream host metadata #13477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
097b250
add cluster metadata fallback and upstream host metadata
bianpengyuan Oct 10, 2020
b65c09f
add test
bianpengyuan Oct 13, 2020
cf8bb4a
format
bianpengyuan Oct 13, 2020
9221e80
fix
bianpengyuan Oct 13, 2020
6af89bf
fix
bianpengyuan Oct 13, 2020
f753e12
add test for cluster metadata
bianpengyuan Oct 14, 2020
3cd81fe
clean up
bianpengyuan Oct 14, 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
11 changes: 10 additions & 1 deletion source/extensions/common/wasm/context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,8 @@ WasmResult serializeValue(Filters::Common::Expr::CelValue value, std::string* re
_f(METADATA) _f(REQUEST) _f(RESPONSE) _f(CONNECTION) _f(UPSTREAM) _f(NODE) _f(SOURCE) \
_f(DESTINATION) _f(LISTENER_DIRECTION) _f(LISTENER_METADATA) _f(CLUSTER_NAME) \
_f(CLUSTER_METADATA) _f(ROUTE_NAME) _f(ROUTE_METADATA) _f(PLUGIN_NAME) \
_f(PLUGIN_ROOT_ID) _f(PLUGIN_VM_ID) _f(CONNECTION_ID) _f(FILTER_STATE)
_f(UPSTREAM_HOST_METADATA) _f(PLUGIN_ROOT_ID) _f(PLUGIN_VM_ID) _f(CONNECTION_ID) \
_f(FILTER_STATE)

static inline std::string downCase(std::string s) {
std::transform(s.begin(), s.end(), s.begin(), [](unsigned char c) { return std::tolower(c); });
Expand Down Expand Up @@ -524,6 +525,14 @@ Context::findValue(absl::string_view name, Protobuf::Arena* arena, bool last) co
case PropertyToken::CLUSTER_METADATA:
if (info && info->upstreamHost()) {
return CelValue::CreateMessage(&info->upstreamHost()->cluster().metadata(), arena);
} else if (info && info->upstreamClusterInfo().has_value() &&
info->upstreamClusterInfo().value()) {
return CelValue::CreateMessage(&info->upstreamClusterInfo().value()->metadata(), arena);
}
break;
case PropertyToken::UPSTREAM_HOST_METADATA:
if (info && info->upstreamHost() && info->upstreamHost()->metadata()) {
return CelValue::CreateMessage(info->upstreamHost()->metadata().get(), arena);
}
break;
case PropertyToken::ROUTE_NAME:
Expand Down
10 changes: 9 additions & 1 deletion test/extensions/filters/http/wasm/test_data/test_cpp.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,11 @@ void TestContext::onLog() {
if (response_trailer && response_trailer->view() != "") {
logWarn("response bogus-trailer found");
}
} else if (test == "cluster_metadata") {
std::string cluster_metadata;
if (getValue({"cluster_metadata", "filter_metadata", "namespace", "key"}, &cluster_metadata)) {
logWarn("cluster metadata: " + cluster_metadata);
}
} else if (test == "property") {
setFilterState("wasm_state", "wasm_value");
auto path = getRequestHeader(":path");
Expand All @@ -343,6 +348,10 @@ void TestContext::onLog() {
if (getValue({"response", "code"}, &responseCode)) {
logWarn("response.code: " + std::to_string(responseCode));
}
std::string upstream_host_metadata;
if (getValue({"upstream_host_metadata", "filter_metadata", "namespace", "key"}, &upstream_host_metadata)) {
logWarn("upstream host metadata: " + upstream_host_metadata);
}
logWarn("state: " + getProperty({"wasm_state"}).value()->toString());
} else {
logWarn("onLog " + std::to_string(id()) + " " + std::string(path->view()));
Expand Down Expand Up @@ -541,7 +550,6 @@ void TestContext::onLog() {
{{"source", "address"}, "127.0.0.1:0"},
{{"destination", "address"}, "127.0.0.2:0"},
{{"upstream", "address"}, "10.0.0.1:443"},
{{"cluster_metadata"}, ""},
{{"route_metadata"}, ""},
};
for (const auto& property : properties) {
Expand Down
50 changes: 50 additions & 0 deletions test/extensions/filters/http/wasm/wasm_filter_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1292,6 +1292,8 @@ TEST_P(WasmHttpFilterTest, Property) {
log_(spdlog::level::warn, Eq(absl::string_view("metadata: wasm_request_get_value"))));
EXPECT_CALL(filter(), log_(spdlog::level::warn, Eq(absl::string_view("response.code: 403"))));
EXPECT_CALL(filter(), log_(spdlog::level::warn, Eq(absl::string_view("state: wasm_value"))));
EXPECT_CALL(filter(),
log_(spdlog::level::warn, Eq(absl::string_view("upstream host metadata: endpoint"))));

root_context_->onTick(0);
Http::TestRequestHeaderMapImpl request_headers{{":path", "/test_context"}};
Expand All @@ -1304,6 +1306,54 @@ TEST_P(WasmHttpFilterTest, Property) {
EXPECT_CALL(encoder_callbacks_, connection()).WillRepeatedly(Return(&connection));
NiceMock<Router::MockRouteEntry> route_entry;
EXPECT_CALL(request_stream_info_, routeEntry()).WillRepeatedly(Return(&route_entry));
std::shared_ptr<NiceMock<Envoy::Upstream::MockHostDescription>> host_description(
new NiceMock<Envoy::Upstream::MockHostDescription>());
auto metadata = std::make_shared<envoy::config::core::v3::Metadata>(
TestUtility::parseYaml<envoy::config::core::v3::Metadata>(
R"EOF(
filter_metadata:
namespace:
key: endpoint
)EOF"));
EXPECT_CALL(*host_description, metadata()).WillRepeatedly(Return(metadata));
EXPECT_CALL(request_stream_info_, upstreamHost()).WillRepeatedly(Return(host_description));
filter().log(&request_headers, nullptr, nullptr, log_stream_info);
}

TEST_P(WasmHttpFilterTest, ClusterMetadata) {
if (std::get<1>(GetParam()) == "rust") {
// TODO(PiotrSikora): test not yet implemented using Rust SDK.
return;
}
setupTest("", "cluster_metadata");
setupFilter();
EXPECT_CALL(filter(),
log_(spdlog::level::warn, Eq(absl::string_view("cluster metadata: cluster"))));
auto cluster = std::make_shared<NiceMock<Upstream::MockClusterInfo>>();
auto cluster_metadata = std::make_shared<envoy::config::core::v3::Metadata>(
TestUtility::parseYaml<envoy::config::core::v3::Metadata>(
R"EOF(
filter_metadata:
namespace:
key: cluster
)EOF"));

std::shared_ptr<NiceMock<Envoy::Upstream::MockHostDescription>> host_description(
new NiceMock<Envoy::Upstream::MockHostDescription>());
StreamInfo::MockStreamInfo log_stream_info;
Http::TestRequestHeaderMapImpl request_headers{{}};

EXPECT_CALL(encoder_callbacks_, streamInfo()).WillRepeatedly(ReturnRef(request_stream_info_));
EXPECT_CALL(*cluster, metadata()).WillRepeatedly(ReturnRef(*cluster_metadata));
EXPECT_CALL(*host_description, cluster()).WillRepeatedly(ReturnRef(*cluster));
EXPECT_CALL(request_stream_info_, upstreamHost()).WillRepeatedly(Return(host_description));
filter().log(&request_headers, nullptr, nullptr, log_stream_info);

// If upstream host is empty, fallback to upstream cluster info for cluster metadata.
EXPECT_CALL(request_stream_info_, upstreamHost()).WillRepeatedly(Return(nullptr));
EXPECT_CALL(request_stream_info_, upstreamClusterInfo()).WillRepeatedly(Return(cluster));
EXPECT_CALL(filter(),
log_(spdlog::level::warn, Eq(absl::string_view("cluster metadata: cluster"))));
filter().log(&request_headers, nullptr, nullptr, log_stream_info);
}

Expand Down