Fixes

Signed-off-by: Rohit Agrawal <[email protected]>

Author: agrawroh

source/extensions/dynamic_modules/abi_version.h

@@ -1,24 +1,14 @@
 #pragma once
-
 #ifdef __cplusplus
-extern "C" {
+namespace Envoy {
+namespace Extensions {
+namespace DynamicModules {
 #endif
-
 // This is the ABI version calculated as a sha256 hash of the ABI header files. When the ABI
 // changes, this value must change, and the correctness of this value is checked by the test.
 const char* kAbiVersion = "671102aad648320f21c53d1c04aa9780d1d2668e3e63e8a993d30a9029a168e4";
 
 #ifdef __cplusplus
-} // extern "C"
-
-namespace Envoy {
-namespace Extensions {
-namespace DynamicModules {
-namespace AbiVersion {
-// For C++ code, also provide the version in the namespace.
-constexpr const char kAbiVersion[] =
-    "671102aad648320f21c53d1c04aa9780d1d2668e3e63e8a993d30a9029a168e4";
-} // namespace AbiVersion
 } // namespace DynamicModules
 } // namespace Extensions
 } // namespace Envoy

source/extensions/dynamic_modules/dynamic_modules.cc

@@ -65,9 +65,9 @@ newDynamicModule(const std::filesystem::path& object_file_absolute_path, const b
         absl::StrCat("Failed to initialize dynamic module: ", object_file_absolute_path.c_str()));
   }
   // Checks the kAbiVersion and the version of the dynamic module.
-  if (absl::string_view(abi_version) != absl::string_view(AbiVersion::kAbiVersion)) {
-    return absl::InvalidArgumentError(absl::StrCat("ABI version mismatch: got ", abi_version,
-                                                   ", but expected ", AbiVersion::kAbiVersion));
+  if (absl::string_view(abi_version) != absl::string_view(kAbiVersion)) {
+    return absl::InvalidArgumentError(
+        absl::StrCat("ABI version mismatch: got ", abi_version, ", but expected ", kAbiVersion));
   }
   return dynamic_module;
 }

source/extensions/dynamic_modules/sdk/rust/build.rs

@@ -18,6 +18,7 @@ fn main() {
   println!("cargo:rerun-if-changed=abi.h");
   let bindings = bindgen::Builder::default()
     .header("../../abi.h")
+    .header("../../abi_version.h")
     .clang_arg("-v")
     .default_enum_style(bindgen::EnumVariation::Rust {
       non_exhaustive: false,

source/extensions/dynamic_modules/sdk/rust/src/lib.rs

@@ -21,11 +21,6 @@ use std::sync::OnceLock;
 /// This is not meant to be used directly.
 pub mod abi {
   include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
-
-  /// ABI version string. This must match the kAbiVersion in abi_version.h.
-  /// The version is the SHA256 hash of the abi.h file.
-  pub const kAbiVersion: &[u8] =
-    b"671102aad648320f21c53d1c04aa9780d1d2668e3e63e8a993d30a9029a168e4\0";
 }
 
 /// Declare the init functions for the dynamic module.

test/coverage.yaml

@@ -40,6 +40,7 @@ directories:
   source/extensions/filters/common/lua: 95.6
   source/extensions/filters/http/cache: 95.9
   source/extensions/filters/http/dynamic_forward_proxy: 94.8
+  source/extensions/filters/http/dynamic_modules: 95.6
   source/extensions/filters/http/decompressor: 95.9
   source/extensions/filters/http/ext_proc: 96.4  # might be flaky: be careful adjusting
   source/extensions/filters/http/grpc_json_reverse_transcoder: 94.8

test/extensions/dynamic_modules/http/abi_impl_test.cc

@@ -713,7 +713,7 @@ TEST_P(DynamicModulesTerminalIntegrationTest, StreamingTerminalFilter) {
   EXPECT_EQ(below_watermark_count, 8);
 }
 
-// Test basic HTTP stream callout - GET request with streaming response.
+// Test basic HTTP stream callout. A GET request with streaming response.
 TEST_P(DynamicModulesIntegrationTest, HttpStreamBasic) {
   initializeFilter("http_stream_basic", "cluster_0");
   codec_client_ = makeHttpConnection(makeClientConnection((lookupPort("http"))));
@@ -738,7 +738,7 @@ TEST_P(DynamicModulesIntegrationTest, HttpStreamBasic) {
       response->headers().get(Http::LowerCaseString("x-stream-test"))[0]->value().getStringView());
 }
 
-// Test bidirectional HTTP stream callout - POST with streaming request and response.
+// Test bidirectional HTTP stream callout. A POST request with streaming request and response.
 TEST_P(DynamicModulesIntegrationTest, HttpStreamBidirectional) {
   initializeFilter("http_stream_bidirectional", "cluster_0");
   codec_client_ = makeHttpConnection(makeClientConnection((lookupPort("http"))));

test/extensions/dynamic_modules/http/integration_test.cc

@@ -1205,7 +1205,7 @@ impl StreamingTerminalHttpFilter {
 // HTTP Stream Callouts Tests
 // =============================================================================
 
-// Basic HTTP Stream Test - simple GET request with streaming response.
+// Basic HTTP Stream Test. A simple GET request with streaming response.
 struct HttpStreamBasicConfig {
   cluster_name: String,
 }
@@ -1320,7 +1320,7 @@ impl Drop for HttpStreamBasicFilter {
   }
 }
 
-// Bidirectional HTTP Stream Test - POST with streaming request and response.
+// Bidirectional HTTP Stream Test. A POST request with streaming request and response.
 struct HttpStreamBidirectionalConfig {
   cluster_name: String,
 }