chore: Format files

This commit is contained in:
Gerald Pinder 2025-04-29 00:50:28 -04:00
parent 2f6b2b4b70
commit 44cecab3f4
42 changed files with 130 additions and 108 deletions

View file

@ -4,14 +4,14 @@ use blue_build_utils::{credentials::Credentials, semver::Version};
use colored::Colorize;
use comlexr::cmd;
use log::{debug, error, info, trace};
use miette::{bail, miette, IntoDiagnostic, Result};
use miette::{IntoDiagnostic, Result, bail, miette};
use serde::Deserialize;
use crate::{drivers::types::Platform, logging::CommandLogging};
use super::{
opts::{BuildOpts, PushOpts, TagOpts},
BuildDriver, DriverVersion,
opts::{BuildOpts, PushOpts, TagOpts},
};
#[derive(Debug, Deserialize)]

View file

@ -7,14 +7,14 @@ use blue_build_utils::{
use colored::Colorize;
use comlexr::{cmd, pipe};
use log::{debug, trace};
use miette::{bail, Context, IntoDiagnostic, Result};
use miette::{Context, IntoDiagnostic, Result, bail};
use crate::drivers::opts::VerifyType;
use super::{
SigningDriver,
functions::get_private_key,
opts::{CheckKeyPairOpts, GenerateKeyPairOpts, SignOpts, VerifyOpts},
SigningDriver,
};
#[derive(Debug)]
@ -195,8 +195,8 @@ mod test {
use tempfile::TempDir;
use crate::drivers::{
opts::{CheckKeyPairOpts, GenerateKeyPairOpts},
SigningDriver,
opts::{CheckKeyPairOpts, GenerateKeyPairOpts},
};
use super::CosignDriver;

View file

@ -15,7 +15,7 @@ use cached::proc_macro::cached;
use colored::Colorize;
use comlexr::{cmd, pipe};
use log::{debug, info, trace, warn};
use miette::{bail, Context, IntoDiagnostic, Result};
use miette::{Context, IntoDiagnostic, Result, bail};
use oci_distribution::Reference;
use serde::Deserialize;
use tempfile::TempDir;
@ -32,7 +32,7 @@ use crate::{
types::{ContainerId, ImageMetadata, Platform},
},
logging::CommandLogging,
signal_handler::{add_cid, remove_cid, ContainerRuntime, ContainerSignalId},
signal_handler::{ContainerRuntime, ContainerSignalId, add_cid, remove_cid},
};
use super::opts::{CreateContainerOpts, RemoveContainerOpts, RemoveImageOpts};

View file

@ -1,6 +1,6 @@
use std::collections::HashMap;
use miette::{bail, Report};
use miette::{Report, bail};
use serde::Deserialize;
use crate::drivers::types::{ImageMetadata, Platform};

View file

@ -1,10 +1,10 @@
use std::{env, path::Path};
use blue_build_utils::{
constants::{BB_PRIVATE_KEY, COSIGN_PRIVATE_KEY, COSIGN_PRIV_PATH, COSIGN_PUB_PATH},
constants::{BB_PRIVATE_KEY, COSIGN_PRIV_PATH, COSIGN_PRIVATE_KEY, COSIGN_PUB_PATH},
string,
};
use miette::{bail, Result};
use miette::{Result, bail};
use super::opts::PrivateKey;

View file

@ -16,7 +16,7 @@ use blue_build_utils::get_env_var;
#[cfg(test)]
use blue_build_utils::test_utils::get_env_var;
use super::{opts::GenerateTagsOpts, CiDriver, Driver};
use super::{CiDriver, Driver, opts::GenerateTagsOpts};
mod event;
@ -153,7 +153,7 @@ mod test {
use rstest::rstest;
use crate::{
drivers::{opts::GenerateTagsOpts, types::Platform, CiDriver},
drivers::{CiDriver, opts::GenerateTagsOpts, types::Platform},
test::{TEST_TAG_1, TEST_TAG_2, TIMESTAMP},
};

View file

@ -18,7 +18,7 @@ use blue_build_utils::test_utils::get_env_var;
use crate::drivers::Driver;
use super::{opts::GenerateTagsOpts, CiDriver};
use super::{CiDriver, opts::GenerateTagsOpts};
pub struct GitlabDriver;
@ -165,7 +165,7 @@ mod test {
use rstest::rstest;
use crate::{
drivers::{opts::GenerateTagsOpts, CiDriver},
drivers::{CiDriver, opts::GenerateTagsOpts},
test::{TEST_TAG_1, TEST_TAG_2, TIMESTAMP},
};

View file

@ -4,7 +4,7 @@ use blue_build_utils::string_vec;
use comlexr::cmd;
use log::trace;
use super::{opts::GenerateTagsOpts, CiDriver, Driver};
use super::{CiDriver, Driver, opts::GenerateTagsOpts};
pub struct LocalDriver;

View file

@ -14,27 +14,27 @@ use colored::Colorize;
use comlexr::{cmd, pipe};
use indicatif::{ProgressBar, ProgressStyle};
use log::{debug, error, info, trace};
use miette::{bail, miette, IntoDiagnostic, Report, Result};
use miette::{IntoDiagnostic, Report, Result, bail, miette};
use oci_distribution::Reference;
use serde::Deserialize;
use tempfile::TempDir;
use crate::{
drivers::{
BuildDriver, DriverVersion, InspectDriver, RunDriver,
opts::{BuildOpts, GetMetadataOpts, PushOpts, RunOpts, RunOptsEnv, RunOptsVolume, TagOpts},
types::{ImageMetadata, Platform},
BuildDriver, DriverVersion, InspectDriver, RunDriver,
},
logging::{CommandLogging, Logger},
signal_handler::{add_cid, remove_cid, ContainerRuntime, ContainerSignalId},
signal_handler::{ContainerRuntime, ContainerSignalId, add_cid, remove_cid},
};
#[cfg(feature = "rechunk")]
use super::{ContainerMountDriver, RechunkDriver, types::MountId};
use super::{
opts::{CreateContainerOpts, RemoveContainerOpts, RemoveImageOpts},
types::ContainerId,
};
#[cfg(feature = "rechunk")]
use super::{types::MountId, ContainerMountDriver, RechunkDriver};
const SUDO_PROMPT: &str = "Password for %u required to run 'podman' as privileged";

View file

@ -1,14 +1,14 @@
use std::{fs, path::Path};
use crate::{
drivers::opts::{PrivateKeyContents, VerifyType},
ASYNC_RUNTIME,
drivers::opts::{PrivateKeyContents, VerifyType},
};
use super::{
SigningDriver,
functions::get_private_key,
opts::{CheckKeyPairOpts, GenerateKeyPairOpts, SignOpts, VerifyOpts},
SigningDriver,
};
use blue_build_utils::{
constants::{COSIGN_PRIV_PATH, COSIGN_PUB_PATH},
@ -17,14 +17,14 @@ use blue_build_utils::{
};
use colored::Colorize;
use log::{debug, trace};
use miette::{bail, miette, Context, IntoDiagnostic};
use miette::{Context, IntoDiagnostic, bail, miette};
use sigstore::{
cosign::{
ClientBuilder, Constraint, CosignCapabilities, SignatureLayer,
constraint::PrivateKeySigner,
verification_constraint::{PublicKeyVerifier, VerificationConstraintVec},
ClientBuilder, Constraint, CosignCapabilities, SignatureLayer,
},
crypto::{signing_key::SigStoreKeyPair, SigningScheme},
crypto::{SigningScheme, signing_key::SigStoreKeyPair},
errors::SigstoreVerifyConstraintsError,
registry::{Auth, OciReference},
};
@ -167,8 +167,8 @@ impl SigningDriver for SigstoreDriver {
.into_diagnostic()
.with_context(|| {
format!(
"Failed to push signature {cosign_signature_image} for image {image_digest}"
)
"Failed to push signature {cosign_signature_image} for image {image_digest}"
)
})
})?;
debug!("Successfully pushed signature");
@ -242,9 +242,9 @@ mod test {
use tempfile::TempDir;
use crate::drivers::{
SigningDriver,
cosign_driver::CosignDriver,
opts::{CheckKeyPairOpts, GenerateKeyPairOpts},
SigningDriver,
};
use super::SigstoreDriver;

View file

@ -5,11 +5,11 @@ use colored::Colorize;
use comlexr::cmd;
use indicatif::{ProgressBar, ProgressStyle};
use log::{debug, trace};
use miette::{bail, IntoDiagnostic, Result};
use miette::{IntoDiagnostic, Result, bail};
use crate::{drivers::types::Platform, logging::Logger};
use super::{opts::GetMetadataOpts, types::ImageMetadata, InspectDriver};
use super::{InspectDriver, opts::GetMetadataOpts, types::ImageMetadata};
#[derive(Debug)]
pub struct SkopeoDriver;

View file

@ -6,11 +6,11 @@ use std::{
use blue_build_utils::{constants::COSIGN_PUB_PATH, retry, semver::Version, string_vec};
use log::{debug, info, trace};
use miette::{bail, Context, IntoDiagnostic, Result};
use miette::{Context, IntoDiagnostic, Result, bail};
use oci_distribution::Reference;
use semver::VersionReq;
use crate::drivers::{functions::get_private_key, types::CiDriverType, Driver};
use crate::drivers::{Driver, functions::get_private_key, types::CiDriverType};
#[cfg(feature = "sigstore")]
use super::sigstore_driver::SigstoreDriver;

View file

@ -10,8 +10,8 @@ use serde::Deserialize;
use serde_json::Value;
use crate::drivers::{
buildah_driver::BuildahDriver, docker_driver::DockerDriver, podman_driver::PodmanDriver,
DriverVersion,
DriverVersion, buildah_driver::BuildahDriver, docker_driver::DockerDriver,
podman_driver::PodmanDriver,
};
pub(super) trait DetermineDriver<T> {