diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl index 1ae7f3fa14ed0..152525bb475a6 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -9,6 +9,7 @@ load("@rules_antlr//antlr:deps.bzl", "antlr_dependencies") load("@proxy_wasm_rust_sdk//bazel:dependencies.bzl", "proxy_wasm_rust_sdk_dependencies") load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains") load("@base_pip3//:requirements.bzl", pip_dependencies = "install_deps") +load("@emsdk//:emscripten_deps.bzl", "emscripten_deps") # go version for rules_go GO_VERSION = "1.17.5" @@ -31,6 +32,7 @@ def envoy_dependency_imports(go_version = GO_VERSION): ) rules_cc_dependencies() rules_cc_toolchains() + emscripten_deps() # These dependencies, like most of the Go in this repository, exist only for the API. go_repository( diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index e513bd697468c..ab376658d4be6 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -206,7 +206,7 @@ def envoy_dependencies(skip_targets = []): _upb() _proxy_wasm_cpp_sdk() _proxy_wasm_cpp_host() - _emscripten_toolchain() + _emsdk() _rules_fuzzing() external_http_archive("proxy_wasm_rust_sdk") _com_google_cel_cpp() @@ -978,17 +978,8 @@ def _proxy_wasm_cpp_sdk(): def _proxy_wasm_cpp_host(): external_http_archive(name = "proxy_wasm_cpp_host") -def _emscripten_toolchain(): - external_http_archive( - name = "emscripten_toolchain", - build_file_content = _build_all_content(exclude = [ - "upstream/emscripten/cache/is_vanilla.txt", - ".emscripten_sanity", - ]), - patch_cmds = [ - "if [[ \"$(uname -m)\" == \"x86_64\" ]]; then ./emsdk install 3.1.7 && ./emsdk activate --embedded 3.1.7; fi", - ], - ) +def _emsdk(): + external_http_archive(name = "emsdk") def _com_github_google_jwt_verify(): external_http_archive("com_github_google_jwt_verify") diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl index fca63499e146e..d7baeaad4e357 100644 --- a/bazel/repositories_extra.bzl +++ b/bazel/repositories_extra.bzl @@ -1,3 +1,4 @@ +load("@emsdk//:deps.bzl", emsdk_deps = "deps") load("@rules_python//python:pip.bzl", "pip_install", "pip_parse") load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime:crates.bzl", "wasmtime_fetch_remote_crates") load("//bazel/external/cargo:crates.bzl", "raze_fetch_remote_crates") @@ -25,5 +26,6 @@ def _python_deps(): # Envoy deps that rely on a first stage of dependency loading in envoy_dependencies(). def envoy_dependencies_extra(): _python_deps() + emsdk_deps() raze_fetch_remote_crates() wasmtime_fetch_remote_crates() diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 5019383ba541e..e5a52296a57a0 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -1021,8 +1021,8 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "WebAssembly for Proxies (C++ SDK)", project_desc = "WebAssembly for Proxies (C++ SDK)", project_url = "https://github.com/proxy-wasm/proxy-wasm-cpp-sdk", - version = "898aaed73e69c453eeefd08ca8c405dd056f2251", - sha256 = "8fb86b8c2ed8a546f54d06a355543f85796d86f3b3a7a0c6e0466f9d2152ef92", + version = "e30535b7c0cd3126e6401bc3769063a74bbb37be", + sha256 = "94e474ebea782225821224734ed5992fa749301e12e06b6520b8b4d4e1c05ffc", strip_prefix = "proxy-wasm-cpp-sdk-{version}", urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/{version}.tar.gz"], use_category = ["dataplane_ext"], @@ -1038,7 +1038,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( "envoy.wasm.runtime.wavm", "envoy.wasm.runtime.wasmtime", ], - release_date = "2022-03-11", + release_date = "2022-03-15", cpe = "N/A", ), proxy_wasm_cpp_host = dict( @@ -1077,16 +1077,17 @@ REPOSITORY_LOCATIONS_SPEC = dict( release_date = "2021-07-13", cpe = "N/A", ), - emscripten_toolchain = dict( + emsdk = dict( project_name = "Emscripten SDK", project_desc = "Emscripten SDK (use by Wasm)", project_url = "https://github.com/emscripten-core/emsdk", - version = "3.1.7", - sha256 = "bcceced0b7cad2e08375adf74ef20fa431230abbae8766bdad268c43e34f8d03", - strip_prefix = "emsdk-{version}", + # v3.1.7 with Bazel fixes + version = "0ea8f8a8707070e9a7c83fbb4a3065683bcf1799", + sha256 = "1ca0ff918d476c55707bb99bc0452be28ac5fb8f22a9260a8aae8a38d1bc0e27", + strip_prefix = "emsdk-{version}/bazel", urls = ["https://github.com/emscripten-core/emsdk/archive/{version}.tar.gz"], - use_category = ["build"], - release_date = "2022-03-07", + use_category = ["test_only"], + release_date = "2022-03-09", ), rules_rust = dict( project_name = "Bazel rust rules", diff --git a/bazel/wasm/wasm.bzl b/bazel/wasm/wasm.bzl index 799eb7d862da8..8009f088d7360 100644 --- a/bazel/wasm/wasm.bzl +++ b/bazel/wasm/wasm.bzl @@ -1,4 +1,4 @@ -load("@proxy_wasm_cpp_sdk//bazel/wasm:wasm.bzl", "proxy_wasm_cc_binary") +load("@proxy_wasm_cpp_sdk//bazel:defs.bzl", "proxy_wasm_cc_binary") load("@rules_rust//rust:rust.bzl", "rust_binary") load("//bazel:envoy_select.bzl", "envoy_select_wasm_v8_bool") diff --git a/test/extensions/access_loggers/wasm/test_data/BUILD b/test/extensions/access_loggers/wasm/test_data/BUILD index ca3e8f847472c..7dbdc09c5d1e6 100644 --- a/test/extensions/access_loggers/wasm/test_data/BUILD +++ b/test/extensions/access_loggers/wasm/test_data/BUILD @@ -28,7 +28,4 @@ envoy_cc_library( envoy_wasm_cc_binary( name = "test_cpp.wasm", srcs = ["test_cpp.cc"], - deps = [ - "@proxy_wasm_cpp_sdk//:proxy_wasm_intrinsics_lite", - ], ) diff --git a/test/extensions/bootstrap/wasm/test_data/BUILD b/test/extensions/bootstrap/wasm/test_data/BUILD index ba016610e703e..7caf434c47713 100644 --- a/test/extensions/bootstrap/wasm/test_data/BUILD +++ b/test/extensions/bootstrap/wasm/test_data/BUILD @@ -108,9 +108,7 @@ envoy_wasm_cc_binary( envoy_wasm_cc_binary( name = "speed_cpp.wasm", srcs = ["speed_cpp.cc"], - deps = [ - "@proxy_wasm_cpp_sdk//:proxy_wasm_intrinsics_full", - ], + protobuf = "full", ) envoy_wasm_cc_binary( diff --git a/test/extensions/filters/http/wasm/test_data/BUILD b/test/extensions/filters/http/wasm/test_data/BUILD index d879573fdb86c..a96c694e1c01d 100644 --- a/test/extensions/filters/http/wasm/test_data/BUILD +++ b/test/extensions/filters/http/wasm/test_data/BUILD @@ -154,11 +154,11 @@ envoy_wasm_cc_binary( "test_shared_data_cpp.cc", "test_shared_queue_cpp.cc", ], + protobuf = "lite", deps = [ ":test_cc_proto", "//source/extensions/common/wasm/ext:declare_property_cc_proto", "//source/extensions/common/wasm/ext:envoy_proxy_wasm_api_lib", - "@proxy_wasm_cpp_sdk//:proxy_wasm_intrinsics_lite", "@proxy_wasm_cpp_sdk//contrib:contrib_lib", ], ) diff --git a/test/extensions/filters/network/wasm/test_data/BUILD b/test/extensions/filters/network/wasm/test_data/BUILD index 0abef6fa9366e..5281609f62ae3 100644 --- a/test/extensions/filters/network/wasm/test_data/BUILD +++ b/test/extensions/filters/network/wasm/test_data/BUILD @@ -71,7 +71,4 @@ envoy_wasm_cc_binary( "test_panic_cpp.cc", "test_resume_call_cpp.cc", ], - deps = [ - "@proxy_wasm_cpp_sdk//:proxy_wasm_intrinsics_lite", - ], )