mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-08-22 08:02:19 +00:00
more verbose s3 errors
This commit is contained in:
@@ -1 +1 @@
|
||||
138a4f5f868f3bded5bb7cb77b222b532c07e4af
|
||||
d259afd037f6497695e080e497134eaf4e50c8d1
|
||||
@@ -963,7 +963,7 @@ async fn route_job(
|
||||
|
||||
let s3_object = s3_object.map_err(|err| {
|
||||
tracing::warn!("Error retrieving file from S3: {:?}", err);
|
||||
Error::internal_err(format!("Error retrieving file: {}", err.to_string()))
|
||||
Error::internal_err(format!("Error retrieving file: {:?}", err))
|
||||
})?;
|
||||
|
||||
let mut response_headers = http::HeaderMap::new();
|
||||
|
||||
@@ -793,8 +793,8 @@ pub async fn build_s3_client(s3_resource_ref: &S3Resource) -> error::Result<Arc<
|
||||
let store = store_builder.build().map_err(|err| {
|
||||
tracing::error!("Error building object store client: {:?}", err);
|
||||
error::Error::internal_err(format!(
|
||||
"Error building object store client: {}",
|
||||
err.to_string()
|
||||
"Error building object store client: {:?}",
|
||||
err
|
||||
))
|
||||
})?;
|
||||
|
||||
@@ -860,8 +860,8 @@ fn build_azure_blob_client(
|
||||
let store = store_builder.build().map_err(|err| {
|
||||
tracing::error!("Error building object store client: {:?}", err);
|
||||
error::Error::internal_err(format!(
|
||||
"Error building object store client: {}",
|
||||
err.to_string()
|
||||
"Error building object store client: {:?}",
|
||||
err
|
||||
))
|
||||
})?;
|
||||
|
||||
@@ -900,8 +900,8 @@ async fn build_gcs_client(gcs_resource_ref: &GcsResource) -> error::Result<Arc<d
|
||||
.map_err(|err| {
|
||||
tracing::error!("Error building GCS object store client: {:?}", err);
|
||||
error::Error::internal_err(format!(
|
||||
"Error building GCS object store client: {}",
|
||||
err.to_string()
|
||||
"Error building GCS object store client: {:?}",
|
||||
err
|
||||
))
|
||||
})?;
|
||||
|
||||
@@ -1257,21 +1257,21 @@ pub fn lfs_to_object_store_resource(
|
||||
match lfs {
|
||||
LargeFileStorage::S3Storage(_) | LargeFileStorage::S3AwsOidc(_) => {
|
||||
let s3_resource: S3Resource = serde_json::from_value(resource_value).map_err(|e| {
|
||||
error::Error::internal_err(format!("Error parsing S3 resource: {}", e))
|
||||
error::Error::internal_err(format!("Error parsing S3 resource: {e:?}"))
|
||||
})?;
|
||||
Ok(ObjectStoreResource::S3(s3_resource))
|
||||
}
|
||||
LargeFileStorage::AzureBlobStorage(_) | LargeFileStorage::AzureWorkloadIdentity(_) => {
|
||||
let azure_blob_resource: AzureBlobResource = serde_json::from_value(resource_value)
|
||||
.map_err(|e| {
|
||||
error::Error::internal_err(format!("Error parsing Azure Blob resource: {}", e))
|
||||
error::Error::internal_err(format!("Error parsing Azure Blob resource: {e:?}"))
|
||||
})?;
|
||||
Ok(ObjectStoreResource::Azure(azure_blob_resource))
|
||||
}
|
||||
LargeFileStorage::GoogleCloudStorage(_) => {
|
||||
let gcs_resource: GcsResource =
|
||||
serde_json::from_value(resource_value).map_err(|e| {
|
||||
error::Error::internal_err(format!("Error parsing GCS resource: {}", e))
|
||||
error::Error::internal_err(format!("Error parsing GCS resource: {e:?}"))
|
||||
})?;
|
||||
Ok(ObjectStoreResource::Gcs(gcs_resource))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user