chore: Switch to using my new proc_macro comlexr

blue-build · Jan 12, 2025 · c513d69 · c513d69
1 parent 796ff48
commit c513d69
Show file tree

Hide file tree

Showing 18 changed files with 203 additions and 347 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -402,18 +402,6 @@ jobs:
 
       - uses: sigstore/cosign-installer@v3.3.0
 
-      - name: Setup Podman
-        shell: bash
-        run: |
-          # from https://askubuntu.com/questions/1414446/whats-the-recommended-way-of-installing-podman-4-in-ubuntu-22-04
-          ubuntu_version='22.04'
-          key_url="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_${ubuntu_version}/Release.key"
-          sources_url="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_${ubuntu_version}"
-          echo "deb $sources_url/ /" | sudo tee /etc/apt/sources.list.d/devel-kubic-libcontainers-unstable.list
-          curl -fsSL $key_url | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/devel_kubic_libcontainers_unstable.gpg > /dev/null
-          sudo apt-get update
-          sudo apt-get install -y podman
-
       - uses: actions-rust-lang/setup-rust-toolchain@v1
 
       - uses: actions/checkout@v4
@@ -446,18 +434,6 @@ jobs:
 
       - uses: sigstore/cosign-installer@v3.3.0
 
-      - name: Setup Buildah 
-        shell: bash
-        run: |
-          # from https://askubuntu.com/questions/1414446/whats-the-recommended-way-of-installing-podman-4-in-ubuntu-22-04
-          ubuntu_version='22.04'
-          key_url="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_${ubuntu_version}/Release.key"
-          sources_url="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_${ubuntu_version}"
-          echo "deb $sources_url/ /" | sudo tee /etc/apt/sources.list.d/devel-kubic-libcontainers-unstable.list
-          curl -fsSL $key_url | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/devel_kubic_libcontainers_unstable.gpg > /dev/null
-          sudo apt-get update
-          sudo apt-get install -y buildah
-
       - uses: actions-rust-lang/setup-rust-toolchain@v1
 
       - uses: actions/checkout@v4

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -507,18 +507,6 @@ jobs:
 
       - uses: sigstore/cosign-installer@v3.3.0
 
-      - name: Setup Podman
-        shell: bash
-        run: |
-          # from https://askubuntu.com/questions/1414446/whats-the-recommended-way-of-installing-podman-4-in-ubuntu-22-04
-          ubuntu_version='22.04'
-          key_url="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_${ubuntu_version}/Release.key"
-          sources_url="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_${ubuntu_version}"
-          echo "deb $sources_url/ /" | sudo tee /etc/apt/sources.list.d/devel-kubic-libcontainers-unstable.list
-          curl -fsSL $key_url | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/devel_kubic_libcontainers_unstable.gpg > /dev/null
-          sudo apt-get update
-          sudo apt-get install -y podman
-
       - uses: actions-rust-lang/setup-rust-toolchain@v1
 
       # Setup repo and add caching
@@ -554,18 +542,6 @@ jobs:
 
       - uses: sigstore/cosign-installer@v3.3.0
 
-      - name: Setup Podman
-        shell: bash
-        run: |
-          # from https://askubuntu.com/questions/1414446/whats-the-recommended-way-of-installing-podman-4-in-ubuntu-22-04
-          ubuntu_version='22.04'
-          key_url="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_${ubuntu_version}/Release.key"
-          sources_url="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_${ubuntu_version}"
-          echo "deb $sources_url/ /" | sudo tee /etc/apt/sources.list.d/devel-kubic-libcontainers-unstable.list
-          curl -fsSL $key_url | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/devel_kubic_libcontainers_unstable.gpg > /dev/null
-          sudo apt-get update
-          sudo apt-get install -y buildah
-
       - uses: actions-rust-lang/setup-rust-toolchain@v1
 
       # Setup repo and add caching

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,11 +10,12 @@ categories = ["command-line-utilities"]
 version = "0.9.2"
 
 [workspace.dependencies]
-bon = "2"
+bon = "3"
 cached = "0.53"
 chrono = "0.4"
 clap = "4"
 colored = "2"
+comlexr = "1"
 indexmap = { version = "2", features = ["serde"] }
 indicatif = { version = "0.17", features = ["improved_unicode"] }
 log = "0.4"
@@ -84,6 +85,7 @@ yaml-rust2 = { version = "0.9", optional = true }
 cached.workspace = true
 clap = { workspace = true, features = ["derive", "cargo", "unicode", "env"] }
 colored.workspace = true
+comlexr.workspace = true
 indexmap.workspace = true
 indicatif.workspace = true
 log.workspace = true

diff --git a/process/Cargo.toml b/process/Cargo.toml
@@ -28,6 +28,7 @@ cached.workspace = true
 chrono.workspace = true
 clap = { workspace = true, features = ["derive", "env"] }
 colored.workspace = true
+comlexr.workspace = true
 indicatif.workspace = true
 indexmap.workspace = true
 log.workspace = true

diff --git a/process/drivers/buildah_driver.rs b/process/drivers/buildah_driver.rs
@@ -1,7 +1,8 @@
 use std::{io::Write, process::Stdio};
 
-use blue_build_utils::{cmd, credentials::Credentials};
+use blue_build_utils::credentials::Credentials;
 use colored::Colorize;
+use comlexr::cmd;
 use log::{debug, error, info, trace};
 use miette::{bail, miette, IntoDiagnostic, Result};
 use semver::Version;

diff --git a/process/drivers/cosign_driver.rs b/process/drivers/cosign_driver.rs
@@ -1,11 +1,11 @@
 use std::{fmt::Debug, fs, io::Write, path::Path, process::Stdio};
 
 use blue_build_utils::{
-    cmd,
     constants::{COSIGN_PASSWORD, COSIGN_PUB_PATH, COSIGN_YES},
     credentials::Credentials,
 };
 use colored::Colorize;
+use comlexr::cmd;
 use log::{debug, trace};
 use miette::{bail, miette, Context, IntoDiagnostic, Result};
 
@@ -27,10 +27,13 @@ impl SigningDriver for CosignDriver {
         let mut command = cmd!(
             "cosign",
             "generate-key-pair",
-            COSIGN_PASSWORD => "",
-            COSIGN_YES => "true",
+            // COSIGN_PASSWORD => "",
+            // COSIGN_YES => "true",
         );
-        command.current_dir(path);
+        command
+            .current_dir(path)
+            .env(COSIGN_PASSWORD, "")
+            .env(COSIGN_YES, "true");
 
         let status = command.status().into_diagnostic()?;
 
@@ -49,9 +52,10 @@ impl SigningDriver for CosignDriver {
             "cosign",
             "public-key",
             format!("--key={priv_key}"),
-            COSIGN_PASSWORD => "",
-            COSIGN_YES => "true",
+            // COSIGN_PASSWORD => "",
+            // COSIGN_YES => "true",
         );
+        command.env(COSIGN_PASSWORD, "").env(COSIGN_YES, "true");
 
         trace!("{command:?}");
         let output = command.output().into_diagnostic()?;
@@ -93,10 +97,11 @@ impl SigningDriver for CosignDriver {
                 username,
                 "--password-stdin",
                 registry,
-                stdin = Stdio::piped(),
-                stdout = Stdio::piped(),
-                stderr = Stdio::piped(),
             );
+            command
+                .stdin(Stdio::piped())
+                .stdout(Stdio::piped())
+                .stderr(Stdio::piped());
 
             trace!("{command:?}");
             let mut child = command.spawn().into_diagnostic()?;
@@ -135,9 +140,10 @@ impl SigningDriver for CosignDriver {
             if let Some(ref key) = opts.key => format!("--key={key}"),
             "--recursive",
             opts.image.to_string(),
-            COSIGN_PASSWORD => "",
-            COSIGN_YES => "true",
+            // COSIGN_PASSWORD => "",
+            // COSIGN_YES => "true",
         );
+        command.env(COSIGN_PASSWORD, "").env(COSIGN_YES, "true");
 
         trace!("{command:?}");
         if !command.status().into_diagnostic()?.success() {
@@ -151,17 +157,14 @@ impl SigningDriver for CosignDriver {
         let mut command = cmd!(
             "cosign",
             "verify",
-            |c| {
-                match &opts.verify_type {
-                    VerifyType::File(path) => cmd!(c, format!("--key={}", path.display())),
-                    VerifyType::Keyless { issuer, identity } => cmd!(
-                        c,
-                        "--certificate-identity-regexp",
-                        identity as &str,
-                        "--certificate-oidc-issuer",
-                        issuer as &str,
-                    ),
-                };
+            match &opts.verify_type {
+                VerifyType::File(path) => format!("--key={}", path.display()),
+                VerifyType::Keyless { issuer, identity } => [
+                    "--certificate-identity-regexp",
+                    &**identity,
+                    "--certificate-oidc-issuer",
+                    &**issuer,
+                ],
             },
             opts.image.to_string(),
         );