Skip to content

Commit

Permalink
deps: Update proxy_wasm_cpp_host -> c4d7bb0, wasmtime -> 24.0.2, …
Browse files Browse the repository at this point in the history
…`wamr` -> 2.2.0 (envoyproxy#37868)

Commit Message: deps: Update `proxy_wasm_cpp_host` -> c4d7bb0,
`wasmtime` -> 24.0.2, `wamr` -> 2.2.0
Additional Description:
proxy-wasm/proxy-wasm-cpp-host@f199214...c4d7bb0
Risk Level: low
Testing: `bazel test test/...` passes, with `--define=wasm=v8`,
`--define=wasm=wamr`, and `--define=wasm=wasmtime`.
Docs Changes: None.
Release Notes: Mentioned new support for [Go
SDK](github.com/proxy-wasm/proxy-wasm-go-sdk) plugins.

Supercedes envoyproxy#36880 and envoyproxy#36857

---------

Signed-off-by: Matt Leon <mattleon@google.com>
Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>
Co-authored-by: Ryan Northey <ryan@synca.io>
Co-authored-by: Keith Mattix II <keithmattix@microsoft.com>
  • Loading branch information
3 people authored Jan 7, 2025
1 parent 7285425 commit 34abaa4
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 86 deletions.
14 changes: 0 additions & 14 deletions bazel/external/wasm-c-api.BUILD

This file was deleted.

31 changes: 0 additions & 31 deletions bazel/external/wasmtime.BUILD

This file was deleted.

17 changes: 2 additions & 15 deletions bazel/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ def envoy_dependencies(skip_targets = []):

_com_github_wamr()
_com_github_wasmtime()
_com_github_wasm_c_api()

switched_rules_by_language(
name = "com_google_googleapis_imports",
Expand Down Expand Up @@ -892,24 +891,12 @@ def _com_github_wamr():
def _com_github_wasmtime():
external_http_archive(
name = "com_github_wasmtime",
build_file = "@envoy//bazel/external:wasmtime.BUILD",
build_file = "@proxy_wasm_cpp_host//:bazel/external/wasmtime.BUILD",
)

def _com_github_wasm_c_api():
external_http_archive(
name = "com_github_wasm_c_api",
build_file = "@envoy//bazel/external:wasm-c-api.BUILD",
)
native.bind(
name = "wasmtime",
actual = "@com_github_wasm_c_api//:wasmtime_lib",
)

# This isn't needed in builds with a single Wasm engine, but "bazel query"
# complains about a missing dependency, so point it at the regular target.
native.bind(
name = "prefixed_wasmtime",
actual = "@com_github_wasm_c_api//:wasmtime_lib",
actual = "@com_github_wasmtime//:wasmtime_lib",
)

def _intel_dlb():
Expand Down
35 changes: 9 additions & 26 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -1137,11 +1137,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "Webassembly Micro Runtime",
project_desc = "A standalone runtime with a small footprint for WebAssembly",
project_url = "https://github.com/bytecodealliance/wasm-micro-runtime",
version = "WAMR-2.0.0",
sha256 = "7663a34b61d6d0ff90778d9be37efde92e2f28ec9baad89f7b18555f0db435ab",
version = "WAMR-2.2.0",
sha256 = "93b6ba03f681e061967106046b1908631ee705312b9a6410f3baee7af7c6aac9",
strip_prefix = "wasm-micro-runtime-{version}",
urls = ["https://github.com/bytecodealliance/wasm-micro-runtime/archive/{version}.tar.gz"],
release_date = "2024-04-23",
release_date = "2024-10-22",
use_category = ["dataplane_ext"],
extensions = ["envoy.wasm.runtime.wamr"],
cpe = "N/A",
Expand All @@ -1152,34 +1152,17 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "wasmtime",
project_desc = "A standalone runtime for WebAssembly",
project_url = "https://github.com/bytecodealliance/wasmtime",
version = "9.0.3",
sha256 = "917da461249b11a3176a39573723f78c627259576d0ca10b00d6e7f7fa047081",
version = "24.0.2",
sha256 = "76a5eedf3d57de8a97492006cfa9c2c5eedf81ad82ba173f0615e85695cecdf7",
strip_prefix = "wasmtime-{version}",
urls = ["https://github.com/bytecodealliance/wasmtime/archive/v{version}.tar.gz"],
release_date = "2023-05-31",
release_date = "2024-11-05",
use_category = ["dataplane_ext"],
extensions = ["envoy.wasm.runtime.wasmtime"],
cpe = "cpe:2.3:a:bytecodealliance:wasmtime:*",
license = "Apache-2.0",
license_url = "https://github.com/bytecodealliance/wasmtime/blob/v{version}/LICENSE",
),
com_github_wasm_c_api = dict(
project_name = "wasm-c-api",
project_desc = "WebAssembly C and C++ API",
project_url = "https://github.com/WebAssembly/wasm-c-api",
# this is the submodule's specific commit used by wasmtime
# https://github.com/bytecodealliance/wasmtime/tree/v0.25.0/crates/c-api
version = "c9d31284651b975f05ac27cee0bab1377560b87e",
sha256 = "c774044f51431429e878bd1b9e2a4e38932f861f9211df72f75e9427eb6b8d32",
strip_prefix = "wasm-c-api-{version}",
urls = ["https://github.com/WebAssembly/wasm-c-api/archive/{version}.tar.gz"],
release_date = "2021-01-11",
use_category = ["dataplane_ext"],
extensions = ["envoy.wasm.runtime.wasmtime"],
cpe = "N/A",
license = "Apache-2.0",
license_url = "https://github.com/WebAssembly/wasm-c-api/blob/{version}/LICENSE",
),
# Curl usage is under deprecation and will be removed by Q3 2024 before v1.31 release in July-2024.
# See https://github.com/envoyproxy/envoy/issues/11816 & https://github.com/envoyproxy/envoy/pull/30731.
com_github_curl = dict(
Expand Down Expand Up @@ -1428,8 +1411,8 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "WebAssembly for Proxies (C++ host implementation)",
project_desc = "WebAssembly for Proxies (C++ host implementation)",
project_url = "https://github.com/proxy-wasm/proxy-wasm-cpp-host",
version = "f199214a43337e115469d9f0dd6b77858746441b",
sha256 = "b06f193324650f80d1d5494046c45941884f4eb66025cff026edf3b506596150",
version = "c4d7bb0fda912e24c64daf2aa749ec54cec99412",
sha256 = "3ea005e85d2b37685149c794c6876fd6de7f632f0ad49dc2b3cd580e7e7a5525",
strip_prefix = "proxy-wasm-cpp-host-{version}",
urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-host/archive/{version}.tar.gz"],
use_category = ["dataplane_ext"],
Expand All @@ -1444,7 +1427,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
"envoy.wasm.runtime.wamr",
"envoy.wasm.runtime.wasmtime",
],
release_date = "2024-08-19",
release_date = "2024-12-19",
cpe = "N/A",
license = "Apache-2.0",
license_url = "https://github.com/proxy-wasm/proxy-wasm-cpp-host/blob/{version}/LICENSE",
Expand Down
3 changes: 3 additions & 0 deletions changelogs/current.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@ new_features:
Added the wasm vm reload support to reload wasm vm when the wasm vm is failed with runtime errors. See
:ref:`failure_policy <envoy_v3_api_field_extensions.wasm.v3.PluginConfig.failure_policy>` for more details.
The ``FAIL_RELOAD`` reload policy will be used by default.
- area: wasm
change: |
Added support for wasm plugins written in Go with the github.com/proxy-wasm/proxy-wasm-go-sdk and compiled with Go v1.24+.
- area: aws_request_signing
change: |
Added an optional field :ref:`credential_provider
Expand Down

0 comments on commit 34abaa4

Please sign in to comment.