8000 crates/common: fix error checking in Gcs fetcher impl, check request error in CachingDownloader by twitchyliquid64 · Pull Request #86 · gominimal/minimal · GitHub
[go: up one dir, main page]
Skip to content

crates/common: fix error checking in Gcs fetcher impl, check request error in CachingDownloader #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
twitchyliquid64 merged 1 commit into from
Apr 1, 2026
Merged

crates/common: fix error checking in Gcs fetcher impl, check request error in CachingDownloader #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion crates/common/src/fetchers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,10 @@ impl FetchResponse for Result<google_cloud_storage::read_object::ReadObjectRespo
self.is_ok()
}
fn error_for_status(self) -> Result<Self, Self::Error> {
Ok(self)
match self {
Ok(_) => Ok(self),
Err(e) => Err(e),
}
}

async fn bytes(self) -> Result<Bytes, Self::Error> {
Expand Down
4 changes: 3 additions & 1 deletion crates/common/src/file_cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::Tee;
use crate::fetchers::{self, FetchUrl};
use crate::fetchers::{self, FetchResponse, FetchUrl};

use either::Either;
use ot::OpTracker;
Expand Down Expand Up @@ -227,6 +227,8 @@ impl<B: fetchers::FetchBackend> CachingDownloader<B> 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
Expand Down
0