chore: deleted deprecated proto top-level folder

- Migrated hipcheck-common/proto to the top-level proto folder
- Enabled running "buf lint" in CI

Signed-off-by: Patrick Casey <[email protected]>

.buf.yaml

@@ -1,4 +1,7 @@
 version: v2
+# tell buf to look in proto for .proto files
+modules:
+  - path: proto
 lint:
   use:
     - STANDARD

hipcheck-common/build.rs

@@ -7,7 +7,7 @@ use tonic_build::compile_protos;
 fn main() -> Result<()> {
 	// Compile the Hipcheck gRPC protocol spec to an .rs file
 	let root = env!("CARGO_MANIFEST_DIR");
-	let path = pathbuf![root, "proto", "hipcheck", "v1", "hipcheck.proto"];
+	let path = pathbuf![root, "..", "proto", "hipcheck", "v1", "hipcheck.proto"];
 	compile_protos(path)?;
 
 	// Make the target available as a compile-time env var for plugin arch

xtask/src/task/buf.rs

@@ -1,21 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::workspace;
 use anyhow::{Context, Result};
-use pathbuf::pathbuf;
 use which::which;
-use xshell::{cmd, Shell};
+use xshell::Shell;
+
+use super::ci::run_buf_lint;
 
 /// Run the `buf lint` command
 pub fn run() -> Result<()> {
 	let sh = Shell::new().context("could not init shell")?;
 	which("buf").context("could not find 'buf'")?;
-
-	let root = workspace::root()?;
-	let config = pathbuf![&root, ".buf.yaml"];
-	let target = pathbuf![&root, "hipcheck", "proto"];
-
-	cmd!(sh, "buf lint --config {config} {target}").run()?;
-
+	run_buf_lint(&sh)?;
 	Ok(())
 }

xtask/src/task/ci.rs

@@ -25,6 +25,7 @@ pub fn run() -> Result<()> {
 		task!(check_target_matches_ci),
 		task!(print_versions),
 		task!(run_fmt),
+		task!(run_buf_lint),
 		task!(run_check),
 		task!(run_build),
 		task!(run_test),
@@ -123,7 +124,7 @@ fn print_versions(sh: &Shell) -> Result<()> {
 	print_fmt_version(sh)?;
 	print_clippy_version(sh)?;
 	print_xtask_version(sh)?;
-
+	print_buf_version(sh)?;
 	Ok(())
 }
 
@@ -169,6 +170,13 @@ fn print_xtask_version(sh: &Shell) -> Result<()> {
 	.map_err(reason("call to cargo xtask failed. Make sure rust is installed and path to home-dir-here/.cargo/bin is on your path."))
 }
 
+// Print the version of `buf`
+fn print_buf_version(sh: &Shell) -> Result<()> {
+	cmd!(sh, "buf --version").run().map(drop).map_err(reason(
+		"call to buf failed. Make sure buf is installed and on your path.",
+	))
+}
+
 /// Run `cargo fmt`.
 fn run_fmt(sh: &Shell) -> Result<()> {
 	cmd!(sh, "cargo fmt --all -- --color=always --check")
@@ -228,6 +236,14 @@ fn run_xtask_check(sh: &Shell) -> Result<()> {
 		.map_err(reason("call to cargo xtask failed"))
 }
 
+/// Run `buf lint`
+pub fn run_buf_lint(sh: &Shell) -> Result<()> {
+	cmd!(sh, "buf lint --config .buf.yaml")
+		.run()
+		.map(drop)
+		.map_err(reason("call to buf lint failed"))
+}
+
 /// Tell the user we're done.
 fn done(_sh: &Shell) -> Result<()> {
 	log::info!(

xtask/src/task/mod.rs

@@ -6,6 +6,6 @@ pub mod buf;
 pub mod changelog;
 pub mod check;
 pub mod ci;
+pub mod manifest;
 pub mod rfd;
 pub mod site;
-pub mod manifest;