diff --git a/source/extensions/common/wasm/BUILD b/source/extensions/common/wasm/BUILD index 08d456d74ad41..37182ea34ebef 100644 --- a/source/extensions/common/wasm/BUILD +++ b/source/extensions/common/wasm/BUILD @@ -8,14 +8,6 @@ licenses(["notice"]) # Apache 2 envoy_extension_package() -envoy_cc_library( - name = "well_known_names", - hdrs = ["well_known_names.h"], - deps = [ - "//source/common/singleton:const_singleton", - ], -) - envoy_cc_library( name = "wasm_runtime_factory_interface", hdrs = [ @@ -38,7 +30,6 @@ envoy_cc_library( ], visibility = ["//visibility:public"], deps = [ - ":well_known_names", "//include/envoy/http:codes_interface", "//include/envoy/http:filter_interface", "//include/envoy/server:lifecycle_notifier_interface", @@ -51,7 +42,6 @@ envoy_cc_library( "//source/common/version:version_includes", "//source/extensions/filters/common/expr:cel_state_lib", "//source/extensions/filters/common/expr:evaluator_lib", - "//source/extensions/filters/http:well_known_names", "@com_google_cel_cpp//eval/public:activation", "@envoy_api//envoy/extensions/wasm/v3:pkg_cc_proto", "@proxy_wasm_cpp_host//:include", diff --git a/source/extensions/common/wasm/context.cc b/source/extensions/common/wasm/context.cc index 2f42f921fdd47..c44a66f226f29 100644 --- a/source/extensions/common/wasm/context.cc +++ b/source/extensions/common/wasm/context.cc @@ -28,7 +28,6 @@ #include "extensions/common/wasm/plugin.h" #include "extensions/common/wasm/wasm.h" -#include "extensions/common/wasm/well_known_names.h" #include "extensions/filters/common/expr/context.h" #include "absl/base/casts.h" diff --git a/source/extensions/common/wasm/plugin.cc b/source/extensions/common/wasm/plugin.cc index b01ac0324f53f..fe773a3b1e100 100644 --- a/source/extensions/common/wasm/plugin.cc +++ b/source/extensions/common/wasm/plugin.cc @@ -2,8 +2,6 @@ #include "envoy/common/exception.h" -#include "extensions/common/wasm/well_known_names.h" - #include "include/proxy-wasm/wasm.h" namespace Envoy { @@ -24,8 +22,7 @@ WasmConfig::WasmConfig(const envoy::extensions::wasm::v3::PluginConfig& config) // since it directly accesses Envoy's env vars and we should not modify Envoy's env vars here. // TODO(mathetake): Once proxy_get_map_values(type::EnvironmentVariables, ..) call is supported, // then remove this restriction. - if (config.vm_config().runtime() == WasmRuntimeNames::get().Null && - !envs.key_values().empty()) { + if (config.vm_config().runtime() == "envoy.wasm.runtime.null" && !envs.key_values().empty()) { throw EnvoyException("envoy.extensions.wasm.v3.VmConfig.EnvironmentVariables.key_values must " "not be set for NullVm."); } diff --git a/source/extensions/common/wasm/wasm.h b/source/extensions/common/wasm/wasm.h index a02c1b4c627c2..a44da29e56492 100644 --- a/source/extensions/common/wasm/wasm.h +++ b/source/extensions/common/wasm/wasm.h @@ -24,7 +24,6 @@ #include "extensions/common/wasm/plugin.h" #include "extensions/common/wasm/wasm_extension.h" #include "extensions/common/wasm/wasm_vm.h" -#include "extensions/common/wasm/well_known_names.h" #include "include/proxy-wasm/exports.h" #include "include/proxy-wasm/wasm.h" diff --git a/source/extensions/common/wasm/wasm_vm.cc b/source/extensions/common/wasm/wasm_vm.cc index c8d3fb618e45e..ca6538de5cf8b 100644 --- a/source/extensions/common/wasm/wasm_vm.cc +++ b/source/extensions/common/wasm/wasm_vm.cc @@ -7,7 +7,6 @@ #include "extensions/common/wasm/ext/envoy_null_vm_wasm_api.h" #include "extensions/common/wasm/wasm_extension.h" #include "extensions/common/wasm/wasm_runtime_factory.h" -#include "extensions/common/wasm/well_known_names.h" #include "include/proxy-wasm/null_plugin.h" diff --git a/source/extensions/common/wasm/well_known_names.h b/source/extensions/common/wasm/well_known_names.h deleted file mode 100644 index 3904868bba880..0000000000000 --- a/source/extensions/common/wasm/well_known_names.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once - -#include - -#include "common/singleton/const_singleton.h" - -namespace Envoy { -namespace Extensions { -namespace Common { -namespace Wasm { - -/** - * Well-known wasm runtime names. - * NOTE: New wasm runtimes should use the well known name: envoy.wasm.runtime.name. - */ -class WasmRuntimeValues { -public: - // Wasmtime (https://github.com/bytecodealliance/wasmtime). - const std::string Wasmtime = "envoy.wasm.runtime.wasmtime"; - // WAVM (https://github.com/WAVM/WAVM) Wasm VM. - const std::string Wavm = "envoy.wasm.runtime.wavm"; - // Null sandbox: modules must be compiled into envoy and registered name is given in the - // DataSource.inline_string. - const std::string Null = "envoy.wasm.runtime.null"; - // V8-based (https://v8.dev) WebAssembly runtime. - const std::string V8 = "envoy.wasm.runtime.v8"; - - // Filter state name - const std::string FilterState = "envoy.wasm"; -}; - -using WasmRuntimeNames = ConstSingleton; - -} // namespace Wasm -} // namespace Common -} // namespace Extensions -} // namespace Envoy diff --git a/test/extensions/access_loggers/wasm/test_data/BUILD b/test/extensions/access_loggers/wasm/test_data/BUILD index f49006867f2f7..ca3e8f847472c 100644 --- a/test/extensions/access_loggers/wasm/test_data/BUILD +++ b/test/extensions/access_loggers/wasm/test_data/BUILD @@ -22,7 +22,6 @@ envoy_cc_library( "//source/common/common:c_smart_ptr_lib", "//source/extensions/common/wasm:wasm_hdr", "//source/extensions/common/wasm:wasm_lib", - "//source/extensions/common/wasm:well_known_names", ], ) diff --git a/test/extensions/bootstrap/wasm/test_data/BUILD b/test/extensions/bootstrap/wasm/test_data/BUILD index 7256f0e7f0dec..ba016610e703e 100644 --- a/test/extensions/bootstrap/wasm/test_data/BUILD +++ b/test/extensions/bootstrap/wasm/test_data/BUILD @@ -31,7 +31,6 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/common:c_smart_ptr_lib", "//source/extensions/common/wasm:wasm_lib", - "//source/extensions/common/wasm:well_known_names", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -49,7 +48,6 @@ envoy_cc_library( "//source/common/common:c_smart_ptr_lib", "//source/extensions/common/wasm:wasm_hdr", "//source/extensions/common/wasm:wasm_lib", - "//source/extensions/common/wasm:well_known_names", ], ) @@ -66,7 +64,6 @@ envoy_cc_library( "//source/common/common:c_smart_ptr_lib", "//source/extensions/common/wasm:wasm_hdr", "//source/extensions/common/wasm:wasm_lib", - "//source/extensions/common/wasm:well_known_names", ], ) diff --git a/test/extensions/common/wasm/plugin_test.cc b/test/extensions/common/wasm/plugin_test.cc index 47c72822de1a5..2b219066935f0 100644 --- a/test/extensions/common/wasm/plugin_test.cc +++ b/test/extensions/common/wasm/plugin_test.cc @@ -3,7 +3,6 @@ #include "envoy/common/exception.h" #include "extensions/common/wasm/plugin.h" -#include "extensions/common/wasm/well_known_names.h" #include "test/test_common/environment.h" #include "test/test_common/utility.h" @@ -74,7 +73,7 @@ TEST(TestWasmConfig, EnvKeyException) { TEST(TestWasmConfig, NullVMEnv) { envoy::extensions::wasm::v3::PluginConfig plugin_config; - plugin_config.mutable_vm_config()->set_runtime(WasmRuntimeNames::get().Null); + plugin_config.mutable_vm_config()->set_runtime("envoy.wasm.runtime.null"); (*plugin_config.mutable_vm_config() ->mutable_environment_variables() ->mutable_key_values())["key"] = "value"; diff --git a/test/extensions/common/wasm/test_data/BUILD b/test/extensions/common/wasm/test_data/BUILD index 9160fe94f739f..95db303869db9 100644 --- a/test/extensions/common/wasm/test_data/BUILD +++ b/test/extensions/common/wasm/test_data/BUILD @@ -28,7 +28,6 @@ envoy_cc_library( "//source/common/common:c_smart_ptr_lib", "//source/extensions/common/wasm:wasm_hdr", "//source/extensions/common/wasm:wasm_lib", - "//source/extensions/common/wasm:well_known_names", ], ) @@ -45,7 +44,6 @@ envoy_cc_library( "//source/common/common:c_smart_ptr_lib", "//source/extensions/common/wasm:wasm_hdr", "//source/extensions/common/wasm:wasm_lib", - "//source/extensions/common/wasm:well_known_names", "//source/extensions/common/wasm/ext:envoy_null_plugin", ], ) @@ -63,7 +61,6 @@ envoy_cc_library( "//source/common/common:c_smart_ptr_lib", "//source/extensions/common/wasm:wasm_hdr", "//source/extensions/common/wasm:wasm_lib", - "//source/extensions/common/wasm:well_known_names", "//source/extensions/common/wasm/ext:envoy_null_plugin", ], ) diff --git a/test/extensions/filters/http/wasm/test_data/BUILD b/test/extensions/filters/http/wasm/test_data/BUILD index 0501db42c10b3..abee6c6247985 100644 --- a/test/extensions/filters/http/wasm/test_data/BUILD +++ b/test/extensions/filters/http/wasm/test_data/BUILD @@ -106,7 +106,6 @@ envoy_cc_library( "//source/common/common:c_smart_ptr_lib", "//source/extensions/common/wasm:wasm_hdr", "//source/extensions/common/wasm:wasm_lib", - "//source/extensions/common/wasm:well_known_names", "//source/extensions/common/wasm/ext:envoy_null_plugin", "@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 02fbb6028c224..fa78e6e3ce841 100644 --- a/test/extensions/filters/network/wasm/test_data/BUILD +++ b/test/extensions/filters/network/wasm/test_data/BUILD @@ -42,7 +42,6 @@ envoy_cc_library( "//source/common/common:c_smart_ptr_lib", "//source/extensions/common/wasm:wasm_hdr", "//source/extensions/common/wasm:wasm_lib", - "//source/extensions/common/wasm:well_known_names", ], ) diff --git a/test/extensions/stats_sinks/wasm/test_data/BUILD b/test/extensions/stats_sinks/wasm/test_data/BUILD index d3458434aec87..f2dca30447bc7 100644 --- a/test/extensions/stats_sinks/wasm/test_data/BUILD +++ b/test/extensions/stats_sinks/wasm/test_data/BUILD @@ -19,7 +19,6 @@ envoy_cc_library( deps = [ "//source/extensions/common/wasm:wasm_hdr", "//source/extensions/common/wasm:wasm_lib", - "//source/extensions/common/wasm:well_known_names", "//source/extensions/common/wasm/ext:envoy_null_plugin", ], )