Skip to content

Commit

Permalink
Update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
rukai committed Sep 1, 2024
1 parent 149dc70 commit 8190f0f
Show file tree
Hide file tree
Showing 8 changed files with 425 additions and 357 deletions.
758 changes: 415 additions & 343 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ bytes = { version = "1.0.0", features = ["serde"] }
tokio = { version = "1.25.0", features = ["full"] }
tokio-util = { version = "0.7.7", features = ["codec"] }
tokio-openssl = "0.6.2"
itertools = "0.12.0"
itertools = "0.13.0"
openssl = { version = "0.10.36", features = ["vendored"] }
anyhow = "1.0.76"
serde = { version = "1.0.111", features = ["derive"] }
Expand Down Expand Up @@ -55,5 +55,5 @@ typetag = "0.2.5"
aws-throwaway = { version = "0.6.0", default-features = false }
tokio-bin-process = "0.5.0"
ordered-float = { version = "4.0.0", features = ["serde"] }
shell-quote = { default-features = false, version = "0.5.0" }
shell-quote = { default-features = false, features = ["bash"], version = "0.7.0" }
pretty_assertions = "1.4.0"
2 changes: 1 addition & 1 deletion ec2-cargo/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ AWS_ACCESS_KEY_ID={} AWS_SECRET_ACCESS_KEY={} cargo {command} {args} 2>&1
fn process_args(mut args: Vec<String>) -> String {
args.remove(0);
args.iter()
.map(|x| String::from_utf8(shell_quote::Bash::quote(x)).unwrap())
.map(|x| String::from_utf8(shell_quote::Bash::quote_vec(x)).unwrap())
.collect::<Vec<_>>()
.join(" ")
}
Expand Down
6 changes: 3 additions & 3 deletions shotover-proxy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ anyhow.workspace = true
tokio.workspace = true
tracing.workspace = true
clap.workspace = true
rstest = "0.19.0"
rstest_reuse = "0.6.0"
rstest = "0.22.0"
rstest_reuse = "0.7.0"
cassandra-cpp = { version = "3.0.0", default-features = false }
test-helpers = { path = "../test-helpers" }
redis.workspace = true
Expand Down Expand Up @@ -48,7 +48,7 @@ rustls-pki-types = "1.1.0"
aws-throwaway.workspace = true
windsock = "0.1.0"
regex = "1.7.0"
opensearch = "2.1.0"
opensearch = { version = "2.1.0", default-features = false, features = ["rustls-tls"] }
serde_json = "1.0.103"
time = { version = "0.3.25" }
shell-quote.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion shotover-proxy/benches/windsock/cloud/aws.rs
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ sudo docker system prune -af"#,
let mut env_args = String::new();
for (key, value) in envs {
let key_value =
String::from_utf8(shell_quote::Bash::quote(&format!("{key}={value}"))).unwrap();
String::from_utf8(shell_quote::Bash::quote_vec(&format!("{key}={value}"))).unwrap();
env_args.push_str(&format!(" -e {key_value}"))
}
let output = self
Expand Down
6 changes: 1 addition & 5 deletions shotover/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ cassandra = [
"dep:aws-config",
"dep:base64",
"dep:serde_json",
"dep:halfbrown",
"dep:chacha20poly1305",
"dep:generic-array",
"dep:hex",
Expand All @@ -32,7 +31,6 @@ kafka = [
"dep:kafka-protocol",
"dep:dashmap",
"dep:xxhash-rust",
"dep:string",
"dep:base64",
"dep:sasl",
]
Expand All @@ -54,7 +52,7 @@ axum = { version = "0.7", default-features = false, features = ["tokio", "tracin
pretty-hex = "0.4.0"
tokio-stream = "0.1.2"
derivative = "2.1.1"
cached = { version = "0.51", features = ["async"], optional = true }
cached = { version = "0.53", features = ["async"], optional = true }
governor = { version = "0.6", default-features = false, features = ["std", "jitter", "quanta"] }
nonzero_ext = "0.3.0"
version-compare = { version = "0.2", optional = true }
Expand Down Expand Up @@ -105,7 +103,6 @@ metrics-exporter-prometheus = { version = "0.15.0", default-features = false }
tracing.workspace = true
tracing-subscriber.workspace = true
tracing-appender.workspace = true
halfbrown = { version = "0.2.1", optional = true }

# Transform dependencies
redis-protocol = { workspace = true, optional = true }
Expand All @@ -123,7 +120,6 @@ rustls = { version = "0.23.0", default-features = false, features = ["tls12"] }
tokio-rustls = { version = "0.26", default-features = false, features = ["ring"] }
rustls-pemfile = "2.0.0"
rustls-pki-types = "1.0.1"
string = { version = "0.3.0", optional = true }
xxhash-rust = { version = "0.8.6", features = ["xxh3"], optional = true }
dashmap = { version = "6.0.0", optional = true }
atoi = { version = "2.0.0", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion shotover/src/tls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ impl TlsConnector {
}

#[derive(Debug)]
pub struct SkipVerifyHostName {
struct SkipVerifyHostName {
verifier: Arc<WebPkiServerVerifier>,
}

Expand Down
2 changes: 1 addition & 1 deletion windsock-cloud-docker/src/container.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ unzip awscliv2.zip
if x.is_empty() {
String::from("''")
} else {
String::from_utf8(shell_quote::Bash::quote(&x)).unwrap()
String::from_utf8(shell_quote::Bash::quote_vec(&x)).unwrap()
}
})
.collect();
Expand Down

0 comments on commit 8190f0f

Please sign in to comment.