Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: update object_store to fix credentials client (#5359) 

* chore: update object_store to fix credentials client

* chore: Run cargo hakari tasks

Co-authored-by: CircleCI[bot] <circleci@influxdata.com>
pull/24376/head
Raphael Taylor-Davies 2022-08-09 14:17:43 +01:00 committed by GitHub
parent b21799acae
commit dadcc369b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -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",

2
Cargo.toml
View File

@ -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" }
object_store = { git = 'https://github.com/tustvold/arrow-rs.git', rev = "10ffea5806fb6d2ce016ca6680cdfe41648e548e", package = "object_store" }

3
clap_blocks/src/object_store.rs
View File

@ -280,8 +280,7 @@ fn new_gcs(_: &ObjectStoreConfig) -> Result<Arc<DynObjectStore>, ParseError> {
#[cfg(feature = "aws")]
fn new_s3(config: &ObjectStoreConfig) -> Result<Arc<DynObjectStore>, 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 {

2
workspace-hack/Cargo.toml
View File

@ -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"] }