Skip to content

Commit

Permalink
storage: Use old http crate for HTTP header imports
Browse files Browse the repository at this point in the history
The `object_store` crate unfortunately does not re-export the `http` types that we need for the `with_default_headers()` calls and it is (via `reqwest`) still relying on the v0.2 version of the `http` crate. Since this blocks us from upgrading the `reqwest` dependency ourselves we'll explicitly add the dependency for now until `object_store` is updated to the most recent version of `reqwest` and `http`.
  • Loading branch information
Turbo87 committed Apr 22, 2024
1 parent c8c74f1 commit 8e6d6cc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ minijinja = "=1.0.20"
mockall = "=0.12.1"
oauth2 = { version = "=4.4.2", default-features = false, features = ["reqwest"] }
object_store = { version = "=0.9.1", features = ["aws"] }
object_store_http = { package = "http", version = "=0.2.12" }
once_cell = "=1.19.0"
p256 = "=0.13.2"
parking_lot = "=0.12.1"
Expand Down
4 changes: 2 additions & 2 deletions src/storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use object_store::memory::InMemory;
use object_store::path::Path;
use object_store::prefix::PrefixStore;
use object_store::{ClientOptions, ObjectStore, Result};
use reqwest::header::CACHE_CONTROL;
use reqwest::header::{HeaderMap, HeaderValue};
use object_store_http::header::CACHE_CONTROL;
use object_store_http::header::{HeaderMap, HeaderValue};
use secrecy::{ExposeSecret, SecretString};
use std::fs;
use std::path::PathBuf;
Expand Down

0 comments on commit 8e6d6cc

Please sign in to comment.