From e575de430a89085a3af8d9ac3de2ae36dfddd91e Mon Sep 17 00:00:00 2001 From: Tom Date: Tue, 31 Mar 2026 21:31:49 -0700 Subject: [PATCH] crates/common: fix error checking in Gcs fetcher impl, check request error in CachingDownloader --- crates/common/src/fetchers.rs | 5 ++++- crates/common/src/file_cache.rs | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/crates/common/src/fetchers.rs b/crates/common/src/fetchers.rs index 219e25cce4..0c9dff2493 100644 --- a/crates/common/src/fetchers.rs +++ b/crates/common/src/fetchers.rs @@ -182,7 +182,10 @@ impl FetchResponse for Result Result { - Ok(self) + match self { + Ok(_) => Ok(self), + Err(e) => Err(e), + } } async fn bytes(self) -> Result { diff --git a/crates/common/src/file_cache.rs b/crates/common/src/file_cache.rs index 3dce65dc53..3e2a0470b5 100644 --- a/crates/common/src/file_cache.rs +++ b/crates/common/src/file_cache.rs @@ -1,5 +1,5 @@ use crate::Tee; -use crate::fetchers::{self, FetchUrl}; +use crate::fetchers::{self, FetchResponse, FetchUrl}; use either::Either; use ot::OpTracker; @@ -227,6 +227,8 @@ impl CachingDownloader for (&B, &FileCache) { .0 .execute(self.0.get(url).map_err(Either::Right)?) .await + .map_err(Either::Right)? + .error_for_status() .map_err(Either::Right)?; self.1.write_through(&filename, sha256, &mut r, op).await