diff --git a/WORKSPACE b/WORKSPACE index 7c463a2c..33fc663d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -16,8 +16,8 @@ http_archive( url = "https://github.com/proxy-wasm/proxy-wasm-cpp-host/archive/" + PROXY_WASM_HOST_COMMIT + ".tar.gz", ) -PROXY_WASM_CPP_COMMIT = "921039ae983ce053bf5cba78a85a3c08ff9791e5" # 2023-05-01 -PROXY_WASM_CPP_SHA256 = "a11adfe4e6346d3318ff72643aa5569dc8439d7e8927ed148f93226fa255cc7a" +PROXY_WASM_CPP_COMMIT = "6efffe99a90d764b063b9fa8213d2c34ae69a7da" # PR#157 +PROXY_WASM_CPP_SHA256 = "db00ef59d8024d0db74a269ece76d8106c1e9afc1abed237aea8366a8db2983e" http_archive( name = "proxy_wasm_cpp_sdk", diff --git a/samples/config_denylist/BUILD b/samples/config_denylist/BUILD index 00eed6f6..ec8bb789 100644 --- a/samples/config_denylist/BUILD +++ b/samples/config_denylist/BUILD @@ -16,6 +16,7 @@ proxy_wasm_plugin_cpp( srcs = ["plugin.cc"], deps = [ "@proxy_wasm_cpp_sdk//contrib:contrib_lib", + "@com_google_absl//absl/strings:strings", ], ) diff --git a/samples/config_denylist/plugin.cc b/samples/config_denylist/plugin.cc index 3619fc3b..4dd1ec76 100644 --- a/samples/config_denylist/plugin.cc +++ b/samples/config_denylist/plugin.cc @@ -15,6 +15,7 @@ #include #include "proxy_wasm_intrinsics.h" +#include "absl/strings/str_cat.h" class MyRootContext : public RootContext { public: @@ -39,7 +40,7 @@ class MyRootContext : public RootContext { } idx = nxt + 1; } - LOG_INFO("Config keys size " + std::to_string(tokens_.size())); + LOG_INFO(absl::StrCat("Config keys size ", tokens_.size())); return true; } diff --git a/samples/regex_rewrite/BUILD b/samples/regex_rewrite/BUILD index 222338aa..383dd0a2 100644 --- a/samples/regex_rewrite/BUILD +++ b/samples/regex_rewrite/BUILD @@ -12,23 +12,20 @@ proxy_wasm_plugin_rust( ], ) -# Blocked on emscripten update to fix Abseil/RE2 compatibility: -# https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/pull/157 -# NOTE: Plugins can be built using that PR -- it's blocked on Envoy. -#proxy_wasm_plugin_cpp( -# name = "plugin_cpp.wasm", -# srcs = ["plugin.cc"], -# deps = [ -# "@com_google_re2//:re2", -# "@proxy_wasm_cpp_sdk//contrib:contrib_lib", -# ], -#) +proxy_wasm_plugin_cpp( + name = "plugin_cpp.wasm", + srcs = ["plugin.cc"], + deps = [ + "@com_google_re2//:re2", + "@proxy_wasm_cpp_sdk//contrib:contrib_lib", + ], +) cc_test( name = "plugin_test", srcs = ["test.cc"], data = [ - #":plugin_cpp.wasm", + ":plugin_cpp.wasm", ":plugin_rust.wasm", ], deps = [ diff --git a/samples/regex_rewrite/test.cc b/samples/regex_rewrite/test.cc index 86e18c4d..0b4bd1c4 100644 --- a/samples/regex_rewrite/test.cc +++ b/samples/regex_rewrite/test.cc @@ -25,10 +25,10 @@ namespace service_extensions_samples { INSTANTIATE_TEST_SUITE_P( EnginesAndPlugins, HttpTest, - ::testing::Combine(::testing::ValuesIn(proxy_wasm::getWasmEngines()), - ::testing::Values( - //"samples/regex_rewrite/plugin_cpp.wasm", - "samples/regex_rewrite/plugin_rust.wasm"))); + ::testing::Combine( + ::testing::ValuesIn(proxy_wasm::getWasmEngines()), + ::testing::Values("samples/regex_rewrite/plugin_cpp.wasm", + "samples/regex_rewrite/plugin_rust.wasm"))); TEST_P(HttpTest, NoMatch) { // Create VM and load the plugin.