Skip to content
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
8 changes: 8 additions & 0 deletions crates/uv-test/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1391,6 +1391,14 @@ impl TestContext {
command
}

/// Create a `uv audit` command with options shared across scenarios.
pub fn audit(&self) -> Command {
let mut command = self.new_command();
command.arg("audit");
self.add_shared_options(&mut command, false);
command
}

/// Create a `uv workspace metadata` command with options shared across scenarios.
pub fn workspace_metadata(&self) -> Command {
let mut command = self.new_command();
Expand Down
19 changes: 13 additions & 6 deletions crates/uv/src/commands/project/audit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ pub(crate) async fn audit(

// Determine the extras to include.
let default_extras = match &target {
LockTarget::Workspace(_) => DefaultExtras::default(),
LockTarget::Script(_) => DefaultExtras::default(),
LockTarget::Workspace(_) => DefaultExtras::All,
LockTarget::Script(_) => DefaultExtras::All,
};
let extras = extras.with_defaults(default_extras);

Expand Down Expand Up @@ -206,7 +206,7 @@ pub(crate) async fn audit(
.parse()
.expect("invalid OSV service URL");
let client = base_client.for_host(&osv_url).raw_client().clone();
let service = osv::Osv::new(client, None, concurrency);
let service = osv::Osv::new(client, Some(osv_url), concurrency);
trace!("Auditing {n} dependencies against OSV", n = auditable.len());
service.query_batch(&dependencies).await?
}
Expand Down Expand Up @@ -260,7 +260,16 @@ impl AuditResults {
writeln!(
self.printer.stderr(),
"Found {vuln_banner} and {status_banner} in {packages}",
packages = format!("{npackages} packages", npackages = self.n_packages).bold()
packages = format!(
"{npackages} {label}",
npackages = self.n_packages,
label = if self.n_packages == 1 {
"package"
} else {
"packages"
}
)
.bold()
)?;

let has_findings = !vulns.is_empty() || !statuses.is_empty();
Expand Down Expand Up @@ -318,8 +327,6 @@ impl AuditResults {
)?;
}
}

writeln!(self.printer.stdout_important())?;
}
}

Expand Down
6 changes: 3 additions & 3 deletions crates/uv/src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2548,14 +2548,14 @@ impl AuditSettings {
true,
),
groups: DependencyGroups::from_args(
true,
only_group.is_empty() && !only_dev,
no_dev,
only_dev,
vec![],
no_group,
no_default_groups,
only_group,
true,
only_group.clone(),
only_group.is_empty() && !only_dev,
),
lock_check: resolve_lock_check(locked),
frozen: resolve_frozen(frozen),
Expand Down
Loading
Loading