Skip to content

Commit c1f7b6a

Browse files
leonm1phlaxkeithmattix
committed
deps: Update proxy_wasm_cpp_host -> c4d7bb0, wasmtime -> 24.0.2, 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>
1 parent 71632ab commit c1f7b6a

File tree

5 files changed

+14
-101
lines changed

5 files changed

+14
-101
lines changed

bazel/external/wasm-c-api.BUILD

Lines changed: 0 additions & 14 deletions
This file was deleted.

bazel/external/wasmtime.BUILD

Lines changed: 0 additions & 31 deletions
This file was deleted.

bazel/repositories.bzl

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ def envoy_dependencies(skip_targets = []):
250250

251251
_com_github_wamr()
252252
_com_github_wasmtime()
253-
_com_github_wasm_c_api()
254253

255254
switched_rules_by_language(
256255
name = "com_google_googleapis_imports",
@@ -932,24 +931,12 @@ def _com_github_wamr():
932931
def _com_github_wasmtime():
933932
external_http_archive(
934933
name = "com_github_wasmtime",
935-
build_file = "@envoy//bazel/external:wasmtime.BUILD",
934+
build_file = "@proxy_wasm_cpp_host//:bazel/external/wasmtime.BUILD",
936935
)
937936

938-
def _com_github_wasm_c_api():
939-
external_http_archive(
940-
name = "com_github_wasm_c_api",
941-
build_file = "@envoy//bazel/external:wasm-c-api.BUILD",
942-
)
943937
native.bind(
944938
name = "wasmtime",
945-
actual = "@com_github_wasm_c_api//:wasmtime_lib",
946-
)
947-
948-
# This isn't needed in builds with a single Wasm engine, but "bazel query"
949-
# complains about a missing dependency, so point it at the regular target.
950-
native.bind(
951-
name = "prefixed_wasmtime",
952-
actual = "@com_github_wasm_c_api//:wasmtime_lib",
939+
actual = "@com_github_wasmtime//:wasmtime_lib",
953940
)
954941

955942
def _intel_dlb():

bazel/repository_locations.bzl

Lines changed: 9 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,11 +1111,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
11111111
project_name = "Webassembly Micro Runtime",
11121112
project_desc = "A standalone runtime with a small footprint for WebAssembly",
11131113
project_url = "https://github.com/bytecodealliance/wasm-micro-runtime",
1114-
version = "WAMR-2.0.0",
1115-
sha256 = "7663a34b61d6d0ff90778d9be37efde92e2f28ec9baad89f7b18555f0db435ab",
1114+
version = "WAMR-2.2.0",
1115+
sha256 = "93b6ba03f681e061967106046b1908631ee705312b9a6410f3baee7af7c6aac9",
11161116
strip_prefix = "wasm-micro-runtime-{version}",
11171117
urls = ["https://github.com/bytecodealliance/wasm-micro-runtime/archive/{version}.tar.gz"],
1118-
release_date = "2024-04-23",
1118+
release_date = "2024-10-22",
11191119
use_category = ["dataplane_ext"],
11201120
extensions = ["envoy.wasm.runtime.wamr"],
11211121
cpe = "N/A",
@@ -1126,49 +1126,17 @@ REPOSITORY_LOCATIONS_SPEC = dict(
11261126
project_name = "wasmtime",
11271127
project_desc = "A standalone runtime for WebAssembly",
11281128
project_url = "https://github.com/bytecodealliance/wasmtime",
1129-
version = "9.0.3",
1130-
sha256 = "917da461249b11a3176a39573723f78c627259576d0ca10b00d6e7f7fa047081",
1129+
version = "24.0.2",
1130+
sha256 = "76a5eedf3d57de8a97492006cfa9c2c5eedf81ad82ba173f0615e85695cecdf7",
11311131
strip_prefix = "wasmtime-{version}",
11321132
urls = ["https://github.com/bytecodealliance/wasmtime/archive/v{version}.tar.gz"],
1133-
release_date = "2023-05-31",
1133+
release_date = "2024-11-05",
11341134
use_category = ["dataplane_ext"],
11351135
extensions = ["envoy.wasm.runtime.wasmtime"],
11361136
cpe = "cpe:2.3:a:bytecodealliance:wasmtime:*",
11371137
license = "Apache-2.0",
11381138
license_url = "https://github.com/bytecodealliance/wasmtime/blob/v{version}/LICENSE",
11391139
),
1140-
com_github_wasm_c_api = dict(
1141-
project_name = "wasm-c-api",
1142-
project_desc = "WebAssembly C and C++ API",
1143-
project_url = "https://github.com/WebAssembly/wasm-c-api",
1144-
# this is the submodule's specific commit used by wasmtime
1145-
# https://github.com/bytecodealliance/wasmtime/tree/v0.25.0/crates/c-api
1146-
version = "c9d31284651b975f05ac27cee0bab1377560b87e",
1147-
sha256 = "c774044f51431429e878bd1b9e2a4e38932f861f9211df72f75e9427eb6b8d32",
1148-
strip_prefix = "wasm-c-api-{version}",
1149-
urls = ["https://github.com/WebAssembly/wasm-c-api/archive/{version}.tar.gz"],
1150-
release_date = "2021-01-11",
1151-
use_category = ["dataplane_ext"],
1152-
extensions = ["envoy.wasm.runtime.wasmtime"],
1153-
cpe = "N/A",
1154-
license = "Apache-2.0",
1155-
license_url = "https://github.com/WebAssembly/wasm-c-api/blob/{version}/LICENSE",
1156-
),
1157-
io_opencensus_cpp = dict(
1158-
project_name = "OpenCensus C++",
1159-
project_desc = "OpenCensus tracing library",
1160-
project_url = "https://github.com/census-instrumentation/opencensus-cpp",
1161-
version = "f68a2d0ea43eb61a4b7889f09987294c4f94d436",
1162-
sha256 = "b5fd69da558d08480e254c7e2a91e23a88ec8b72d9aec1a6c2329d7560a61744",
1163-
strip_prefix = "opencensus-cpp-{version}",
1164-
urls = ["https://github.com/census-instrumentation/opencensus-cpp/archive/{version}.tar.gz"],
1165-
use_category = ["observability_ext"],
1166-
extensions = ["envoy.tracers.opencensus"],
1167-
release_date = "2022-09-20",
1168-
cpe = "N/A",
1169-
license = "Apache-2.0",
1170-
license_url = "https://github.com/census-instrumentation/opencensus-cpp/blob/{version}/LICENSE",
1171-
),
11721140
# Curl usage is under deprecation and will be removed by Q3 2024 before v1.31 release in July-2024.
11731141
# See https://github.com/envoyproxy/envoy/issues/11816 & https://github.com/envoyproxy/envoy/pull/30731.
11741142
com_github_curl = dict(
@@ -1444,8 +1412,8 @@ REPOSITORY_LOCATIONS_SPEC = dict(
14441412
project_name = "WebAssembly for Proxies (C++ host implementation)",
14451413
project_desc = "WebAssembly for Proxies (C++ host implementation)",
14461414
project_url = "https://github.com/proxy-wasm/proxy-wasm-cpp-host",
1447-
version = "f199214a43337e115469d9f0dd6b77858746441b",
1448-
sha256 = "b06f193324650f80d1d5494046c45941884f4eb66025cff026edf3b506596150",
1415+
version = "c4d7bb0fda912e24c64daf2aa749ec54cec99412",
1416+
sha256 = "3ea005e85d2b37685149c794c6876fd6de7f632f0ad49dc2b3cd580e7e7a5525",
14491417
strip_prefix = "proxy-wasm-cpp-host-{version}",
14501418
urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-host/archive/{version}.tar.gz"],
14511419
use_category = ["dataplane_ext"],
@@ -1460,7 +1428,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
14601428
"envoy.wasm.runtime.wamr",
14611429
"envoy.wasm.runtime.wasmtime",
14621430
],
1463-
release_date = "2024-08-19",
1431+
release_date = "2024-12-19",
14641432
cpe = "N/A",
14651433
license = "Apache-2.0",
14661434
license_url = "https://github.com/proxy-wasm/proxy-wasm-cpp-host/blob/{version}/LICENSE",

changelogs/current.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,8 @@ removed_config_or_runtime:
1313
# *Normally occurs at the end of the* :ref:`deprecation period <deprecated>`
1414

1515
new_features:
16+
- area: wasm
17+
change: |
18+
Added support for wasm plugins written in Go with the github.com/proxy-wasm/proxy-wasm-go-sdk and compiled with Go v1.24+.
1619
1720
deprecated:

0 commit comments

Comments
 (0)