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
6 changes: 6 additions & 0 deletions src/uploader/interfaces.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,9 @@ pub struct UploadData {
pub upload_url: String,
pub run_id: String,
}

#[derive(Deserialize, Debug)]
#[serde(rename_all = "camelCase")]
pub struct UploadError {
pub error: String,
}
13 changes: 9 additions & 4 deletions src/uploader/upload.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::{
ci_provider::CIProvider, config::Config, prelude::*, request_client::REQUEST_CLIENT,
runner::RunData,
runner::RunData, uploader::UploadError,
};
use async_compression::tokio::write::GzipEncoder;
use base64::{engine::general_purpose, Engine as _};
Expand Down Expand Up @@ -41,10 +41,15 @@ async fn retrieve_upload_data(
match response {
Ok(response) => {
if response.status().is_client_error() {
let status = response.status();
let text = response.text().await?;
let error_message = serde_json::from_str::<UploadError>(&text)
.map(|body| body.error)
.unwrap_or(text);
bail!(
"Failed to retrieve upload data: {} {}",
response.status(),
response.text().await?
"Failed to retrieve upload data: {}\n{}",
status,
error_message
);
}

Expand Down