bump proxy-wasm

Signed-off-by: zirain <[email protected]>
istio-ecosystem · Nov 22, 2023 · d768c23 · d768c23
1 parent 4659c38
commit d768c23
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 37 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -35,9 +35,10 @@ load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
 
 rules_pkg_dependencies()
 
-PROXY_WASM_CPP_SDK_SHA = "fd0be8405db25de0264bdb78fae3a82668c03782"
+# proxy wasm cpp sdk
+PROXY_WASM_CPP_SDK_SHA = "95bb82ce45c41d9100fd1ec15d2ffc67f7f3ceee"
 
-PROXY_WASM_CPP_SDK_SHA256 = "c57de2425b5c61d7f630c5061e319b4557ae1f1c7526e5a51c33dc1299471b08"
+PROXY_WASM_CPP_SDK_SHA256 = "89792fc1abca331f29f99870476a04146de5e82ff903bdffca90e6729c1f2470"
 
 http_archive(
     name = "proxy_wasm_cpp_sdk",
@@ -46,13 +47,17 @@ http_archive(
     url = "https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/" + PROXY_WASM_CPP_SDK_SHA + ".tar.gz",
 )
 
-load("@proxy_wasm_cpp_sdk//bazel/dep:deps.bzl", "wasm_dependencies")
+load("@proxy_wasm_cpp_sdk//bazel:repositories.bzl", "proxy_wasm_cpp_sdk_repositories")
 
-wasm_dependencies()
+proxy_wasm_cpp_sdk_repositories()
 
-load("@proxy_wasm_cpp_sdk//bazel/dep:deps_extra.bzl", "wasm_dependencies_extra")
+load("@proxy_wasm_cpp_sdk//bazel:dependencies.bzl", "proxy_wasm_cpp_sdk_dependencies")
 
-wasm_dependencies_extra()
+proxy_wasm_cpp_sdk_dependencies()
+
+load("@proxy_wasm_cpp_sdk//bazel:dependencies_extra.bzl", "proxy_wasm_cpp_sdk_dependencies_extra")
+
+proxy_wasm_cpp_sdk_dependencies_extra()
 
 
 load("@istio_ecosystem_wasm_extensions//bazel:wasm.bzl", "wasm_libraries")

diff --git a/bazel/wasm.bzl b/bazel/wasm.bzl
@@ -44,8 +44,8 @@ def wasm_libraries():
         urls = ["https://github.com/google/googletest/archive/" + GOOGLE_TEST_VERSION + ".tar.gz"],
     )
 
-    PROXY_WASM_CPP_HOST_SHA = "f38347360feaaf5b2a733f219c4d8c9660d626f0"
-    PROXY_WASM_CPP_HOST_SHA256 = "bf10de946eb5785813895c2bf16504afc0cd590b9655d9ee52fb1074d0825ea3"
+    PROXY_WASM_CPP_HOST_SHA = "5d76116c449d6892b298b7ae79a84ef1cf5752bf"
+    PROXY_WASM_CPP_HOST_SHA256 = "a5825a1a5bbd5b0178c6189b227d5cf4370ac713a883b41f6a54edd768a03cb7"
 
     http_archive(
         name = "proxy_wasm_cpp_host",

diff --git a/doc/write-cpp-unit-test.md b/doc/write-cpp-unit-test.md
@@ -86,7 +86,7 @@ cc_library(
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",
         "//extensions/common/wasm:json_util",
-        "@proxy_wasm_cpp_host//:lib",
+        "@proxy_wasm_cpp_host//:null_lib",
     ],
 )
 ```

diff --git a/example/BUILD b/example/BUILD
@@ -1,12 +1,9 @@
-load("@proxy_wasm_cpp_sdk//bazel/wasm:wasm.bzl", "wasm_cc_binary")
+load("@proxy_wasm_cpp_sdk//bazel:defs.bzl", "proxy_wasm_cc_binary")
 
-wasm_cc_binary(
+proxy_wasm_cc_binary(
     name = "example.wasm",
     srcs = [
         "plugin.cc",
         "plugin.h",
     ],
-    deps = [
-        "@proxy_wasm_cpp_sdk//:proxy_wasm_intrinsics",
-    ],
 )
diff --git a/extensions/attributegen/BUILD b/extensions/attributegen/BUILD
@@ -17,9 +17,9 @@
 
 licenses(["notice"])  # Apache 2
 
-load("@proxy_wasm_cpp_sdk//bazel/wasm:wasm.bzl", "wasm_cc_binary")
+load("@proxy_wasm_cpp_sdk//bazel:defs.bzl", "proxy_wasm_cc_binary")
 
-wasm_cc_binary(
+proxy_wasm_cc_binary(
     name = "attributegen.wasm",
     srcs = [
         "plugin.cc",
@@ -37,7 +37,6 @@ wasm_cc_binary(
         "//extensions/common/wasm:json_util",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",
-        "@proxy_wasm_cpp_sdk//:proxy_wasm_intrinsics_full",
         "@proxy_wasm_cpp_sdk//contrib:contrib_lib",
         "@com_github_google_flatbuffers//:flatbuffers",
         "@com_github_google_flatbuffers//:runtime_cc",

diff --git a/extensions/basic_auth/BUILD b/extensions/basic_auth/BUILD
@@ -1,7 +1,7 @@
-load("@proxy_wasm_cpp_sdk//bazel/wasm:wasm.bzl", "wasm_cc_binary")
+load("@proxy_wasm_cpp_sdk//bazel:defs.bzl", "proxy_wasm_cc_binary")
 load("//bazel:wasm.bzl", "declare_wasm_image_targets")
 
-wasm_cc_binary(
+proxy_wasm_cc_binary(
     name = "basic_auth.wasm",
     srcs = [
         "plugin.cc",
@@ -12,7 +12,6 @@ wasm_cc_binary(
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",
         "//extensions/common/wasm:json_util",
-        "@proxy_wasm_cpp_sdk//:proxy_wasm_intrinsics",
     ],
 )
 
@@ -30,7 +29,7 @@ cc_library(
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",
         "//extensions/common/wasm:json_util",
-        "@proxy_wasm_cpp_host//:lib",
+        "@proxy_wasm_cpp_host//:null_lib",
     ],
 )
 

diff --git a/extensions/grpc_logging/BUILD b/extensions/grpc_logging/BUILD
@@ -1,7 +1,7 @@
-load("@proxy_wasm_cpp_sdk//bazel/wasm:wasm.bzl", "wasm_cc_binary")
+load("@proxy_wasm_cpp_sdk//bazel:defs.bzl", "proxy_wasm_cc_binary")
 load("//bazel:wasm.bzl", "declare_wasm_image_targets")
 
-wasm_cc_binary(
+proxy_wasm_cc_binary(
     name = "grpc_logging.wasm",
     srcs = [
         "plugin.cc",

diff --git a/extensions/local_rate_limit/BUILD b/extensions/local_rate_limit/BUILD
@@ -1,7 +1,7 @@
-load("@proxy_wasm_cpp_sdk//bazel/wasm:wasm.bzl", "wasm_cc_binary")
+load("@proxy_wasm_cpp_sdk//bazel:defs.bzl", "proxy_wasm_cc_binary")
 load("//bazel:wasm.bzl", "declare_wasm_image_targets")
 
-wasm_cc_binary(
+proxy_wasm_cc_binary(
     name = "local_rate_limit.wasm",
     srcs = [
         "bucket.cc",
@@ -12,7 +12,6 @@ wasm_cc_binary(
     deps = [
         "@com_google_absl//absl/strings",
         "//extensions/common/wasm:json_util",
-        "@proxy_wasm_cpp_sdk//:proxy_wasm_intrinsics",
     ],
 )
 

diff --git a/extensions/open_policy_agent/BUILD b/extensions/open_policy_agent/BUILD
@@ -1,7 +1,7 @@
-load("@proxy_wasm_cpp_sdk//bazel/wasm:wasm.bzl", "wasm_cc_binary")
+load("@proxy_wasm_cpp_sdk//bazel:defs.bzl", "proxy_wasm_cc_binary")
 load("//bazel:wasm.bzl", "declare_wasm_image_targets")
 
-wasm_cc_binary(
+proxy_wasm_cc_binary(
     name = "open_policy_agent.wasm",
     srcs = [
         "cache.cc",
@@ -11,7 +11,6 @@ wasm_cc_binary(
     ],
     deps = [
         "//extensions/common/wasm:json_util",
-        "@proxy_wasm_cpp_sdk//:proxy_wasm_intrinsics",
     ],
 )
 

diff --git a/extensions/scaffold/BUILD b/extensions/scaffold/BUILD
@@ -1,15 +1,12 @@
-load("@proxy_wasm_cpp_sdk//bazel/wasm:wasm.bzl", "wasm_cc_binary")
+load("@proxy_wasm_cpp_sdk//bazel:defs.bzl", "proxy_wasm_cc_binary")
 load("//bazel:wasm.bzl", "declare_wasm_image_targets")
 
-wasm_cc_binary(
+proxy_wasm_cc_binary(
     name = "scaffold.wasm",
     srcs = [
         "plugin.cc",
         "plugin.h",
     ],
-    deps = [
-        "@proxy_wasm_cpp_sdk//:proxy_wasm_intrinsics",
-    ],
 )
 
 declare_wasm_image_targets(

diff --git a/extensions/stats/BUILD b/extensions/stats/BUILD
@@ -17,9 +17,9 @@
 
 licenses(["notice"])  # Apache 2
 
-load("@proxy_wasm_cpp_sdk//bazel/wasm:wasm.bzl", "wasm_cc_binary")
+load("@proxy_wasm_cpp_sdk//bazel:defs.bzl", "proxy_wasm_cc_binary")
 
-wasm_cc_binary(
+proxy_wasm_cc_binary(
     name = "stats.wasm",
     srcs = [
         "plugin.cc",
@@ -36,7 +36,6 @@ wasm_cc_binary(
         "//extensions/common/wasm:json_util",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",
-        "@proxy_wasm_cpp_sdk//:proxy_wasm_intrinsics",
         "@proxy_wasm_cpp_sdk//contrib:contrib_lib",
         "@com_github_google_flatbuffers//:flatbuffers",
         "@com_github_google_flatbuffers//:runtime_cc",