Update redis-protocol and other crates (#1855)

Cargo.toml

@@ -44,7 +44,7 @@ rcgen = "0.13.0"
 subprocess = "0.2.7"
 chacha20poly1305 = { version = "0.10.0", features = ["std"] }
 csv = "1.2.0"
-redis-protocol = { version = "5.0.0", features = ["bytes"] }
+redis-protocol = { version = "6.0.0", features = ["bytes"] }
 bincode = "1.3.1"
 futures = "0.3"
 hex = "0.4.3"

ec2-cargo/Cargo.toml

@@ -14,5 +14,5 @@ tracing-subscriber.workspace = true
 aws-throwaway.workspace = true
 tracing-appender.workspace = true
 shellfish = { version = "0.10.0", features = ["async"] }
-cargo_metadata = "0.18.0"
+cargo_metadata = "0.19.0"
 shell-quote.workspace = true

shotover-proxy/Cargo.toml

@@ -37,7 +37,7 @@ rand.workspace = true
 async-trait.workspace = true
 tracing-subscriber.workspace = true
 tracing-appender.workspace = true
-fred = { version = "9.0.3", features = ["enable-rustls-ring"] }
+fred = { version = "10.0.0", features = ["enable-rustls-ring"] }
 tokio-bin-process.workspace = true
 rustls-pemfile = "2.0.0"
 rustls-pki-types = "1.1.0"

shotover-proxy/benches/windsock/valkey/bench.rs

@@ -357,7 +357,7 @@ impl Bench for ValkeyBench {
         // only one string field so we just directly store the value in resources
         let address = resources;
 
-        let mut config = RedisConfig::from_url(address).unwrap();
+        let mut config = Config::from_url(address).unwrap();
         if let Encryption::Tls = self.encryption {
             let private_key =
                 load_private_key("tests/test-configs/valkey/tls/certs/localhost.key").unwrap();
@@ -372,7 +372,7 @@ impl Bench for ValkeyBench {
                     .into(),
             );
         }
-        let client = Arc::new(RedisClient::new(config, None, None, None));
+        let client = Arc::new(Client::new(config, None, None, None));
 
         // connect to the server, returning a handle to the task that drives the connection
         let shutdown_handle = client.connect();
@@ -444,7 +444,7 @@ fn load_ca(path: &str) -> Result<RootCertStore> {
 
 #[derive(Clone)]
 struct BenchTaskValkey {
-    client: Arc<RedisClient>,
+    client: Arc<Client>,
     operation: ValkeyOperation,
 }
 

shotover-proxy/tests/valkey_int_tests/basic_driver_tests.rs

@@ -1,7 +1,7 @@
 use crate::valkey_int_tests::assert::*;
 use crate::CONNECTION_REFUSED_OS_ERROR;
 use bytes::BytesMut;
-use fred::clients::RedisClient;
+use fred::clients::Client;
 use fred::interfaces::ClientLike;
 use futures::{Future, StreamExt};
 use pretty_assertions::assert_eq;
@@ -1283,7 +1283,7 @@ pub async fn test_dr_auth() {
 /// at least one driver handles this as we expect.
 /// Fred is used here as redis-rs sends an unconfigurable `CLIENT SETINFO` command and ignores the result on connection init.
 /// This results in the error message being completely dropped with redis-rs.
-pub async fn test_trigger_transform_failure_driver(client: &RedisClient) {
+pub async fn test_trigger_transform_failure_driver(client: &Client) {
     assert_eq!(
         // fred sends a `CLIENT` command on startup to which shotover will reply with an error
         client.wait_for_connect().await.unwrap_err().details(),

shotover-proxy/tests/valkey_int_tests/mod.rs

@@ -1,8 +1,8 @@
 use crate::{shotover_process, CONNECTION_REFUSED_OS_ERROR};
 use basic_driver_tests::*;
-use fred::clients::RedisClient;
+use fred::clients::Client;
 use fred::interfaces::ClientLike;
-use fred::types::RedisConfig;
+use fred::prelude::Config;
 use pretty_assertions::assert_eq;
 use redis::aio::Connection;
 use redis::Commands;
@@ -54,7 +54,7 @@ async fn passthrough_valkey_down() {
     let shotover = shotover_process("tests/test-configs/valkey/passthrough/topology.yaml")
         .start()
         .await;
-    let client = RedisClient::new(RedisConfig::default(), None, None, None);
+    let client = Client::new(Config::default(), None, None, None);
 
     {
         let _shutdown_handle = client.connect();

shotover/Cargo.toml

@@ -52,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.53", features = ["async"], optional = true }
+cached = { version = "0.54", features = ["async"], optional = true }
 governor = { version = "0.7", default-features = false, features = ["std", "jitter", "quanta"] }
 nonzero_ext = "0.3.0"
 version-compare = { version = "0.2", optional = true }
@@ -79,7 +79,7 @@ typetag.workspace = true
 tokio-tungstenite = "0.24.0"
 
 # Error handling
-thiserror = "1.0"
+thiserror = "2.0"
 anyhow.workspace = true
 backtrace = "0.3.66"
 backtrace-ext = "0.2"

shotover/src/codec/valkey.rs

@@ -238,7 +238,7 @@ impl Encoder<Messages> for ValkeyEncoder {
                 }
                 Encodable::Frame(frame) => {
                     let item = frame.into_valkey().unwrap();
-                    extend_encode(dst, &item)
+                    extend_encode(dst, &item, false)
                         .map(|_| ())
                         .map_err(|e| anyhow!("Valkey encoding error: {} - {:#?}", e, item))
                 }