feat!: Update dependencies and modernize Rust code patterns

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "buildkit-proto",
     "buildkit-llb",

buildkit-frontend/Cargo.toml

@@ -2,7 +2,7 @@
 name = "buildkit-frontend"
 version = "0.3.0"
 authors = ["Denys Zariaiev <denys.zariaiev@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 description = "Foundation for BuildKit frontends implemented in Rust"
 documentation = "https://docs.rs/buildkit-frontend"
@@ -13,22 +13,19 @@ categories = ["development-tools::build-utils", "api-bindings"]
 license = "MIT/Apache-2.0"
 
 [dependencies]
-bytes = "0.5"
 either = "1.5"
 failure = "0.1"
 futures = "0.3"
-libc = "0.2"
 log = "0.4"
-mio = "0.6"
-pin-project = "0.4"
 serde_json = "1.0"
-tonic = "0.1"
-tower = "0.3"
+tonic = "0.12"
+tower = { version = "0.5", features = ["util"] }
+hyper-util = { version = "0.1", features = ["tokio"] }
 
 [dependencies.tokio]
-version = "0.2"
+version = "1"
 default-features = false
-features = ["io-std"]
+features = ["sync", "io-std", "io-util"]
 
 [dependencies.serde]
 version = "1.0"
@@ -48,11 +45,11 @@ path = "../buildkit-llb"
 
 [dev-dependencies]
 async-trait = "0.1"
-env_logger = "0.6"
-pretty_assertions = "0.6"
-regex = "1.3"
-url = "2.1"
+env_logger = "0.11"
+pretty_assertions = "1.4"
+regex = "1.11"
+url = "2.5"
 
 [dev-dependencies.tokio]
-version = "0.2"
-features = ["macros", "rt-core", "rt-threaded"]
+version = "1"
+features = ["macros", "rt-multi-thread"]

buildkit-frontend/examples/download.rs

@@ -13,11 +13,11 @@ use buildkit_frontend::{Bridge, Frontend, FrontendOutput, OutputRef};
 
 use buildkit_llb::prelude::*;
 
-#[tokio::main(threaded_scheduler)]
+#[tokio::main(flavor = "multi_thread")]
 async fn main() {
     env_logger::init();
 
-    if let Err(_) = run_frontend(DownloadFrontend).await {
+    if run_frontend(DownloadFrontend).await.is_err() {
         std::process::exit(1);
     }
 }
@@ -59,18 +59,15 @@ impl DownloadFrontend {
 
             architecture: Architecture::Amd64,
             os: OperatingSystem::Linux,
+            os_version: None,
+            os_features: None,
+            variant: None,
 
             config: Some(ImageConfig {
                 entrypoint: Some(vec!["/bin/sh".into()]),
                 cmd: Some(vec!["-c".into(), "/usr/bin/sha256sum *".into()]),
-                env: None,
-                user: None,
                 working_dir: Some(OUTPUT_DIR.into()),
-
-                labels: None,
-                volumes: None,
-                exposed_ports: None,
-                stop_signal: None,
+                ..Default::default()
             }),
 
             rootfs: None,
@@ -102,7 +99,7 @@ impl DownloadFrontend {
         let alpine = Source::image("alpine:latest").ref_counted();
 
         let builder_rootfs = Command::run("apk")
-            .args(&["add", "curl"])
+            .args(["add", "curl"])
             .custom_name("Installing curl")
             .mount(Mount::Layer(OutputIdx(0), alpine.output(), "/"))
             .ref_counted();
@@ -113,7 +110,7 @@ impl DownloadFrontend {
                 let full_path = PathBuf::from(OUTPUT_DIR).join(&relative_path);
 
                 let op = Command::run("curl")
-                    .args(&[&url.to_string(), "-o", &full_path.to_string_lossy()])
+                    .args([url.as_ref(), "-o", &full_path.to_string_lossy()])
                     .mount(Mount::ReadOnlyLayer(builder_rootfs.output(0), "/"))
                     .mount(Mount::Scratch(OutputIdx(0), OUTPUT_DIR))
                     .custom_name(format!("Downloading '{}'", relative_path.display()))
@@ -149,7 +146,7 @@ impl DownloadFrontend {
         let cmd_regex = Regex::new(r#"Download\s+"(.+)"\s+as\s+"(.+)""#).unwrap();
 
         dockerfile.lines().filter_map(move |line| {
-            let captures = cmd_regex.captures(&line)?;
+            let captures = cmd_regex.captures(line)?;
             Some(Url::parse(&captures[1]).map(|url| (url, captures[2].into())))
         })
     }

buildkit-frontend/examples/reverse.rs

@@ -13,7 +13,7 @@ use buildkit_llb::prelude::*;
 async fn main() {
     env_logger::init();
 
-    if let Err(_) = run_frontend(ReverseFrontend).await {
+    if run_frontend(ReverseFrontend).await.is_err() {
         std::process::exit(1);
     }
 }
@@ -40,18 +40,13 @@ impl ReverseFrontend {
 
             architecture: Architecture::Amd64,
             os: OperatingSystem::Linux,
+            os_version: None,
+            os_features: None,
+            variant: None,
 
             config: Some(ImageConfig {
-                entrypoint: None,
                 cmd: Some(vec!["/bin/cat".into(), OUTPUT_FILENAME.into()]),
-                env: None,
-                user: None,
-                working_dir: None,
-
-                labels: None,
-                volumes: None,
-                exposed_ports: None,
-                stop_signal: None,
+                ..Default::default()
             }),
 
             rootfs: None,
@@ -72,7 +67,6 @@ impl ReverseFrontend {
         let transformed_contents: String = {
             String::from_utf8_lossy(&dockerfile_contents)
                 .lines()
-                .into_iter()
                 .map(|line| {
                     line.trim()
                         .chars()

buildkit-frontend/examples/ssh-mount.rs

@@ -7,11 +7,11 @@ use buildkit_frontend::{Bridge, Frontend, FrontendOutput, Options, OutputRef};
 
 use buildkit_llb::prelude::*;
 
-#[tokio::main(basic_scheduler)]
+#[tokio::main(flavor = "current_thread")]
 async fn main() {
     env_logger::init();
 
-    if let Err(_) = run_frontend(ReverseFrontend).await {
+    if run_frontend(ReverseFrontend).await.is_err() {
         std::process::exit(1);
     }
 }
@@ -40,18 +40,14 @@ impl ReverseFrontend {
 
             architecture: Architecture::Amd64,
             os: OperatingSystem::Linux,
+            os_version: None,
+            os_features: None,
+            variant: None,
 
             config: Some(ImageConfig {
-                entrypoint: None,
                 cmd: Some(vec!["/bin/cat".into(), OUTPUT_FILENAME.into()]),
-                env: None,
-                user: None,
                 working_dir: Some("/output".into()),
-
-                labels: None,
-                volumes: None,
-                exposed_ports: None,
-                stop_signal: None,
+                ..Default::default()
             }),
 
             rootfs: None,
@@ -76,23 +72,23 @@ impl ReverseFrontend {
         let mut test = None;
 
         for line in dockerfile_contents.lines() {
-            if line.starts_with("REPO:") {
-                repo = Some(line[5..].trim());
+            if let Some(stripped) = line.strip_prefix("REPO:") {
+                repo = Some(stripped.trim());
             }
 
-            if line.starts_with("TAG:") {
-                tag = Some(line[4..].trim());
+            if let Some(stripped) = line.strip_prefix("TAG:") {
+                tag = Some(stripped.trim());
             }
 
-            if line.starts_with("TEST:") {
-                test = Some(line[5..].trim());
+            if let Some(stripped) = line.strip_prefix("TEST:") {
+                test = Some(stripped.trim());
             }
         }
 
         let rootfs = Source::image("rust:latest");
         let install_command = match (repo, tag) {
             (Some(repo), Some(tag)) => Command::run("cargo")
-                .args(&["install", "--git", repo, "--tag", tag])
+                .args(["install", "--git", repo, "--tag", tag])
                 .mount(Mount::Layer(OutputIdx(0), rootfs.output(), "/"))
                 .mount(Mount::OptionalSshAgent("/tmp/ssh_agent.0"))
                 .env("PATH", PATH)
@@ -108,7 +104,7 @@ impl ReverseFrontend {
 
         let test_command = if let Some(test) = test {
             Command::run("/bin/sh")
-                .args(&["-c", &format!("{} > {}", test, OUTPUT_FILENAME)])
+                .args(["-c", &format!("{} > {}", test, OUTPUT_FILENAME)])
                 .mount(Mount::Layer(OutputIdx(0), install_command.output(0), "/"))
                 .env("PATH", PATH)
         } else {