Merge pull request #310 from bulwark-security/eject-pbjson

Strip out `pbjson` since we don't need it
bulwark-security · May 24, 2024 · 63fecee · 63fecee
2 parents 7ae1cd5 + cfb4fe7
commit 63fecee
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 111 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/ext-processor/Cargo.toml b/crates/ext-processor/Cargo.toml
@@ -34,16 +34,13 @@ bytes = "1"
 json = "0.12.4"
 matchit = "0.7.0"
 prost = "^0.11"
+prost-types = "^0.11"
 sfv = "0.9.2"
-pbjson = "^0.5"
-pbjson-types = "^0.5"
-# typetag = "^0.2"
 
 [dev-dependencies]
 redis-test = { workspace = true }
 
 [build-dependencies]
-pbjson-build = "0.6.2"
 tonic-build = "0.9.2"
 
 [lib]

diff --git a/crates/ext-processor/build.rs b/crates/ext-processor/build.rs
@@ -13,8 +13,6 @@ fn main() -> Result<()> {
         .build_server(true)
         .build_client(false)
         .file_descriptor_set_path(descriptor_path.clone())
-        .compile_well_known_types(true)
-        .extern_path(".google.protobuf", "::pbjson_types")
         .compile(
             &[
                 "protobuf/data-plane-api/envoy/config/common/mutation_rules/v3/mutation_rules.proto",

diff --git a/crates/ext-processor/src/protobuf.rs b/crates/ext-processor/src/protobuf.rs
@@ -21,6 +21,7 @@ pub mod envoy {
         pub mod filters {
             pub mod http {
                 pub mod ext_authz {
+                    #[allow(clippy::large_enum_variant)]
                     pub mod v3 {
                         include!(concat!(
                             env!("OUT_DIR"),