Update deps

Cargo.toml

@@ -53,3 +53,4 @@ clap = { version = "4.0.4", features = ["cargo", "derive"] }
 async-trait = "0.1.30"
 typetag = "0.2.5"
 aws-throwaway = "0.1.1"
+tokio-bin-process = "0.3.0"

custom-transforms-example/tests/test.rs

@@ -49,6 +49,7 @@ async fn shotover_proxy(topology_path: &str) -> BinProcess {
  &EventMatcher::new()
  .with_level(Level::Info)
  .with_message("Shotover is now accepting inbound connections"),
+ &[],
  ),
  )
  .await

ec2-cargo/Cargo.toml

@@ -15,4 +15,4 @@ aws-throwaway.workspace = true
 tracing-appender.workspace = true
 shellfish = { version = "0.8.0", features = ["async"] }
 rustyline = "11.0.0"
-cargo_metadata = "0.15.4"
+cargo_metadata = "0.17.0"

shotover-proxy/Cargo.toml

@@ -44,7 +44,7 @@ tracing-subscriber.workspace = true
 tracing-appender.workspace = true
 async-once-cell = "0.5.2"
 fred = { version = "6.3.0", features = ["enable-rustls"] }
-tokio-bin-process = "0.2.0"
+tokio-bin-process.workspace = true
 rustls-pemfile = "1.0.2"
 aws-throwaway.workspace = true
 windsock = { path = "../windsock" }

shotover-proxy/tests/redis_int_tests/mod.rs

@@ -170,6 +170,12 @@ async fn cluster_ports_rewrite() {
 async fn multi() {
  let _compose = docker_compose("tests/test-configs/redis-multi/docker-compose.yaml");
  let shotover = shotover_process("tests/test-configs/redis-multi/topology.yaml")
+ .expect_startup_events(vec![EventMatcher::new()
+ .with_level(Level::Warn)
+ .with_target("shotover::transforms::distributed::tuneable_consistency_scatter")
+ .with_message(
+ "Using this transform is considered unstable - Does not work with REDIS pipelines",
+ )])
  .start()
  .await;
  let mut connection = redis_connection::new_async("127.0.0.1", 6379).await;

shotover/Cargo.toml

@@ -33,14 +33,14 @@ bytes.workspace = true
 futures.workspace = true
 tokio.workspace = true
 tokio-util.workspace = true
-tokio-openssl.workspace = true
-openssl.workspace = true
 csv.workspace = true
 hex.workspace = true
 hex-literal.workspace = true
 async-trait.workspace = true
 typetag.workspace = true
 tokio-tungstenite = "0.20.0"
+# We need to enable the openssl "vendor" feature for rusoto
+openssl.workspace = true
 
 # Error handling
 thiserror = "1.0"
@@ -89,7 +89,6 @@ kafka-protocol = "0.6.0"
 rustls = { version = "0.21.0", features = ["dangerous_configuration"] }
 tokio-rustls = "0.24"
 rustls-pemfile = "1.0.2"
-rustls-webpki = "0.101.1"
 string = "0.3.0"
 xxhash-rust = { version = "0.8.6", features = ["xxh3"] }
 dashmap = "5.4.0"

test-helpers/Cargo.toml

@@ -12,7 +12,7 @@ cassandra-cpp-driver-tests = ["cassandra-cpp"]
 [dependencies]
 tracing.workspace = true
 subprocess.workspace = true
-tokio-bin-process = "0.2.0"
+tokio-bin-process.workspace = true
 cdrs-tokio.workspace = true
 cassandra-protocol.workspace = true
 cassandra-cpp = { version = "2.0.0", optional = true }

test-helpers/src/shotover_process.rs

@@ -14,6 +14,7 @@ pub struct ShotoverProcessBuilder {
  cores: Option<String>,
  profile: Option<String>,
  observability_port: Option<u16>,
+ event_matchers: Vec<EventMatcher>,
 }
 
 impl ShotoverProcessBuilder {
@@ -25,6 +26,7 @@ impl ShotoverProcessBuilder {
  cores: None,
  profile: None,
  observability_port: None,
+ event_matchers: vec![],
  }
  }
 
@@ -55,6 +57,11 @@ impl ShotoverProcessBuilder {
  self
  }
 
+ pub fn expect_startup_events(mut self, matchers: Vec<EventMatcher>) -> Self {
+ self.event_matchers = matchers;
+ self
+ }
+
  pub async fn start(&self) -> BinProcess {
  let mut shotover = self.start_inner().await;
 
@@ -64,6 +71,7 @@ impl ShotoverProcessBuilder {
  &EventMatcher::new()
  .with_level(Level::Info)
  .with_message("Shotover is now accepting inbound connections"),
+ &self.event_matchers,
  ),
  )
  .await