Use proper well-known name for the HTTP filter. (envoyproxy#169)

Signed-off-by: Piotr Sikora <piotrsikora@google.com>
PiotrSikora · Aug 29, 2019 · 9049962 · 9049962
1 parent f8d987f
commit 9049962
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/examples/wasm/envoy.yaml b/examples/wasm/envoy.yaml
@@ -23,7 +23,7 @@ static_resources:
                 route: 
                   cluster: web_service
           http_filters:
-          - name: envoy.wasm
+          - name: envoy.filters.http.wasm
             config:
               vm_id: "my_vm_id"
               root_id: "my_root_id"

diff --git a/source/extensions/common/wasm/null/sample_plugin/plugin.cc b/source/extensions/common/wasm/null/sample_plugin/plugin.cc
@@ -50,10 +50,11 @@ void PluginContext::onLog() {
     logWarn("request.path: " + getSelectorExpression({"request", "path"}).value()->toString());
     logWarn("node.metadata: " +
             getSelectorExpression({"node", "metadata", "istio.io/metadata"}).value()->toString());
-    logWarn("metadata: " + getSelectorExpression({"metadata", "filter_metadata", "envoy.wasm",
-                                                  "wasm_request_get_key"})
-                               .value()
-                               ->toString());
+    logWarn("metadata: " +
+            getSelectorExpression(
+                {"metadata", "filter_metadata", "envoy.filters.http.wasm", "wasm_request_get_key"})
+                .value()
+                ->toString());
     auto responseCode = getSelectorExpression({"response", "code"}).value();
     if (responseCode->size() == sizeof(int64_t)) {
       char buf[sizeof(int64_t)];

diff --git a/source/extensions/filters/http/well_known_names.h b/source/extensions/filters/http/well_known_names.h
@@ -60,8 +60,8 @@ class HttpFilterNameValues {
   const std::string OriginalSrc = "envoy.filters.http.original_src";
   // Dynamic forward proxy filter
   const std::string DynamicForwardProxy = "envoy.filters.http.dynamic_forward_proxy";
-  // Wasm filter
-  const std::string Wasm = "envoy.wasm";
+  // WebAssembly filter
+  const std::string Wasm = "envoy.filters.http.wasm";
 
   // Converts names from v1 to v2
   const Config::V1Converter v1_converter_;

diff --git a/test/extensions/filters/http/wasm/wasm_filter_stress_test.cc b/test/extensions/filters/http/wasm/wasm_filter_stress_test.cc
@@ -71,7 +71,7 @@ TEST_P(GrpcWasmStressTest, CalloutHappyPath) {
   //
 
   config_helper_.addFilter(fmt::format(R"EOF(
-            name: envoy.wasm
+            name: envoy.filters.http.wasm
             config:
               vm_config:
                 vm: "{}"
@@ -180,7 +180,7 @@ TEST_P(GrpcWasmStressTest, CalloutErrorResponse) {
   //
 
   config_helper_.addFilter(fmt::format(R"EOF(
-            name: envoy.wasm
+            name: envoy.filters.http.wasm
             config:
               vm_config:
                 vm: "{}"
@@ -290,7 +290,7 @@ TEST_P(HttpWasmStressTest, DISABLED_CalloutHappyPath) {
   //
 
   config_helper_.addFilter(fmt::format(R"EOF(
-            name: envoy.wasm
+            name: envoy.filters.http.wasm
             config:
               vm_config:
                 vm: "{}"