diff --git a/Cargo.lock b/Cargo.lock index a1479e7dfe..84d0242c19 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3031,7 +3031,7 @@ dependencies = [ [[package]] name = "object_store" version = "0.3.0" -source = "git+https://github.com/tustvold/arrow-rs.git?rev=d1e694b4949c36a3dd5cfadb5ed35dc40c8903f9#d1e694b4949c36a3dd5cfadb5ed35dc40c8903f9" +source = "git+https://github.com/tustvold/arrow-rs.git?rev=10ffea5806fb6d2ce016ca6680cdfe41648e548e#10ffea5806fb6d2ce016ca6680cdfe41648e548e" dependencies = [ "async-trait", "azure_core", diff --git a/Cargo.toml b/Cargo.toml index 18d58ee0e6..f4564a22b7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -118,4 +118,4 @@ incremental = true [patch.crates-io] # remove and bump object_store dep version once this revision is released. -object_store = { git = 'https://github.com/tustvold/arrow-rs.git', rev = "d1e694b4949c36a3dd5cfadb5ed35dc40c8903f9", package = "object_store" } \ No newline at end of file +object_store = { git = 'https://github.com/tustvold/arrow-rs.git', rev = "10ffea5806fb6d2ce016ca6680cdfe41648e548e", package = "object_store" } \ No newline at end of file diff --git a/clap_blocks/src/object_store.rs b/clap_blocks/src/object_store.rs index f5a15df3db..eb65d0d3b8 100644 --- a/clap_blocks/src/object_store.rs +++ b/clap_blocks/src/object_store.rs @@ -280,8 +280,7 @@ fn new_gcs(_: &ObjectStoreConfig) -> Result, ParseError> { #[cfg(feature = "aws")] fn new_s3(config: &ObjectStoreConfig) -> Result, ParseError> { let mut builder = AmazonS3Builder::new() - // TODO: Temporary fix - .with_allow_http(true) + .with_allow_http(config.aws_allow_http) .with_region(&config.aws_default_region); if let Some(bucket) = &config.bucket { diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 2841dbf7c3..22505059bc 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -42,7 +42,7 @@ memchr = { version = "2", features = ["std"] } nom = { version = "7", features = ["alloc", "std"] } num-integer = { version = "0.1", default-features = false, features = ["i128", "std"] } num-traits = { version = "0.2", features = ["i128", "libm", "std"] } -object_store = { git = "https://github.com/tustvold/arrow-rs.git", rev = "d1e694b4949c36a3dd5cfadb5ed35dc40c8903f9", default-features = false, features = ["aws", "azure", "azure_core", "azure_storage", "azure_storage_blobs", "base64", "gcp", "quick-xml", "rand", "reqwest", "ring", "rustls-pemfile", "serde", "serde_json"] } +object_store = { git = "https://github.com/tustvold/arrow-rs.git", rev = "10ffea5806fb6d2ce016ca6680cdfe41648e548e", default-features = false, features = ["aws", "azure", "azure_core", "azure_storage", "azure_storage_blobs", "base64", "gcp", "quick-xml", "rand", "reqwest", "ring", "rustls-pemfile", "serde", "serde_json"] } once_cell = { version = "1", features = ["alloc", "parking_lot", "parking_lot_core", "race", "std"] } parquet = { version = "19", features = ["arrow", "async", "base64", "brotli", "experimental", "flate2", "futures", "lz4", "snap", "tokio", "zstd"] } predicates = { version = "2", features = ["diff", "difflib", "float-cmp", "normalize-line-endings", "regex"] }