fix: buffrs should not use protoc-bin-vendored

Instead, we should use protoc crate for working with user provided binary.

Author: tomkarw

.github/workflows/cli.yml

@@ -20,6 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - uses: arduino/setup-protoc@v2
       - run: rustup update && rustup component add clippy
       - uses: Swatinem/rust-cache@v2
       - run: cargo clippy --all-targets --workspace -- -D warnings -D clippy::all
@@ -30,6 +31,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           lfs: "true"
+      - uses: arduino/setup-protoc@v2
       - run: rustup update
       - uses: Swatinem/rust-cache@v2
       - run: cargo test --workspace
@@ -51,6 +53,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           lfs: 'true'
+      - uses: arduino/setup-protoc@v2
       - run: rustup update
       - run: rustup component add llvm-tools-preview
       - uses: Swatinem/rust-cache@v2

Cargo.lock

@@ -23,7 +23,7 @@ test = true
 
 [features]
 default = ["build", "git", "validation"]
-build = ["dep:tonic-build", "dep:protoc-bin-vendored"]
+build = ["dep:tonic-build", "dep:protoc"]
 validation = ["dep:anyhow", "dep:protobuf", "dep:protobuf-parse", "dep:diff-struct"]
 git = ["dep:git2"]
 
@@ -41,7 +41,7 @@ human-panic = "1"
 miette = { version = "5.10.0", features = ["fancy"] }
 protobuf = { version = "3.3.0", optional = true }
 protobuf-parse = { version = "3.3.0", optional = true }
-protoc-bin-vendored = { version = "3.0.0", optional = true }
+protoc = { version = "2.28.0", optional = true }
 reqwest = { version = "0.11", features = ["rustls-tls-native-roots"], default-features = false }
 semver = { version = "1", features = ["serde"] }
 serde = { version = "1", features = ["derive"] }

Cargo.toml

@@ -15,7 +15,6 @@
 use std::{fmt, path::PathBuf};
 
 use miette::{ensure, miette, Context, IntoDiagnostic};
-use protoc_bin_vendored::protoc_bin_path;
 use serde::{Deserialize, Serialize};
 use tracing::{debug, info};
 
@@ -57,18 +56,12 @@ impl Generator {
 
     /// Run the generator for a dependency and output files at the provided path
     pub async fn run(&self) -> miette::Result<()> {
-        let protoc = protoc_bin_path()
-            .into_diagnostic()
-            .wrap_err(miette!("unable to locate vendored protoc"))?;
-
-        std::env::set_var("PROTOC", protoc.clone());
-
         let store = PackageStore::current().await?;
         let manifest = Manifest::read().await?;
 
         store.populate(&manifest).await?;
 
-        let protos = store.populated_files(&manifest).await;
+        let proto_files = store.populated_files(&manifest).await;
         let includes = &[store.proto_vendor_path()];
 
         match self {
@@ -78,15 +71,15 @@ impl Generator {
                     .build_server(true)
                     .build_transport(true)
                     .include_file(Self::TONIC_INCLUDE_FILE)
-                    .compile(&protos, includes)
+                    .compile(&proto_files, includes)
                     .into_diagnostic()?;
             }
             Generator::Protoc { language, out_dir } => {
-                let mut protoc_cmd = tokio::process::Command::new(protoc);
+                let mut protoc = protoc::ProtocLangOut::new();
 
                 match language {
                     Language::Python => {
-                        protoc_cmd.arg("--python_out").arg(out_dir);
+                        protoc.lang("python").out_dir(out_dir);
                     }
                 }
 
@@ -95,25 +88,14 @@ impl Generator {
                 // e.g. if input proto path is proto/vendor/units/units.proto and the proto path is 'proto'
                 // and the --python_out is 'proto/build/gen' then the file will be output to
                 // proto/build/gen/vendor/units/units.py
+                // We need both of these if we want "vendor" to be removed, and it has to come first
+                protoc.includes(["proto/vendor", "proto"]);
 
-                protoc_cmd.arg("--proto_path").arg("proto/vendor"); // We need both of these if we want "vendor" to be removed, and it has to come first
-                protoc_cmd.arg("--proto_path").arg("proto");
-
-                protoc_cmd.args(&protos);
-
-                debug!(":: running {protoc_cmd:?}");
-
-                let output = protoc_cmd.output().await.into_diagnostic()?;
+                protoc.inputs(&proto_files);
 
-                let exit = output.status.code().ok_or(miette!(
-                    "a signal interrupted the protoc subprocess before it could complete"
-                ))?;
+                debug!(":: running protoc");
 
-                ensure!(
-                    exit == 0,
-                    "the protoc subprocess terminated with an error: {exit}. stderr: {}",
-                    String::from_utf8_lossy(&output.stderr)
-                );
+                protoc.run().into_diagnostic()?;
 
                 info!(":: {language} code generated successfully");
             }