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
31 changes: 31 additions & 0 deletions crates/core/src/data_transport.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,37 @@ mod tests {
}
}

#[test]
fn transfer_error_display_includes_optional_source_without_changing_outcome() {
for state in [
DataTransferState::NotAccepted,
DataTransferState::ConfirmedFailure,
DataTransferState::OutcomeUnknown,
] {
let mut error = crate::Error::DataTransfer {
state,
message: "S3 request failed".to_string(),
source: None,
};
assert_eq!(
error.to_string(),
format!("Object data transfer {state}: S3 request failed")
);
if let crate::Error::DataTransfer { source, .. } = &mut error {
*source = Some(Box::new(crate::Error::Auth("access denied".to_string())));
}
assert_eq!(
error.to_string(),
format!(
"Object data transfer {state}: S3 request failed: Authentication failed: access denied"
)
);
assert_eq!(error.exit_code(), 4);
assert!(std::error::Error::source(&error).is_some());
assert!(!crate::is_retryable_error(&error));
}
}

#[test]
fn authoritative_error_retains_exit_code_and_cleanup_without_retry() {
let error = crate::Error::DataTransfer {
Expand Down
5 changes: 4 additions & 1 deletion crates/core/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,10 @@ pub enum Error {
Network(String),

/// An external data operation with explicit acceptance and outcome state.
#[error("Object data transfer {state}: {message}")]
#[error(
"Object data transfer {state}: {message}{cause}",
cause = .source.as_ref().map(|source| format!(": {source}")).unwrap_or_default()
)]
DataTransfer {
/// Acceptance and business outcome classification.
state: crate::DataTransferState,
Expand Down
Loading