Skip to content

OSSM-1856: Use upstream proxy-wasm-cpp-host #195

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
maistra-bot merged 2 commits into from
Aug 25, 2022
Merged

OSSM-1856: Use upstream proxy-wasm-cpp-host #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
111e3a1
OSSM-1856: Use upstream proxy-wasm-cpp-host
jwendell Aug 15, 2022
e40ada3
Reapply "wasm: update Wasmtime to v0.34.1. (#20009)"
PiotrSikora Feb 26, 2022
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
4 changes: 2 additions & 2 deletions bazel/repositories_extra.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
load("@emsdk//:deps.bzl", emsdk_deps = "deps")
load("@rules_python//python:pip.bzl", "pip_install", "pip_parse")
load("@proxy_wasm_cpp_host//bazel/cargo:crates.bzl", "proxy_wasm_cpp_host_fetch_remote_crates")
load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime:crates.bzl", "wasmtime_fetch_remote_crates")
load("//bazel/external/cargo:crates.bzl", "raze_fetch_remote_crates")
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")

Expand Down Expand Up @@ -32,4 +32,4 @@ def envoy_dependencies_extra():

# This function defines the `@rules_jvm_external` repository, which is needed.
protobuf_deps()
proxy_wasm_cpp_host_fetch_remote_crates()
wasmtime_fetch_remote_crates()
8 changes: 4 additions & 4 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,11 +1079,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
proxy_wasm_cpp_host = dict(
project_name = "WebAssembly for Proxies (C++ host implementation)",
project_desc = "WebAssembly for Proxies (C++ host implementation)",
project_url = "https://github.com/maistra/proxy-wasm-cpp-host",
version = "8849b2cc7523034c73fb2e27334c25f9c640a0e3",
sha256 = "6cce85e633605f6389c9c8e2e5c64b277caba56ba65a9dd15a706d86ae00ac9a",
project_url = "https://github.com/proxy-wasm/proxy-wasm-cpp-host",
version = "694a0b073912ff3bd00b6ca70d16ca43b2aebbf2",
sha256 = "d8b8ed52c48a4847a76c2192095362972e4ce07b95311f36da844128d5b35ab5",
strip_prefix = "proxy-wasm-cpp-host-{version}",
urls = ["https://github.com/maistra/proxy-wasm-cpp-host/archive/{version}.tar.gz"],
urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-host/archive/{version}.tar.gz"],
use_category = ["dataplane_ext"],
extensions = [
"envoy.access_loggers.wasm",
Expand Down
2 changes: 2 additions & 0 deletions maistra/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ export ARCH

COMMON_FLAGS="\
--config=${ARCH} \
--config=clang \
--define crypto=system \
"
if [ -n "${CI}" ]; then
COMMON_FLAGS+=" --config=ci-config "
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/common/wasm/wasm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Wasm::Wasm(WasmHandleSharedPtr base_wasm_handle, Event::Dispatcher& dispatcher)
[&base_wasm_handle]() {
return createWasmVm(absl::StrCat(
"envoy.wasm.runtime.",
toAbslStringView(base_wasm_handle->wasm()->wasm_vm()->runtime())));
toAbslStringView(base_wasm_handle->wasm()->wasm_vm()->getEngineName())));
}),
scope_(getWasm(base_wasm_handle)->scope_), api_(getWasm(base_wasm_handle)->api_),
stat_name_pool_(scope_->symbolTable()),
Expand Down
6 changes: 3 additions & 3 deletions test/extensions/common/wasm/wasm_vm_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ TEST_F(BaseVmTest, BadRuntime) { EXPECT_EQ(createWasmVm("envoy.wasm.runtime.inva
TEST_F(BaseVmTest, NullVmStartup) {
auto wasm_vm = createWasmVm("envoy.wasm.runtime.null");
EXPECT_TRUE(wasm_vm != nullptr);
EXPECT_TRUE(wasm_vm->runtime() == "null");
EXPECT_TRUE(wasm_vm->getEngineName() == "null");
EXPECT_TRUE(wasm_vm->cloneable() == Cloneable::InstantiatedModule);
auto wasm_vm_clone = wasm_vm->clone();
EXPECT_TRUE(wasm_vm_clone != nullptr);
EXPECT_EQ(wasm_vm->runtime(), "null");
EXPECT_EQ(wasm_vm->getEngineName(), "null");
std::function<void()> f;
EXPECT_FALSE(wasm_vm->integration()->getNullVmFunction("bad_function", false, 0, nullptr, &f));
}
Expand Down Expand Up @@ -184,7 +184,7 @@ TEST_P(WasmVmTest, V8BadCode) { ASSERT_FALSE(init("bad code")); }

TEST_P(WasmVmTest, V8Load) {
ASSERT_TRUE(init());
EXPECT_TRUE(wasm_vm_->runtime() == "v8");
EXPECT_TRUE(wasm_vm_->getEngineName() == "v8");
EXPECT_TRUE(wasm_vm_->cloneable() == Cloneable::CompiledBytecode);
EXPECT_TRUE(wasm_vm_->clone() != nullptr);
}
Expand Down