Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: workspace true #38

Merged
merged 2 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,61 @@ members = [
"extras",
]

[workspace.dependencies]
anyhow = "1"
async-trait = "0.1"
base64 = "0.22"
bytes = "1"
bzip2 = "0.4"
bzip2-rs = "0.1"
chrono = { version = "0.4.24", default-features = false }
clap = "4.5"
colored_json = "5"
csaf = { version = "0.5.0", default-features = false }
csv = "1"
cyclonedx-bom = "0.8.0"
deno_core = "0.323.0"
digest = "0.10.6"
env_logger = "0.11"
filetime = "0.2"
flexible-time = "0.1.1"
fluent-uri = "0.3.2"
futures = "0.3"
futures-util = "0.3"
hickory-resolver = "0.24.0"
html-escape = "0.2.13"
humantime = "2"
indicatif = "0.17.6"
indicatif-log-bridge = "0.2.1"
liblzma = "0.3.4"
log = "0.4.17"
openid = "0.15"
openssl = { version = "0.10" }
parking_lot = "0.12"
pem = "3"
percent-encoding = "2.3"
reqwest = "0.12"
sectxtlib = "0.3.0"
sequoia-openpgp = { version = "1", default-features = false }
serde = "1"
serde_json = "1"
sha2 = "0.10.6"
spdx-expression = "0.5"
spdx-rs = "0.5.4"
thiserror = "2"
thousands = "0.2"
time = "0.3"
tokio = "1"
tracing = "0.1"
url = "2"
walkdir = "2.4"

csaf-walker = { version = "0.10.2", path = "csaf", default-features = false }
sbom-walker = { version = "0.10.2", path = "sbom", default-features = false }
walker-common = { version = "0.10.2", path = "common" }
walker-extras = { version = "0.10.2", path = "extras" }


[workspace.metadata.release]
tag = false
tag-name = "v{{version}}"
Expand Down
73 changes: 36 additions & 37 deletions common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,44 +13,43 @@ readme = "../README.md"
rust-version = "1.79"

[dependencies]
anyhow = "1"
async-trait = "0.1"
base64 = "0.22"
bytes = "1"
chrono = { version = "0.4", default-features = false, features = ["std"] }
csv = "1"
digest = "0.10.7"
filetime = "0.2"
flexible-time = "0.1"
futures-util = "0.3"
html-escape = "0.2"
humantime = "2"
indicatif = "0.17.6"
indicatif-log-bridge = "0.2.1"
log = "0.4"
openid = "0.15"
pem = "3"
reqwest = { version = "0.12", features = ["json"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
sha2 = "0.10.7"
thiserror = "2"
thousands = "0.2"
time = { version = "0.3", features = ["serde", "formatting", "local-offset"] }
tokio = { version = "1", features = ["sync", "fs"] }
tracing = "0.1"
url = "2"
walkdir = "2.5"
# normal
anyhow = { workspace = true }
async-trait = { workspace = true }
base64 = { workspace = true }
bytes = { workspace = true }
chrono = { workspace = true, features = ["std"] }
csv = { workspace = true }
digest = { workspace = true }
filetime = { workspace = true }
flexible-time = { workspace = true }
futures-util = { workspace = true }
html-escape = { workspace = true }
humantime = { workspace = true }
indicatif = { workspace = true }
indicatif-log-bridge = { workspace = true }
log = { workspace = true }
openid = { workspace = true }
pem = { workspace = true }
reqwest = { workspace = true, features = ["json"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
sha2 = { workspace = true }
thiserror = { workspace = true }
thousands = { workspace = true }
time = { workspace = true, features = ["serde", "formatting", "local-offset"] }
tokio = { workspace = true, features = ["sync", "fs"] }
tracing = { workspace = true }
url = { workspace = true }
walkdir = { workspace = true }

sequoia-openpgp = { version = "1", default-features = false, optional = true }

bzip2 = { version = "0.4", optional = true }
bzip2-rs = { version = "0.1", optional = true, features = ["rustc_1_51"] }

liblzma = { version = "0.3.4", optional = true }

clap = { version = "4.5.0", features = ["derive", "env"], optional = true }
env_logger = { version = "0.11.3", optional = true }
# optional
bzip2 = { workspace = true, optional = true }
bzip2-rs = { workspace = true, optional = true, features = ["rustc_1_51"] }
clap = { workspace = true, features = ["derive", "env"], optional = true }
env_logger = { workspace = true, optional = true }
liblzma = { workspace = true, optional = true }
sequoia-openpgp = { workspace = true, optional = true }

# workaround until xattr fixes its win32 compilation issues.
[target.'cfg(any(unix, macos))'.dependencies]
Expand Down
4 changes: 2 additions & 2 deletions common/src/utils/hex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ impl Hex<'_> {
}
}

impl<'a> Debug for Hex<'a> {
impl Debug for Hex<'_> {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
write!(f, "{self:x}")
}
}

impl<'a> LowerHex for Hex<'a> {
impl LowerHex for Hex<'_> {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
for b in self.0 {
write!(f, "{:02x}", b)?;
Expand Down
4 changes: 2 additions & 2 deletions common/src/validate/openpgp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ struct Helper<'a> {
keys: &'a [PublicKey],
}

impl<'a> VerificationHelper for Helper<'a> {
impl VerificationHelper for Helper<'_> {
fn get_certs(&mut self, _ids: &[KeyHandle]) -> sequoia_openpgp::Result<Vec<Cert>> {
Ok(self.keys.iter().flat_map(|k| k.certs.clone()).collect())
}
Expand Down Expand Up @@ -57,7 +57,7 @@ impl<'a> VerificationHelper for Helper<'a> {
#[derive(Debug)]
struct LoggingPolicy<'a>(pub StandardPolicy<'a>);

impl<'a> Policy for LoggingPolicy<'a> {
impl Policy for LoggingPolicy<'_> {
fn signature(&self, sig: &Signature, sec: HashAlgoSecurity) -> sequoia_openpgp::Result<()> {
self.0.signature(sig, sec)
}
Expand Down
63 changes: 32 additions & 31 deletions csaf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,41 +13,42 @@ readme = "../README.md"
rust-version = "1.79"

[dependencies]
anyhow = "1"
async-trait = "0.1"
bytes = "1"
chrono = { version = "0.4.24", default-features = false, features = ["serde"] }
csv = "1"
digest = "0.10.6"
fluent-uri = "0.3.2"
futures = "0.3"
hickory-resolver = { version = "0.24.0", features = ["tokio-runtime"] }
html-escape = "0.2.13"
humantime = "2"
log = "0.4.17"
percent-encoding = "2.3"
reqwest = { version = "0.12", features = ["json"] }
sectxtlib = "0.3.0"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
sha2 = "0.10.6"
thiserror = "2"
time = { version = "0.3.20", features = ["formatting", "parsing", "serde"] }
tokio = { version = "1", features = ["macros", "fs"] }
url = { version = "2.3.1", features = ["serde"] }
walkdir = "2.4"

walker-common = { version = "0.10.2", path = "../common", features = ["openpgp"] }

sequoia-openpgp = { version = "1", default-features = false }

csaf = { version = "0.5", default-features = false, optional = true }
# normal
anyhow = { workspace = true }
async-trait = { workspace = true }
bytes = { workspace = true }
chrono = { workspace = true, features = ["serde"] }
csv = { workspace = true }
digest = { workspace = true }
fluent-uri = { workspace = true }
futures = { workspace = true }
hickory-resolver = { workspace = true, features = ["tokio-runtime"] }
html-escape = { workspace = true }
humantime = { workspace = true }
log = { workspace = true }
percent-encoding = { workspace = true }
reqwest = { workspace = true, features = ["json"] }
sectxtlib = { workspace = true }
sequoia-openpgp = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
sha2 = { workspace = true }
thiserror = { workspace = true }
time = { workspace = true, features = ["formatting", "parsing", "serde"] }
tokio = { workspace = true, features = ["macros", "fs"] }
url = { workspace = true, features = ["serde"] }
walkdir = { workspace = true }

# optional
csaf = { workspace = true, optional = true }
# for csaf-validator-lib
deno_core = { version = "0.323.0", optional = true }
deno_core = { workspace = true, optional = true }

# internal
walker-common = { workspace = true, features = ["openpgp"] }

[dev-dependencies]
env_logger = "0.11.2"
env_logger = { workspace = true }

[features]
default = ["crypto-nettle", "csaf"]
Expand Down
35 changes: 19 additions & 16 deletions csaf/csaf-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,27 @@ readme = "README.md"
rust-version = "1.79"

[dependencies]
anyhow = "1"
clap = { version = "4.5.0", features = ["derive", "color"] }
colored_json = "5"
csaf = { version = "0.5.0", default-features = false }
flexible-time = "0.1.1"
humantime = "2"
log = "0.4.17"
reqwest = { version = "0.12", features = ["json"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tokio = { version = "1", features = ["full"] }

walker-common = { version = "0.10.2", path = "../../common", features = ["openpgp", "cli"] }
walker-extras = { version = "0.10.2", path = "../../extras" }
csaf-walker = { version = "0.10.2", path = "..", default-features = false, features = ["csaf"] }
# normal
anyhow = { workspace = true }
clap = { workspace = true, features = ["derive", "color"] }
colored_json = { workspace = true }
csaf = { workspace = true }
flexible-time = { workspace = true }
humantime = { workspace = true }
log = { workspace = true }
reqwest = { workspace = true, features = ["json"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
tokio = { workspace = true, features = ["full"] }

# optional
# just there for the feature
openssl = { version = "0.10", optional = true }
openssl = { workspace = true, optional = true }

# internal
csaf-walker = { workspace = true, features = ["csaf"] }
walker-common = { workspace = true, features = ["openpgp", "cli"] }
walker-extras = { workspace = true }

[features]
default = ["crypto-nettle"]
Expand Down
2 changes: 1 addition & 1 deletion csaf/src/report/render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ impl HtmlReport<'_> {
}
}

impl<'r> Display for HtmlReport<'r> {
impl Display for HtmlReport<'_> {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
self.render_total(f)?;
self.render_duplicates(f)?;
Expand Down
30 changes: 16 additions & 14 deletions extras/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,22 @@ readme = "../README.md"
rust-version = "1.79"

[dependencies]
anyhow = "1.0.71"
bytes = "1"
humantime = "2.1.0"
log = "0.4"
reqwest = "0.12"
thiserror = "2"
tokio = { version = "1", features = ["time"] }

clap = { version = "4.5.0", features = ["derive"], optional = true }

walker-common = { version = "0.10.2", path = "../common" }

csaf-walker = { version = "0.10.2", path = "../csaf", optional = true, default-features = false }
sbom-walker = { version = "0.10.2", path = "../sbom", optional = true, default-features = false }
# normal
anyhow = { workspace = true }
bytes = { workspace = true }
humantime = { workspace = true }
log = { workspace = true }
reqwest = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["time"] }

# optional
clap = { workspace = true, features = ["derive"], optional = true }

# internal
csaf-walker = { workspace = true, optional = true }
sbom-walker = { workspace = true, optional = true }
walker-common = { workspace = true }

[features]
default = [
Expand Down
46 changes: 24 additions & 22 deletions sbom/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,32 @@ readme = "../README.md"
rust-version = "1.79"

[dependencies]
anyhow = "1"
bytes = "1"
csv = "1"
digest = "0.10.6"
fluent-uri = "0.3.2"
futures = "0.3"
humantime = "2"
log = "0.4.17"
parking_lot = "0.12"
reqwest = { version = "0.12", features = ["json"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
sha2 = "0.10.6"
thiserror = "2"
time = { version = "0.3.20", features = ["formatting", "parsing", "serde"] }
tokio = { version = "1", features = ["macros", "fs"] }
url = { version = "2.3.1", features = ["serde"] }
# normal
anyhow = { workspace = true }
bytes = { workspace = true }
csv = { workspace = true }
digest = { workspace = true }
fluent-uri = { workspace = true }
futures = { workspace = true }
humantime = { workspace = true }
log = { workspace = true }
parking_lot = { workspace = true }
reqwest = { workspace = true, features = ["json"] }
sequoia-openpgp = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
sha2 = { workspace = true }
thiserror = { workspace = true }
time = { workspace = true, features = ["formatting", "parsing", "serde"] }
tokio = { workspace = true, features = ["macros", "fs"] }
url = { workspace = true, features = ["serde"] }

walker-common = { version = "0.10.2", path = "../common", features = ["openpgp"] }
# optional
cyclonedx-bom = { workspace = true, optional = true }
spdx-rs = { workspace = true, optional = true }

sequoia-openpgp = { version = "1", default-features = false }

cyclonedx-bom = { version = "0.8.0", optional = true }
spdx-rs = { version = "0.5.4", optional = true }
# internal
walker-common = { workspace = true, features = ["openpgp"] }

[features]
default = ["crypto-nettle", "cyclonedx-bom", "spdx-rs"]
Expand Down
Loading
Loading