Skip to content

Commit

Permalink
update a lot of dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
pcrumley committed Mar 27, 2024
1 parent 59792e3 commit c0cd53f
Show file tree
Hide file tree
Showing 9 changed files with 414 additions and 195 deletions.
577 changes: 397 additions & 180 deletions Cargo.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
members = ["crates/esthri", "crates/esthri-internals", "crates/esthri-cli", "crates/esthri-test"]

[workspace.dependencies]
aws-sdk-s3 = "1.17.0"
aws-types = "1.1.7"
aws-config = { version = "1.1.7", features = ["behavior-version-latest"]}
aws-smithy-runtime = "1.1.7"
aws-sdk-s3 = "1.21.0"
aws-types = "1.1.8"
aws-config = { version = "1.1.9", features = ["behavior-version-latest"]}
aws-smithy-runtime = "1.1.8"
hyper = "0.14.28" # hyper 0.14 is the version used in the aws-smithy-runtime api. Can't upgrade to "1" until smithy-runtime does


Expand Down
2 changes: 1 addition & 1 deletion clippy.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
msrv = "1.72.0"
msrv = "1.74.0"

4 changes: 2 additions & 2 deletions crates/esthri-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ anyhow = { version = "1", features = ["backtrace"] }
async-compression = { version = "0.4", features = ["gzip", "tokio"] }
async_zip = { version = "0.0.16", features = ["deflate", "tokio"] }
async-stream = "0.3"
bytes = "1.5"
bytes = "1.6"
derive_builder = "0.20.0"
env_logger = "0.11"
futures = { version = "0.3", default-features = false }
Expand All @@ -46,7 +46,7 @@ mime_guess = "2.0"
once_cell = "1.19"
sanitize-filename = "0.5"
serde = "1"
clap = { version = "4.5.1", features = ["derive", "env"] }
clap = { version = "4.5.4", features = ["derive", "env"] }
tokio = { version = "1.36.0", features = ["rt-multi-thread", "signal", "sync"] }
tokio-util = { version = "0.7.10", features = ["compat", "codec"] }
warp = "0.3"
Expand Down
1 change: 1 addition & 0 deletions crates/esthri-internals/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ aggressive_lint = []
blocking = []

[dependencies]
http = "1"
hyper = { workspace = true }
[dependencies.hyper-tls]
version = "0.5"
Expand Down
1 change: 1 addition & 0 deletions crates/esthri-internals/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#![cfg_attr(feature = "aggressive_lint", deny(warnings))]

pub use http;
pub use hyper;

use hyper::client::connect::HttpConnector;
Expand Down
2 changes: 1 addition & 1 deletion crates/esthri-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ hyper = { workspace = true }
md-5 = "0.10.6"
once_cell = "1.19"
tempdir = "0.3"
uuid = { version="1.7.0", features=["v4"] }
uuid = { version="1.8.0", features=["v4"] }
fs_extra = "1.3.0"
tokio = "1.36.0"
futures = "0.3"
Expand Down
10 changes: 5 additions & 5 deletions crates/esthri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ tempfile = "3"
thiserror = "1"
tokio = { version = "1.36.0", features = ["fs", "io-util", "sync", "parking_lot", "rt", "macros"] }
tokio-retry = "0.3"
tokio-stream = "0.1.14"
tokio-stream = "0.1.15"
tokio-util = { version = "0.7.10", features = ["io"] }
walkdir = "2"
strum = "0.26.1"
strum_macros = "0.26.1"
reqwest = { version="0.11.24", features=["stream", "json"], default-features = false }
strum = "0.26.2"
strum_macros = "0.26.2"
reqwest = { version="0.12.2", features=["stream", "json"], default-features = false }
serde-tuple-vec-map = "1.0.1"

aws-sdk-s3 = { workspace = true }
Expand All @@ -62,4 +62,4 @@ tar = "0.4"
tempdir = "0.3"
backtrace = "0.3"
fs_extra = "1.3"
assert_cmd = "2.0.13"
assert_cmd = "2.0.14"
4 changes: 2 additions & 2 deletions crates/esthri/src/presign/upload.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@

use std::{path::Path, time::Duration};

use esthri_internals::hyper::HeaderMap;
use esthri_internals::http::header::{HeaderMap, CONTENT_LENGTH};

use aws_sdk_s3::error::SdkError;
use aws_sdk_s3::presigning::PresigningConfig;
use aws_sdk_s3::types::ObjectCannedAcl;
use aws_sdk_s3::Client as S3Client;
use reqwest::{header::CONTENT_LENGTH, Body, Client as HttpClient};
use reqwest::{Body, Client as HttpClient};
use tokio_util::codec::{BytesCodec, FramedRead};

use crate::{compression::compressed_meta_value, opts::EsthriPutOptParams, Error, Result};
Expand Down

0 comments on commit c0cd53f

Please sign in to comment.