Skip to content

Record the integration during errors #94

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.

Sign up for GitHub

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Record the integration during errors #94

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 22 additions & 4 deletions src/subcommand/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,23 @@ pub enum Error {
DownloadFossaCli,

/// If we fail to run FOSSA CLI, this error is raised.
#[error("run FOSSA CLI")]
RunFossaCli,
#[error("run FOSSA CLI for '{integration}' at '{reference}'")]
RunFossaCli {
/// The integration being analyzed.
integration: Integration,

/// The reference being analyzed in the integration.
reference: Reference,
},
}

impl Error {
fn run_fossa_cli(integration: &Integration, reference: &Reference) -> Self {
Self::RunFossaCli {
integration: integration.to_owned(),
reference: reference.to_owned(),
}
}
}

/// Similar to [`AppContext`], but scoped for this subcommand.
Expand Down Expand Up @@ -353,14 +368,17 @@ async fn scan_git_reference<D: Database>(
.change_context_lazy(|| Error::CloneReference(job.reference.clone()))?;

// Record the CLI version for debugging purposes.
let cli_version = cli.version().await.change_context(Error::RunFossaCli)?;
let cli_version = cli
.version()
.await
.change_context_lazy(|| Error::run_fossa_cli(&job.integration, &job.reference))?;
span_record!(cli_version, display cli_version);

// Run the scan.
let source_units = cli
.analyze(&job.scan_id, cloned_location.path())
.await
.change_context(Error::RunFossaCli)?;
.change_context_lazy(|| Error::run_fossa_cli(&job.integration, &job.reference))?;

info!("Scanned '{}' at '{}'", job.integration, job.reference);
Ok(UploadSourceUnits {
Expand Down