diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index fc47d04433..219d9bf41e 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -492,16 +492,16 @@ DEPENDENCY_REPOSITORIES = dict( cpe = "cpe:2.3:a:icu-project:international_components_for_unicode", ), proxy_wasm_cpp_sdk = dict( - sha256 = "29155a6c4a9e898f66f4af30425c9a51ce9e0b45b3b4252d4c26546b6e7835a0", - strip_prefix = "proxy-wasm-cpp-sdk-da0fd5e1aed363a17176bc5488a298d6ea03f3ec", - urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/da0fd5e1aed363a17176bc5488a298d6ea03f3ec.tar.gz"], + sha256 = "d81c316d567fa5780862c5a9c879bdb189e94e587e981839806c8ce1d78d1957", + strip_prefix = "proxy-wasm-cpp-sdk-a23dadb0187780e0b72db5b7a8e1ad2e1f159430", + urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/a23dadb0187780e0b72db5b7a8e1ad2e1f159430.tar.gz"], use_category = ["dataplane"], cpe = "N/A", ), proxy_wasm_cpp_host = dict( - sha256 = "c18ad21c9b4e158d84721f28726a3fe2f1b82c959b81912c746c9316eb5ab322", - strip_prefix = "proxy-wasm-cpp-host-5d8775b77332c13671c592f90d2067d010291970", - urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-host/archive/5d8775b77332c13671c592f90d2067d010291970.tar.gz"], + sha256 = "36f80defdfc140cb4b41ba36f0f000f2bdb0eafd599ce14b5716e5583ed47d25", + strip_prefix = "proxy-wasm-cpp-host-e73c498e64c654c06a68ea54243e0cc9e2299464", + urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-host/archive/e73c498e64c654c06a68ea54243e0cc9e2299464.tar.gz"], use_category = ["dataplane"], cpe = "N/A", ), diff --git a/source/extensions/common/wasm/context.h b/source/extensions/common/wasm/context.h index b2101c99fa..2633f13b3b 100644 --- a/source/extensions/common/wasm/context.h +++ b/source/extensions/common/wasm/context.h @@ -207,6 +207,7 @@ class Context : public proxy_wasm::ContextBase, // General WasmResult log(uint32_t level, absl::string_view message) override; uint64_t getCurrentTimeNanoseconds() override; + absl::string_view getConfiguration() override; std::pair getStatus() override; // State accessors @@ -221,6 +222,11 @@ class Context : public proxy_wasm::ContextBase, WasmResult sendLocalResponse(uint32_t response_code, absl::string_view body_text, Pairs additional_headers, uint32_t grpc_status, absl::string_view details) override; + void clearRouteCache() override { + if (decoder_callbacks_) { + decoder_callbacks_->clearRouteCache(); + } + } // Header/Trailer/Metadata Maps WasmResult addHeaderMapValue(WasmHeaderMapType type, absl::string_view key, @@ -311,13 +317,6 @@ class Context : public proxy_wasm::ContextBase, void addAfterVmCallAction(std::function f); void onCloseTCP(); - virtual absl::string_view getConfiguration(); - virtual void clearRouteCache() { - if (decoder_callbacks_) { - decoder_callbacks_->clearRouteCache(); - } - } - struct AsyncClientHandler : public Http::AsyncClient::Callbacks { // Http::AsyncClient::Callbacks void onSuccess(const Http::AsyncClient::Request&, diff --git a/test/extensions/common/wasm/test_data/test_cpp.cc b/test/extensions/common/wasm/test_data/test_cpp.cc index f5ddc3e8d4..72e83b7da7 100644 --- a/test/extensions/common/wasm/test_data/test_cpp.cc +++ b/test/extensions/common/wasm/test_data/test_cpp.cc @@ -37,6 +37,8 @@ static float gInfinity = INFINITY; abort(); \ } while (0) +WASM_EXPORT(void, proxy_abi_version_0_2_0, (void)) {} + WASM_EXPORT(void, proxy_on_context_create, (uint32_t, uint32_t)) {} WASM_EXPORT(uint32_t, proxy_on_vm_start, (uint32_t context_id, uint32_t configuration_size)) {