bump envoy sha to incorporate new abi

Signed-off-by: William Zhang <[email protected]>

Author: wtzhang23

Dockerfile

@@ -46,7 +46,7 @@ RUN CC="zig cc -target aarch64-linux-gnu" CXX="zig c++ -target aarch64-linux-gnu
 RUN CC="zig cc -target x86_64-linux-gnu" CXX="zig c++ -target x86_64-linux-gnu" CGO_ENABLED=1 GOARCH=amd64 go build -buildmode=c-shared -o /build/amd64_libgo_module.so .
 
 ##### Build the final image #####
-FROM envoyproxy/envoy-dev:af61c6b2101e8c70281b661d2bd726115ae1da2d AS envoy
+FROM envoyproxy/envoy:dev-cae01e7e963f06a77cab20d0ad4b57e6741c0c75 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 @@
-af61c6b2101e8c70281b661d2bd726115ae1da2d
+cae01e7e963f06a77cab20d0ad4b57e6741c0c75

go/gosdk/abi.go

@@ -161,8 +161,8 @@ import (
 	"unsafe"
 )
 
-// https://github.com/envoyproxy/envoy/blob/af61c6b2101e8c70281b661d2bd726115ae1da2d/source/extensions/dynamic_modules/abi_version.h
-var version = append([]byte("c32cc7696650a6a54653327e6609734a8b32aeb5c80a6a664687636a0d671666"), 0)
+// https://github.com/envoyproxy/envoy/blob/cae01e7e963f06a77cab20d0ad4b57e6741c0c75/source/extensions/dynamic_modules/abi_version.h
+var version = append([]byte("f2712929b605772d35c34d9ac8ccd7e168197a50951e9c96b64e03256bf80265"), 0)
 
 //export envoy_dynamic_module_on_program_init
 func envoy_dynamic_module_on_program_init() uintptr {

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 = "af61c6b2101e8c70281b661d2bd726115ae1da2d" }
+envoy-proxy-dynamic-modules-rust-sdk = { git = "https://github.com/envoyproxy/envoy", rev = "cae01e7e963f06a77cab20d0ad4b57e6741c0c75" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 rand = "0.9.0"

rust/Cargo.toml

@@ -75,9 +75,9 @@ impl FilterConfig {
     }
 }
 
-impl<EC: EnvoyHttpFilterConfig, EHF: EnvoyHttpFilter> HttpFilterConfig<EC, EHF> for FilterConfig {
+impl<EHF: EnvoyHttpFilter> HttpFilterConfig<EHF> for FilterConfig {
     /// This is called for each new HTTP filter.
-    fn new_http_filter(&mut self, _envoy: &mut EC) -> Box<dyn HttpFilter<EHF>> {
+    fn new_http_filter(&mut self, _envoy: &mut EHF) -> Box<dyn HttpFilter<EHF>> {
         let tx = self.tx.clone();
         Box::new(Filter {
             tx,

rust/src/http_access_logger.rs

@@ -29,9 +29,9 @@ impl FilterConfig {
     }
 }
 
-impl<EC: EnvoyHttpFilterConfig, EHF: EnvoyHttpFilter> HttpFilterConfig<EC, EHF> for FilterConfig {
+impl<EHF: EnvoyHttpFilter> HttpFilterConfig<EHF> for FilterConfig {
     /// This is called for each new HTTP filter.
-    fn new_http_filter(&mut self, _envoy: &mut EC) -> Box<dyn HttpFilter<EHF>> {
+    fn new_http_filter(&mut self, _envoy: &mut EHF) -> Box<dyn HttpFilter<EHF>> {
         Box::new(Filter {
             request_headers: self.request_headers.clone(),
             remove_request_headers: self.remove_request_headers.clone(),

rust/src/http_header_mutation.rs

@@ -19,9 +19,9 @@ impl FilterConfig {
     }
 }
 
-impl<EC: EnvoyHttpFilterConfig, EHF: EnvoyHttpFilter> HttpFilterConfig<EC, EHF> for FilterConfig {
+impl<EHF: EnvoyHttpFilter> HttpFilterConfig<EHF> for FilterConfig {
     /// This is called for each new HTTP filter.
-    fn new_http_filter(&mut self, _envoy: &mut EC) -> Box<dyn HttpFilter<EHF>> {
+    fn new_http_filter(&mut self, _envoy: &mut EHF) -> Box<dyn HttpFilter<EHF>> {
         Box::new(Filter {})
     }
 }

rust/src/http_passthrough.rs

@@ -16,9 +16,9 @@ impl FilterConfig {
     }
 }
 
-impl<EC: EnvoyHttpFilterConfig, EHF: EnvoyHttpFilter> HttpFilterConfig<EC, EHF> for FilterConfig {
+impl<EHF: EnvoyHttpFilter> HttpFilterConfig<EHF> for FilterConfig {
     /// This is called for each new HTTP filter.
-    fn new_http_filter(&mut self, _envoy: &mut EC) -> Box<dyn HttpFilter<EHF>> {
+    fn new_http_filter(&mut self, _envoy: &mut EHF) -> Box<dyn HttpFilter<EHF>> {
         Box::new(Filter {})
     }
 }

rust/src/http_random_auth.rs

@@ -28,9 +28,9 @@ impl FilterConfig {
     }
 }
 
-impl<EC: EnvoyHttpFilterConfig, EHF: EnvoyHttpFilter> HttpFilterConfig<EC, EHF> for FilterConfig {
+impl<EHF: EnvoyHttpFilter> HttpFilterConfig<EHF> for FilterConfig {
     /// This is called for each new HTTP filter.
-    fn new_http_filter(&mut self, _envoy: &mut EC) -> Box<dyn HttpFilter<EHF>> {
+    fn new_http_filter(&mut self, _envoy: &mut EHF) -> Box<dyn HttpFilter<EHF>> {
         Box::new(Filter {
             re: self.re.clone(),
         })
@@ -121,19 +121,19 @@ impl std::io::Read for BodyReader<'_> {
 
 #[cfg(test)]
 mod tests {
+    use std::f64::consts::E;
+
+    use envoy_proxy_dynamic_modules_rust_sdk::abi::envoy_dynamic_module_type_metrics_result;
+
     use super::*;
 
     #[test]
     /// This demonstrates how to write a test without Envoy using a mock provided by the SDK.
     fn test_filter() {
-        struct EnvoyConfig {}
-        impl EnvoyHttpFilterConfig for EnvoyConfig {}
-        let mut envoy_config = EnvoyConfig {};
         let mut filter_config = FilterConfig::new("Hello [Ww].+").unwrap();
-        let mut filter: Box<dyn HttpFilter<MockEnvoyHttpFilter>> =
-            filter_config.new_http_filter(&mut envoy_config);
-
         let mut envoy_filter = MockEnvoyHttpFilter::new();
+        let mut filter: Box<dyn HttpFilter<MockEnvoyHttpFilter>> =
+            filter_config.new_http_filter(&mut envoy_filter);
 
         // Not end of stream, so we should buffer the request body.
         assert_eq!(filter.on_request_body(&mut envoy_filter, false),  abi::envoy_dynamic_module_type_on_http_filter_request_body_status::StopIterationAndBuffer);