fix: rust version

joshrotenberg · joshrotenberg · commit d52852b56c15 · 2025-08-22T22:13:55.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -29,4 +29,8 @@ lcov.info
 
 # Redis dump files
 *.rdb
-dump.rdb
+dump.rdb
+
+# Claude
+CLAUDE.md
+.claude/
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,8 +9,8 @@ members = [
 
 [workspace.package]
 version = "0.1.0"
-edition = "2021"
-rust-version = "1.75"
+edition = "2024"
+rust-version = "1.89"
 authors = ["Redis Field Engineering <redis-field-engineering@redis.com>"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/redis-field-engineering/redisctl"
@@ -70,4 +70,4 @@ panic = "abort"
 
 [profile.dev]
 opt-level = 0
-debug = true
+debug = true
diff --git a/crates/redis-cloud/Cargo.toml b/crates/redis-cloud/Cargo.toml
@@ -29,4 +29,4 @@ url = { workspace = true }
 wiremock = { workspace = true }
 tokio = { workspace = true, features = ["rt", "macros", "test-util"] }
 pretty_assertions = { workspace = true }
-serial_test = { workspace = true }
+serial_test = { workspace = true }
diff --git a/crates/redis-cloud/src/handlers/account.rs b/crates/redis-cloud/src/handlers/account.rs
@@ -1,9 +1,9 @@
 //! Account operations handler
 
 use crate::{
+    Result,
     client::CloudClient,
     models::{AccountResponse, CloudAccount},
-    Result,
 };
 use serde_json::Value;
 
diff --git a/crates/redis-cloud/src/handlers/acl.rs b/crates/redis-cloud/src/handlers/acl.rs
@@ -1,6 +1,6 @@
 //! ACL and RBAC operations handler
 
-use crate::{client::CloudClient, Result};
+use crate::{Result, client::CloudClient};
 use serde_json::Value;
 
 /// Handler for Cloud ACL/RBAC operations
diff --git a/crates/redis-cloud/src/handlers/api_keys.rs b/crates/redis-cloud/src/handlers/api_keys.rs
@@ -1,6 +1,6 @@
 //! API keys management handler
 
-use crate::{client::CloudClient, Result};
+use crate::{Result, client::CloudClient};
 use serde_json::Value;
 
 /// Handler for Cloud API keys management
diff --git a/crates/redis-cloud/src/handlers/backup.rs b/crates/redis-cloud/src/handlers/backup.rs
@@ -1,9 +1,9 @@
 //! Backup operations handler
 
 use crate::{
+    Result,
     client::CloudClient,
     models::{CloudBackup, CreateBackupRequest},
-    Result,
 };
 use serde_json::Value;
 
diff --git a/crates/redis-cloud/src/handlers/billing.rs b/crates/redis-cloud/src/handlers/billing.rs
@@ -1,6 +1,6 @@
 //! Billing and payment operations handler
 
-use crate::{client::CloudClient, Result};
+use crate::{Result, client::CloudClient};
 use serde_json::Value;
 
 /// Handler for Cloud billing and payment operations
diff --git a/crates/redis-cloud/src/handlers/cloud_accounts.rs b/crates/redis-cloud/src/handlers/cloud_accounts.rs
@@ -1,6 +1,6 @@
 //! Cloud account operations handler
 
-use crate::{client::CloudClient, Result};
+use crate::{Result, client::CloudClient};
 use serde_json::Value;
 
 /// Handler for Cloud account operations
diff --git a/crates/redis-cloud/src/handlers/crdb.rs b/crates/redis-cloud/src/handlers/crdb.rs
@@ -1,6 +1,6 @@
 //! Active-Active (CRDB) database operations handler
 
-use crate::{client::CloudClient, Result};
+use crate::{Result, client::CloudClient};
 use serde_json::Value;
 
 /// Handler for Cloud Active-Active database operations
diff --git a/crates/redis-cloud/src/handlers/database.rs b/crates/redis-cloud/src/handlers/database.rs
@@ -1,9 +1,9 @@
 //! Database operations handler
 
 use crate::{
+    Result,
     client::CloudClient,
     models::{CloudDatabase, CreateDatabaseRequest, UpdateDatabaseRequest},
-    Result,
 };
 use serde_json::Value;
 
diff --git a/crates/redis-cloud/src/handlers/fixed.rs b/crates/redis-cloud/src/handlers/fixed.rs
@@ -1,6 +1,6 @@
 //! Fixed (Essentials) subscription operations handler
 
-use crate::{client::CloudClient, Result};
+use crate::{Result, client::CloudClient};
 use serde_json::Value;
 
 /// Handler for Cloud fixed/essentials subscription operations
diff --git a/crates/redis-cloud/src/handlers/logs.rs b/crates/redis-cloud/src/handlers/logs.rs
@@ -1,6 +1,6 @@
 //! Logs operations handler
 
-use crate::{client::CloudClient, Result};
+use crate::{Result, client::CloudClient};
 use serde_json::Value;
 
 /// Handler for Cloud logs operations
diff --git a/crates/redis-cloud/src/handlers/metrics.rs b/crates/redis-cloud/src/handlers/metrics.rs
@@ -1,6 +1,6 @@
 //! Metrics operations handler
 
-use crate::{client::CloudClient, models::CloudMetrics, Result};
+use crate::{Result, client::CloudClient, models::CloudMetrics};
 use serde_json::Value;
 
 /// Handler for Cloud metrics operations
diff --git a/crates/redis-cloud/src/handlers/peering.rs b/crates/redis-cloud/src/handlers/peering.rs
@@ -1,9 +1,9 @@
 //! VPC Peering operations handler
 
 use crate::{
+    Result,
     client::CloudClient,
     models::{CloudPeering, CreatePeeringRequest},
-    Result,
 };
 use serde_json::Value;
 
diff --git a/crates/redis-cloud/src/handlers/private_service_connect.rs b/crates/redis-cloud/src/handlers/private_service_connect.rs
@@ -1,6 +1,6 @@
 //! Private Service Connect operations handler
 
-use crate::{client::CloudClient, Result};
+use crate::{Result, client::CloudClient};
 use serde_json::Value;
 
 /// Handler for Cloud Private Service Connect operations
diff --git a/crates/redis-cloud/src/handlers/region.rs b/crates/redis-cloud/src/handlers/region.rs
@@ -1,6 +1,6 @@
 //! Region operations handler
 
-use crate::{client::CloudClient, Result};
+use crate::{Result, client::CloudClient};
 use serde_json::Value;
 
 /// Handler for Cloud regions
diff --git a/crates/redis-cloud/src/handlers/sso.rs b/crates/redis-cloud/src/handlers/sso.rs
@@ -1,6 +1,6 @@
 //! SSO/SAML configuration handler
 
-use crate::{client::CloudClient, Result};
+use crate::{Result, client::CloudClient};
 use serde_json::Value;
 
 /// Handler for Cloud SSO/SAML operations
diff --git a/crates/redis-cloud/src/handlers/subscription.rs b/crates/redis-cloud/src/handlers/subscription.rs
@@ -1,11 +1,11 @@
 //! Subscription operations handler
 
 use crate::{
+    Result,
     client::CloudClient,
     models::{
         CloudDatabase, CloudSubscription, CreateSubscriptionRequest, UpdateSubscriptionRequest,
     },
-    Result,
 };
 use serde_json::Value;
 
diff --git a/crates/redis-cloud/src/handlers/tasks.rs b/crates/redis-cloud/src/handlers/tasks.rs
@@ -1,6 +1,6 @@
 //! Task operations handler
 
-use crate::{client::CloudClient, Result};
+use crate::{Result, client::CloudClient};
 use serde_json::Value;
 
 /// Handler for Cloud task operations
diff --git a/crates/redis-cloud/src/handlers/transit_gateway.rs b/crates/redis-cloud/src/handlers/transit_gateway.rs
@@ -1,6 +1,6 @@
 //! Transit Gateway operations handler
 
-use crate::{client::CloudClient, Result};
+use crate::{Result, client::CloudClient};
 use serde_json::Value;
 
 /// Handler for Cloud Transit Gateway operations
diff --git a/crates/redis-cloud/src/handlers/users.rs b/crates/redis-cloud/src/handlers/users.rs
@@ -1,6 +1,6 @@
 //! User management operations handler
 
-use crate::{client::CloudClient, Result};
+use crate::{Result, client::CloudClient};
 use serde_json::Value;
 
 /// Handler for Cloud user operations
diff --git a/crates/redis-cloud/tests/private_service_connect_tests.rs b/crates/redis-cloud/tests/private_service_connect_tests.rs
@@ -431,16 +431,20 @@ async fn test_get_creation_scripts() {
     let scripts = &response["scripts"];
     assert!(scripts["terraform"].is_object());
     assert!(scripts["gcloud"].is_object());
-    assert!(scripts["terraform"]["main"]
-        .as_str()
-        .unwrap()
-        .contains("google_compute_forwarding_rule"));
+    assert!(
+        scripts["terraform"]["main"]
+            .as_str()
+            .unwrap()
+            .contains("google_compute_forwarding_rule")
+    );
     let gcloud_cmds = scripts["gcloud"]["commands"].as_array().unwrap();
     assert!(!gcloud_cmds.is_empty());
-    assert!(scripts["documentation"]
-        .as_str()
-        .unwrap()
-        .starts_with("https://"));
+    assert!(
+        scripts["documentation"]
+            .as_str()
+            .unwrap()
+            .starts_with("https://")
+    );
 }
 
 #[tokio::test]
@@ -485,14 +489,18 @@ async fn test_get_deletion_scripts() {
     assert!(result.is_ok());
     let response = result.unwrap();
     let scripts = &response["scripts"];
-    assert!(scripts["terraform"]["warning"]
-        .as_str()
-        .unwrap()
-        .contains("permanently delete"));
-    assert!(scripts["gcloud"]["warning"]
-        .as_str()
-        .unwrap()
-        .contains("permanently delete"));
+    assert!(
+        scripts["terraform"]["warning"]
+            .as_str()
+            .unwrap()
+            .contains("permanently delete")
+    );
+    assert!(
+        scripts["gcloud"]["warning"]
+            .as_str()
+            .unwrap()
+            .contains("permanently delete")
+    );
     let checklist = scripts["preDeleteChecklist"].as_array().unwrap();
     assert_eq!(checklist.len(), 4);
     assert!(checklist[0].as_str().unwrap().contains("applications"));
@@ -791,10 +799,12 @@ async fn test_get_regional_creation_scripts() {
     assert!(result.is_ok());
     let response = result.unwrap();
     let scripts = &response["scripts"];
-    assert!(scripts["terraform"]["main"]
-        .as_str()
-        .unwrap()
-        .contains("redis_psc_regional_endpoint"));
+    assert!(
+        scripts["terraform"]["main"]
+            .as_str()
+            .unwrap()
+            .contains("redis_psc_regional_endpoint")
+    );
 }
 
 #[tokio::test]
@@ -836,10 +846,12 @@ async fn test_get_regional_deletion_scripts() {
     assert!(result.is_ok());
     let response = result.unwrap();
     let scripts = &response["scripts"];
-    assert!(scripts["terraform"]["main"]
-        .as_str()
-        .unwrap()
-        .contains("terraform destroy"));
+    assert!(
+        scripts["terraform"]["main"]
+            .as_str()
+            .unwrap()
+            .contains("terraform destroy")
+    );
 }
 
 #[tokio::test]
diff --git a/crates/redis-common/Cargo.toml b/crates/redis-common/Cargo.toml
@@ -22,4 +22,4 @@ config = { workspace = true }
 toml = { workspace = true }
 directories = { workspace = true }
 tracing = { workspace = true }
-clap = { workspace = true }
+clap = { workspace = true }
diff --git a/crates/redis-common/src/error.rs b/crates/redis-common/src/error.rs
@@ -39,7 +39,9 @@ pub enum ProfileError {
 
 #[derive(Error, Debug)]
 pub enum RoutingError {
-    #[error("Command '{command}' exists in both cloud and enterprise. Use 'redisctl cloud {command}' or 'redisctl enterprise {command}'")]
+    #[error(
+        "Command '{command}' exists in both cloud and enterprise. Use 'redisctl cloud {command}' or 'redisctl enterprise {command}'"
+    )]
     AmbiguousCommand { command: String },
 
     #[error("Command '{command}' not found in {deployment_type}")]
diff --git a/crates/redis-enterprise/Cargo.toml b/crates/redis-enterprise/Cargo.toml
@@ -30,4 +30,4 @@ url = { workspace = true }
 wiremock = { workspace = true }
 tokio = { workspace = true, features = ["rt", "macros", "test-util"] }
 pretty_assertions = { workspace = true }
-serial_test = { workspace = true }
+serial_test = { workspace = true }
diff --git a/crates/redis-enterprise/src/client.rs b/crates/redis-enterprise/src/client.rs
@@ -2,7 +2,7 @@
 
 use crate::error::{RestError, Result};
 use reqwest::{Client, Response};
-use serde::{de::DeserializeOwned, Serialize};
+use serde::{Serialize, de::DeserializeOwned};
 use std::sync::Arc;
 use std::time::Duration;
 use tracing::{debug, trace};
diff --git a/crates/redisctl/Cargo.toml b/crates/redisctl/Cargo.toml
@@ -53,4 +53,4 @@ enterprise-only = ["enterprise"]
 [dev-dependencies]
 assert_cmd = "2.0"
 predicates = "3.0"
-tempfile = "3.8"
+tempfile = "3.8"
diff --git a/crates/redisctl/src/cloud_bin.rs b/crates/redisctl/src/cloud_bin.rs
@@ -43,7 +43,9 @@ async fn main() -> Result<()> {
             cloud::handle_account_command(command, profile, cli.output, cli.query.as_deref()).await
         }
         _ => {
-            anyhow::bail!("Command not supported in Cloud-only binary. Use full 'redisctl' for Enterprise commands.")
+            anyhow::bail!(
+                "Command not supported in Cloud-only binary. Use full 'redisctl' for Enterprise commands."
+            )
         }
     }
 }
diff --git a/crates/redisctl/src/commands/api.rs b/crates/redisctl/src/commands/api.rs
@@ -5,7 +5,7 @@
 use anyhow::{Context, Result};
 use clap::Subcommand;
 use redis_cloud::CloudClient;
-use redis_common::{print_output, OutputFormat};
+use redis_common::{OutputFormat, print_output};
 use redis_enterprise::EnterpriseClient;
 use serde_json::Value;
 use std::fs;
diff --git a/crates/redisctl/src/commands/cloud.rs b/crates/redisctl/src/commands/cloud.rs
@@ -1,6 +1,6 @@
 use anyhow::Result;
 use redis_cloud::{CloudClient, CloudConfig};
-use redis_common::{print_output, OutputFormat, Profile, ProfileCredentials};
+use redis_common::{OutputFormat, Profile, ProfileCredentials, print_output};
 
 use crate::cli::{
     AccountCommands, AclCommands, ApiKeyCommands, BackupCommands, CloudAccountCommands,
@@ -128,7 +128,9 @@ pub async fn handle_database_command(
             memory_limit: _,
             modules: _,
         } => {
-            anyhow::bail!("Database creation requires subscription context. Use 'redisctl cloud subscription create-database' instead.");
+            anyhow::bail!(
+                "Database creation requires subscription context. Use 'redisctl cloud subscription create-database' instead."
+            );
         }
         DatabaseCommands::Update {
             id,
@@ -1467,7 +1469,9 @@ pub async fn handle_sso_command(
         }
         SsoCommands::Delete { force } => {
             if !force {
-                println!("Are you sure you want to delete SSO configuration? Use --force to skip confirmation.");
+                println!(
+                    "Are you sure you want to delete SSO configuration? Use --force to skip confirmation."
+                );
                 return Ok(());
             }
             client.delete_raw("/sso").await?;
diff --git a/crates/redisctl/src/commands/enterprise.rs b/crates/redisctl/src/commands/enterprise.rs
diff --git a/crates/redisctl/src/commands/profile.rs b/crates/redisctl/src/commands/profile.rs
diff --git a/crates/redisctl/src/enterprise_bin.rs b/crates/redisctl/src/enterprise_bin.rs
diff --git a/crates/redisctl/src/router.rs b/crates/redisctl/src/router.rs
