From 56007207d7db0eaa832376a187f4b504110f9c5b Mon Sep 17 00:00:00 2001 From: Daniel Elsner Date: Sun, 12 Jan 2025 18:48:09 +0100 Subject: [PATCH] Adjust error messages --- crates/rattler_networking/src/s3_middleware.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/crates/rattler_networking/src/s3_middleware.rs b/crates/rattler_networking/src/s3_middleware.rs index a4ad63cf5..66dde00b2 100644 --- a/crates/rattler_networking/src/s3_middleware.rs +++ b/crates/rattler_networking/src/s3_middleware.rs @@ -100,7 +100,7 @@ impl S3 { )) } (_, Some(_)) => { - return Err(anyhow::anyhow!("Unsupported authentication method")); + return Err(anyhow::anyhow!("unsupported authentication method")); } (_, None) => { tracing::info!("No authentication found, assuming bucket is public"); @@ -153,15 +153,10 @@ impl S3 { let bucket_name = url.host_str().ok_or_else(|| { reqwest_middleware::Error::middleware(std::io::Error::new( std::io::ErrorKind::Other, - "Host should be present in S3 URL", - )) - })?; - let key = url.path().strip_prefix("/").ok_or_else(|| { - reqwest_middleware::Error::middleware(std::io::Error::new( - std::io::ErrorKind::Other, - "Missing prefix", + "host should be present in S3 URL", )) })?; + let key = url.path().strip_prefix("/").unwrap(); let builder = client.get_object().bucket(bucket_name).key(key);