Address review feedback

Signed-off-by: Ben Plotnick <[email protected]>
envoyproxy · Jan 3, 2025 · 304c395 · 304c395
1 parent 86fe96a
commit 304c395
Show file tree

Hide file tree

Showing 12 changed files with 170 additions and 272 deletions.
diff --git a/source/extensions/dynamic_modules/abi.h b/source/extensions/dynamic_modules/abi.h
@@ -142,7 +142,7 @@ typedef struct {
 } envoy_dynamic_module_type_module_http_header;
 
 /**
- * envoy_dynamic_module_type_Header represents a key-value pair of an HTTP header owned by Envoy's
+ * envoy_dynamic_module_type_http_header represents a key-value pair of an HTTP header owned by Envoy's
  * HeaderMap.
  */
 typedef struct {

diff --git a/source/extensions/dynamic_modules/abi_version.h b/source/extensions/dynamic_modules/abi_version.h
@@ -6,7 +6,7 @@ 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 = "79e2d76037150b0baac9cbe5eb374601eb8f693690e8bda8f4ef961f53128670";
+const char* kAbiVersion = "dc3088e20ee3c98235773f9b90861273c0f24a0bd39ad24bd06b44f5467c1402";
 
 #ifdef __cplusplus
 } // namespace DynamicModules

diff --git a/source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock b/source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "df4af811c1312bed44d0eefe8cad5554709cd02a56c6ddfa5cda059f79a7ac3f",
+  "checksum": "c0d467a39180d065453586687649d169eafc9222d6c3352463a214d2b1b6cf84",
   "crates": {
     "aho-corasick 1.1.3": {
       "name": "aho-corasick",
@@ -262,51 +262,6 @@
       ],
       "license_file": "LICENSE-APACHE"
     },
-    "bytes 1.9.0": {
-      "name": "bytes",
-      "version": "1.9.0",
-      "package_url": "https://github.com/tokio-rs/bytes",
-      "repository": {
-        "Http": {
-          "url": "https://static.crates.io/crates/bytes/1.9.0/download",
-          "sha256": "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
-        }
-      },
-      "targets": [
-        {
-          "Library": {
-            "crate_name": "bytes",
-            "crate_root": "src/lib.rs",
-            "srcs": {
-              "allow_empty": true,
-              "include": [
-                "**/*.rs"
-              ]
-            }
-          }
-        }
-      ],
-      "library_target_name": "bytes",
-      "common_attrs": {
-        "compile_data_glob": [
-          "**"
-        ],
-        "crate_features": {
-          "common": [
-            "default",
-            "std"
-          ],
-          "selects": {}
-        },
-        "edition": "2018",
-        "version": "1.9.0"
-      },
-      "license": "MIT",
-      "license_ids": [
-        "MIT"
-      ],
-      "license_file": "LICENSE"
-    },
     "cexpr 0.6.0": {
       "name": "cexpr",
       "version": "0.6.0",
@@ -624,10 +579,6 @@
               "id": "envoy-proxy-dynamic-modules-rust-sdk 0.1.0",
               "target": "build_script_build"
             },
-            {
-              "id": "http 1.2.0",
-              "target": "http"
-            },
             {
               "id": "mockall 0.13.1",
               "target": "mockall"
@@ -661,52 +612,6 @@
       ],
       "license_file": null
     },
-    "fnv 1.0.7": {
-      "name": "fnv",
-      "version": "1.0.7",
-      "package_url": "https://github.com/servo/rust-fnv",
-      "repository": {
-        "Http": {
-          "url": "https://static.crates.io/crates/fnv/1.0.7/download",
-          "sha256": "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-        }
-      },
-      "targets": [
-        {
-          "Library": {
-            "crate_name": "fnv",
-            "crate_root": "lib.rs",
-            "srcs": {
-              "allow_empty": true,
-              "include": [
-                "**/*.rs"
-              ]
-            }
-          }
-        }
-      ],
-      "library_target_name": "fnv",
-      "common_attrs": {
-        "compile_data_glob": [
-          "**"
-        ],
-        "crate_features": {
-          "common": [
-            "default",
-            "std"
-          ],
-          "selects": {}
-        },
-        "edition": "2015",
-        "version": "1.0.7"
-      },
-      "license": "Apache-2.0 / MIT",
-      "license_ids": [
-        "Apache-2.0",
-        "MIT"
-      ],
-      "license_file": "LICENSE-APACHE"
-    },
     "fragile 2.0.0": {
       "name": "fragile",
       "version": "2.0.0",
@@ -784,69 +689,6 @@
       ],
       "license_file": "LICENSE-APACHE"
     },
-    "http 1.2.0": {
-      "name": "http",
-      "version": "1.2.0",
-      "package_url": "https://github.com/hyperium/http",
-      "repository": {
-        "Http": {
-          "url": "https://static.crates.io/crates/http/1.2.0/download",
-          "sha256": "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
-        }
-      },
-      "targets": [
-        {
-          "Library": {
-            "crate_name": "http",
-            "crate_root": "src/lib.rs",
-            "srcs": {
-              "allow_empty": true,
-              "include": [
-                "**/*.rs"
-              ]
-            }
-          }
-        }
-      ],
-      "library_target_name": "http",
-      "common_attrs": {
-        "compile_data_glob": [
-          "**"
-        ],
-        "crate_features": {
-          "common": [
-            "default",
-            "std"
-          ],
-          "selects": {}
-        },
-        "deps": {
-          "common": [
-            {
-              "id": "bytes 1.9.0",
-              "target": "bytes"
-            },
-            {
-              "id": "fnv 1.0.7",
-              "target": "fnv"
-            },
-            {
-              "id": "itoa 1.0.14",
-              "target": "itoa"
-            }
-          ],
-          "selects": {}
-        },
-        "edition": "2018",
-        "version": "1.2.0"
-      },
-      "license": "MIT OR Apache-2.0",
-      "license_ids": [
-        "Apache-2.0",
-        "MIT"
-      ],
-      "license_file": "LICENSE-APACHE"
-    },
     "itertools 0.13.0": {
       "name": "itertools",
       "version": "0.13.0",
@@ -895,45 +737,6 @@
       ],
       "license_file": "LICENSE-APACHE"
     },
-    "itoa 1.0.14": {
-      "name": "itoa",
-      "version": "1.0.14",
-      "package_url": "https://github.com/dtolnay/itoa",
-      "repository": {
-        "Http": {
-          "url": "https://static.crates.io/crates/itoa/1.0.14/download",
-          "sha256": "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
-        }
-      },
-      "targets": [
-        {
-          "Library": {
-            "crate_name": "itoa",
-            "crate_root": "src/lib.rs",
-            "srcs": {
-              "allow_empty": true,
-              "include": [
-                "**/*.rs"
-              ]
-            }
-          }
-        }
-      ],
-      "library_target_name": "itoa",
-      "common_attrs": {
-        "compile_data_glob": [
-          "**"
-        ],
-        "edition": "2018",
-        "version": "1.0.14"
-      },
-      "license": "MIT OR Apache-2.0",
-      "license_ids": [
-        "Apache-2.0",
-        "MIT"
-      ],
-      "license_file": "LICENSE-APACHE"
-    },
     "libc 0.2.158": {
       "name": "libc",
       "version": "0.2.158",
@@ -2965,7 +2768,6 @@
   },
   "direct_deps": [
     "bindgen 0.70.1",
-    "http 1.2.0",
     "mockall 0.13.1"
   ],
   "direct_dev_deps": [],

diff --git a/source/extensions/dynamic_modules/sdk/rust/Cargo.lock b/source/extensions/dynamic_modules/sdk/rust/Cargo.lock
diff --git a/source/extensions/dynamic_modules/sdk/rust/Cargo.toml b/source/extensions/dynamic_modules/sdk/rust/Cargo.toml
@@ -8,7 +8,6 @@ license = "Apache-2.0"
 repository = "https://github.com/envoyproxy/envoy"
 
 [dependencies]
-http = "1.2.0"
 mockall = "0.13.1"
 
 [build-dependencies]