Skip to content

refactor: remove dead resilience flags and modules #1050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshrotenberg merged 1 commit into from
Jul 23, 2026
Merged

refactor: remove dead resilience flags and modules #1050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions crates/redisctl-core/src/config/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@ pub struct Profile {
/// Supports keyring: prefix for secure storage.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub files_api_key: Option<String>,
/// Resilience configuration for this profile
#[serde(default, skip_serializing_if = "Option::is_none")]
pub resilience: Option<super::ResilienceConfig>,
/// Tags for organizing profiles
#[serde(default, skip_serializing_if = "Vec::is_empty")]
pub tags: Vec<String>,
Expand Down Expand Up @@ -691,7 +688,6 @@ mod tests {
api_url: "https://api.redislabs.com/v1".to_string(),
},
files_api_key: None,
resilience: None,
tags: vec![],
};

Expand All @@ -715,7 +711,6 @@ mod tests {
api_url: "url".to_string(),
},
files_api_key: None,
resilience: None,
tags: vec![],
};

Expand Down Expand Up @@ -852,7 +847,6 @@ api_url = "${REDIS_TEST_URL:-https://api.redislabs.com/v1}"
ca_cert: None,
},
files_api_key: None,
resilience: None,
tags: vec![],
};
config.set_profile("ent1".to_string(), enterprise_profile);
Expand Down Expand Up @@ -884,7 +878,6 @@ api_url = "${REDIS_TEST_URL:-https://api.redislabs.com/v1}"
api_url: "https://api.redislabs.com/v1".to_string(),
},
files_api_key: None,
resilience: None,
tags: vec![],
};
config.set_profile("cloud1".to_string(), cloud_profile);
Expand Down Expand Up @@ -916,7 +909,6 @@ api_url = "${REDIS_TEST_URL:-https://api.redislabs.com/v1}"
api_url: "https://api.redislabs.com/v1".to_string(),
},
files_api_key: None,
resilience: None,
tags: vec![],
};
config.set_profile("cloud1".to_string(), cloud_profile.clone());
Expand All @@ -933,7 +925,6 @@ api_url = "${REDIS_TEST_URL:-https://api.redislabs.com/v1}"
ca_cert: None,
},
files_api_key: None,
resilience: None,
tags: vec![],
};
config.set_profile("ent1".to_string(), enterprise_profile.clone());
Expand Down Expand Up @@ -974,7 +965,6 @@ api_url = "${REDIS_TEST_URL:-https://api.redislabs.com/v1}"
api_url: "https://api.redislabs.com/v1".to_string(),
},
files_api_key: None,
resilience: None,
tags: vec![],
};
config.set_profile("cloud1".to_string(), cloud_profile);
Expand All @@ -1000,7 +990,6 @@ api_url = "${REDIS_TEST_URL:-https://api.redislabs.com/v1}"
database: 0,
},
files_api_key: None,
resilience: None,
tags: vec![],
};

Expand Down Expand Up @@ -1042,7 +1031,6 @@ api_url = "${REDIS_TEST_URL:-https://api.redislabs.com/v1}"
database: 0,
},
files_api_key: None,
resilience: None,
tags: vec![],
};
config.set_profile("db1".to_string(), db_profile);
Expand Down Expand Up @@ -1091,7 +1079,6 @@ port = 12345
api_url: "https://api.redislabs.com/v1".to_string(),
},
files_api_key: None,
resilience: None,
tags: vec![],
}
}
Expand All @@ -1107,7 +1094,6 @@ port = 12345
ca_cert: None,
},
files_api_key: None,
resilience: None,
tags: vec![],
}
}
Expand Down Expand Up @@ -1201,7 +1187,6 @@ port = 12345
database: 0,
},
files_api_key: None,
resilience: None,
tags: vec![],
},
);
Expand Down
2 changes: 0 additions & 2 deletions crates/redisctl-core/src/config/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@
pub mod config;
pub mod credential;
pub mod error;
pub mod resilience;

// Re-export main types for convenience
pub use config::{Config, DeploymentType, Profile, ProfileCredentials};
pub use credential::{CredentialStorage, CredentialStore};
pub use error::{ConfigError, Result};
pub use resilience::ResilienceConfig;
138 changes: 0 additions & 138 deletions crates/redisctl-core/src/config/resilience.rs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion crates/redisctl-core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ pub use progress::{ProgressCallback, ProgressEvent, poll_task};
// Re-export config types for convenience
pub use config::{
Config, ConfigError, CredentialStorage, CredentialStore, DeploymentType, Profile,
ProfileCredentials, ResilienceConfig,
ProfileCredentials,
};

// Re-export Layer 1 for convenience (but consumers can also import directly)
Expand Down
2 changes: 0 additions & 2 deletions crates/redisctl-core/tests/config_edge_cases.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ fn tags_round_trip_save_and_reload() {
api_url: "https://api.redislabs.com/v1".to_string(),
},
files_api_key: None,
resilience: None,
tags: vec!["prod".to_string(), "us-east".to_string()],
},
);
Expand Down Expand Up @@ -279,7 +278,6 @@ fn empty_tags_not_serialized() {
database: 0,
},
files_api_key: None,
resilience: None,
tags: vec![],
},
);
Expand Down
3 changes: 0 additions & 3 deletions crates/redisctl-mcp/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,7 +998,6 @@ mod tests {
api_url: "https://api.redislabs.com/v1".to_string(),
},
files_api_key: None,
resilience: None,
tags: vec![],
}
}
Expand All @@ -1014,7 +1013,6 @@ mod tests {
ca_cert: None,
},
files_api_key: None,
resilience: None,
tags: vec![],
}
}
Expand All @@ -1031,7 +1029,6 @@ mod tests {
database: 0,
},
files_api_key: None,
resilience: None,
tags: vec![],
}
}
Expand Down
1 change: 0 additions & 1 deletion crates/redisctl-mcp/src/tools/profile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,6 @@ pub fn create_profile(state: Arc<AppState>) -> Tool {
deployment_type,
credentials,
files_api_key: None,
resilience: None,
tags: vec![],
};

Expand Down
20 changes: 0 additions & 20 deletions crates/redisctl/src/cli/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,26 +98,6 @@ pub struct Cli {
#[arg(long, short, global = true, action = clap::ArgAction::Count)]
pub verbose: u8,

/// Disable all resilience patterns (circuit breaker, retry, rate limiting)
#[arg(long, global = true)]
pub no_resilience: bool,

/// Disable circuit breaker only
#[arg(long, global = true)]
pub no_circuit_breaker: bool,

/// Disable retry only
#[arg(long, global = true)]
pub no_retry: bool,

/// Override retry attempts (implies --retry-enabled if set)
#[arg(long, global = true)]
pub retry_attempts: Option<u32>,

/// Set rate limit (requests per minute, implies --rate-limit-enabled if set)
#[arg(long, global = true)]
pub rate_limit: Option<u32>,

#[command(subcommand)]
pub command: Commands,
}
Expand Down
7 changes: 0 additions & 7 deletions crates/redisctl/src/commands/profile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,6 @@ async fn handle_set(
api_url: api_url.to_string(),
},
files_api_key: None,
resilience: None,
tags: effective_tags.clone(),
}
}
Expand Down Expand Up @@ -629,7 +628,6 @@ async fn handle_set(
ca_cert: ca_cert.clone(),
},
files_api_key: None,
resilience: None,
tags: effective_tags.clone(),
}
}
Expand Down Expand Up @@ -687,7 +685,6 @@ async fn handle_set(
database: db.unwrap_or(0),
},
files_api_key: None,
resilience: None,
tags: effective_tags,
}
}
Expand All @@ -697,7 +694,6 @@ async fn handle_set(
let profile = if let Some(existing) = conn_mgr.config.profiles.get(name) {
redisctl_core::Profile {
files_api_key: profile.files_api_key.or(existing.files_api_key.clone()),
resilience: profile.resilience.or(existing.resilience.clone()),
..profile
}
} else {
Expand Down Expand Up @@ -845,7 +841,6 @@ async fn handle_init(conn_mgr: &ConnectionManager) -> Result<(), RedisCtlError>
api_url,
},
files_api_key: None,
resilience: None,
tags: vec![],
}
}
Expand Down Expand Up @@ -888,7 +883,6 @@ async fn handle_init(conn_mgr: &ConnectionManager) -> Result<(), RedisCtlError>
ca_cert: None,
},
files_api_key: None,
resilience: None,
tags: vec![],
}
}
Expand Down Expand Up @@ -940,7 +934,6 @@ async fn handle_init(conn_mgr: &ConnectionManager) -> Result<(), RedisCtlError>
database: 0,
},
files_api_key: None,
resilience: None,
tags: vec![],
}
}
Expand Down
Loading
Loading