Updates Envoy

Signed-off-by: Takeshi Yoneda <t.y.mathetake@gmail.com>

Author: mathetake

Dockerfile

@@ -28,7 +28,7 @@ RUN cp /build/target/aarch64-unknown-linux-gnu/debug/librust_module.so /build/ar
 RUN cp /build/target/x86_64-unknown-linux-gnu/debug/librust_module.so /build/amd64_librust_module.so
 
 # Finally, copy the built library to the final image.
-FROM envoyproxy/envoy-dev:726958228dc292f65b5acde26162a3645a99b067 AS envoy
+FROM envoyproxy/envoy-dev:9e1c1fc7e824ebf7ca8aef77377b1f9de854b2b2 AS envoy
 ARG TARGETARCH
 ENV ENVOY_DYNAMIC_MODULES_SEARCH_PATH=/usr/local/lib
 COPY --from=rust_builder /build/${TARGETARCH}_librust_module.so /usr/local/lib/librust_module.so

ENVOY_VERSION

@@ -1 +1 @@
-726958228dc292f65b5acde26162a3645a99b067
+9e1c1fc7e824ebf7ca8aef77377b1f9de854b2b2

README.md

@@ -1,6 +1,6 @@
 # Dynamic Modules Examples
 
-> Envoy Version: [726958228dc292f65b5acde26162a3645a99b067]
+> Envoy Version: [9e1c1fc7e824ebf7ca8aef77377b1f9de854b2b2]
 
 This repository hosts examples of dynamic modules for [Envoy] to extend its functionality.
 The high level documentation is available [here][High Level Doc]. In short, a dynamic module is a shared library
@@ -79,6 +79,6 @@ NEW_VERSION=4a113b5118003682833ba612202eb68628861ac6 # Whatever the commit in en
 grep -rlF "${CURRENT_VERSION}" . | xargs sed -i "s/${CURRENT_VERSION}/${NEW_VERSION}/g"
 ```
 
-[726958228dc292f65b5acde26162a3645a99b067]: https://github.com/envoyproxy/envoy/tree/726958228dc292f65b5acde26162a3645a99b067
+[9e1c1fc7e824ebf7ca8aef77377b1f9de854b2b2]: https://github.com/envoyproxy/envoy/tree/9e1c1fc7e824ebf7ca8aef77377b1f9de854b2b2
 [Envoy]: https://github.com/envoyproxy/envoy
 [High Level Doc]: https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/advanced/dynamic_modules

integration/envoy.yaml

@@ -35,25 +35,29 @@ static_resources:
                       dynamic_module_config:
                         name: rust_module
                       filter_name: access_logger
-                      filter_config: |
-                        {
-                          "num_workers": 2,
-                          "dirname": "./access_logs"
-                        }
+                      filter_config:
+                        "@type": "type.googleapis.com/google.protobuf.StringValue"
+                        value: |
+                          {
+                            "num_workers": 2,
+                            "dirname": "./access_logs"
+                          }
                   - name: dynamic_modules/header_mutation
                     typed_config:
                       # https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/dynamic_modules/v3/dynamic_modules.proto#envoy-v3-api-msg-extensions-dynamic-modules-v3-dynamicmoduleconfig
                       "@type": type.googleapis.com/envoy.extensions.filters.http.dynamic_modules.v3.DynamicModuleFilter
                       dynamic_module_config:
                         name: rust_module
                       filter_name: header_mutation
-                      filter_config: |
-                        {
-                          "request_headers": [["X-Envoy-Header", "envoy-header"], ["X-Envoy-Header2", "envoy-header2"]],
-                          "remove_request_headers": ["apple"],
-                          "response_headers": [["Foo", "bar"], ["Foo2", "bar2"]],
-                          "remove_response_headers": ["Access-Control-Allow-Credentials"]
-                        }
+                      filter_config:
+                        "@type": "type.googleapis.com/google.protobuf.StringValue"
+                        value: |
+                          {
+                            "request_headers": [["X-Envoy-Header", "envoy-header"], ["X-Envoy-Header2", "envoy-header2"]],
+                            "remove_request_headers": ["apple"],
+                            "response_headers": [["Foo", "bar"], ["Foo2", "bar2"]],
+                            "remove_response_headers": ["Access-Control-Allow-Credentials"]
+                          }
                   - name: envoy.filters.http.router
                     typed_config:
                       "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
@@ -117,8 +121,10 @@ static_resources:
                       dynamic_module_config:
                         name: rust_module
                       filter_name: zero_copy_regex_waf
-                      # Reject requests with curl or wget in the body.
-                      filter_config: "^.*(curl|wget).*"
+                      filter_config:
+                        "@type": "type.googleapis.com/google.protobuf.StringValue"
+                        # Reject requests with curl or wget in the body.
+                        value: "^.*(curl|wget).*"
                   - name: envoy.filters.http.router
                     typed_config:
                       "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router

rust/Cargo.lock

@@ -8,7 +8,7 @@ repository = "https://github.com/envoyproxy/dynamic-modules-example"
 
 [dependencies]
 # The SDK version must match the Envoy version due to the strict compatibility requirements.
-envoy-proxy-dynamic-modules-rust-sdk = { git = "https://github.com/envoyproxy/envoy", rev = "726958228dc292f65b5acde26162a3645a99b067" }
+envoy-proxy-dynamic-modules-rust-sdk = { git = "https://github.com/envoyproxy/envoy", rev = "9e1c1fc7e824ebf7ca8aef77377b1f9de854b2b2" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 rand = "0.9.0"

rust/Cargo.toml

@@ -31,8 +31,9 @@ fn init() -> bool {
 fn new_http_filter_config_fn<EC: EnvoyHttpFilterConfig, EHF: EnvoyHttpFilter>(
     _envoy_filter_config: &mut EC,
     filter_name: &str,
-    filter_config: &str,
+    filter_config: &[u8],
 ) -> Option<Box<dyn HttpFilterConfig<EC, EHF>>> {
+    let filter_config = std::str::from_utf8(filter_config).unwrap();
     match filter_name {
         "passthrough" => Some(Box::new(http_passthrough::FilterConfig::new(filter_config))),
         "access_logger" => http_access_logger::FilterConfig::new(filter_config)