Skip to content

Commit

Permalink
Merge pull request #781 from jpculp/dep-bump
Browse files Browse the repository at this point in the history
Update rust dependencies (including AWS SDK)
  • Loading branch information
jpculp authored Jul 17, 2024
2 parents eb5e25e + e24b541 commit a1cc6cb
Show file tree
Hide file tree
Showing 8 changed files with 358 additions and 309 deletions.
627 changes: 343 additions & 284 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ci: check-licenses build integ
# installs cargo-deny
.PHONY: cargo-deny
cargo-deny:
cargo install --version 0.14.1 cargo-deny --locked
cargo install --version 0.14.20 cargo-deny --locked

# checks each crate, and evaluates licenses. requires cargo-deny.
.PHONY: check-licenses
Expand Down
18 changes: 4 additions & 14 deletions deny.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
[licenses]
unlicensed = "deny"

# Deny licenses unless they are specifically listed here
copyleft = "deny"
allow-osi-fsf-free = "neither"
default = "deny"

# We want really high confidence when inferring licenses from text
confidence-threshold = 0.93

Expand Down Expand Up @@ -69,19 +62,16 @@ allow-wildcard-paths = true
skip = [
# some libraries are using an older version of base64
{ name = "base64", version = "=0.21" },
# http-test is using an old version of bstr
{ name = "bstr", version = "=0.2" },
# num_cpus and clap is using old versions of hermit-abi
{ name = "hermit-abi" },
# heck duplicates
{ name = "heck", version = "=0.4" },
# the aws rust sdk is using an older version of http
{ name = "http", version = "=0.2" },
# clap and other crates use an old version of syn
{ name = "http-body", version = "=0.4" },
# noxious and other crates use an old version of syn
{ name = "syn", version = "=1" },
# several dependencies are using an old version of bitflags
{ name = "bitflags", version = "=1.3" },
# several dependencies are using an old version of regex-automata
{ name = "regex-automata", version = "=0.4" },
{ name = "regex-syntax", version = "=0.6" },
# noxious, used for testing, is using an old version of tokio-util
{ name = "tokio-util", version = "=0.6.10" },
# tokio and mio are bringing in older versions of windows libraries while other
Expand Down
10 changes: 5 additions & 5 deletions integ/failure-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ license = "MIT OR Apache-2.0"

[dependencies]
axum = "0.6"
anyhow = "1.0"
noxious-client = "1.0"
anyhow = "1"
noxious-client = "1"
rand = "0.8"
serde_json = "1.0"
tempfile = "3.8"
tokio = "1.0"
serde_json = "1"
tempfile = "3"
tokio = "1"
tokio-retry = "0.3"
tower = { version = "0.4", features = ["util"] }
tower-fault = "0.0.5"
Expand Down
2 changes: 1 addition & 1 deletion tough-kms/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use aws_sdk_kms::Client as KmsClient;

/// Builds a KMS client for a given profile name.
pub(crate) async fn build_client_kms(profile: Option<&str>) -> KmsClient {
let config = aws_config::defaults(BehaviorVersion::v2023_11_09());
let config = aws_config::defaults(BehaviorVersion::v2024_03_28());
let client_config = if let Some(profile) = profile {
let region = DefaultRegionChain::builder()
.profile_name(profile)
Expand Down
4 changes: 2 additions & 2 deletions tough-kms/tests/test_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ pub fn mock_client(data_files: Vec<&str>) -> Client {
let conn = StaticReplayClient::new(events);

let conf = Config::builder()
.behavior_version(BehaviorVersion::v2023_11_09())
.behavior_version(BehaviorVersion::v2024_03_28())
.credentials_provider(creds)
.region(Region::new("us-east-1"))
.http_client(conn)
Expand Down Expand Up @@ -84,7 +84,7 @@ pub fn mock_client_with_status(status: u16) -> Client {
let conn = StaticReplayClient::new(events);

let conf = aws_sdk_kms::Config::builder()
.behavior_version(BehaviorVersion::v2023_11_09())
.behavior_version(BehaviorVersion::v2024_03_28())
.credentials_provider(creds)
.region(Region::new("us-east-1"))
.http_client(conn)
Expand Down
2 changes: 1 addition & 1 deletion tough-ssm/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pub(crate) fn build_client(profile: Option<&str>) -> Result<SsmClient> {
}

async fn async_build_client(profile: Option<String>) -> SsmClient {
let config = aws_config::defaults(BehaviorVersion::v2023_11_09());
let config = aws_config::defaults(BehaviorVersion::v2024_03_28());
let client_config = if let Some(profile) = profile {
let region = DefaultRegionChain::builder()
.profile_name(&profile)
Expand Down
2 changes: 1 addition & 1 deletion tough/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ snafu = { version = "0.8", features = ["futures"] }
tempfile = "3"
tokio = { version = "1", default-features = false, features = ["io-util", "sync", "fs", "rt", "time"] }
tokio-util = { version = "0.7", features = ["io"] }
typed-path = "0.7"
typed-path = "0.9"
untrusted = "0.9"
url = "2"
walkdir = "2"
Expand Down

0 comments on commit a1cc6cb

Please sign in to comment.