Skip to content

feat(cloud): add --wait flag support for fixed database and subscription commands #198

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
Sep 7, 2025
Merged

feat(cloud): add --wait flag support for fixed database and subscription commands #198

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
24 changes: 24 additions & 0 deletions crates/redisctl/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,13 +614,19 @@ pub enum CloudFixedDatabaseCommands {
subscription_id: i32,
/// JSON file with database configuration (use @filename or - for stdin)
file: String,
/// Async operation options
#[command(flatten)]
async_ops: crate::commands::cloud::async_utils::AsyncOperationArgs,
},
/// Update fixed database configuration
Update {
/// Database ID (format: subscription_id:database_id)
id: String,
/// JSON file with update configuration (use @filename or - for stdin)
file: String,
/// Async operation options
#[command(flatten)]
async_ops: crate::commands::cloud::async_utils::AsyncOperationArgs,
},
/// Delete a fixed database
Delete {
Expand All @@ -629,6 +635,9 @@ pub enum CloudFixedDatabaseCommands {
/// Skip confirmation prompt
#[arg(short, long)]
yes: bool,
/// Async operation options
#[command(flatten)]
async_ops: crate::commands::cloud::async_utils::AsyncOperationArgs,
},
/// Get backup status for fixed database
#[command(name = "backup-status")]
Expand All @@ -640,6 +649,9 @@ pub enum CloudFixedDatabaseCommands {
Backup {
/// Database ID (format: subscription_id:database_id)
id: String,
/// Async operation options
#[command(flatten)]
async_ops: crate::commands::cloud::async_utils::AsyncOperationArgs,
},
/// Get import status
#[command(name = "import-status")]
Expand All @@ -653,6 +665,9 @@ pub enum CloudFixedDatabaseCommands {
id: String,
/// JSON file with import configuration (use @filename or - for stdin)
file: String,
/// Async operation options
#[command(flatten)]
async_ops: crate::commands::cloud::async_utils::AsyncOperationArgs,
},
/// View slow query log
#[command(name = "slow-log")]
Expand Down Expand Up @@ -749,13 +764,19 @@ pub enum CloudFixedSubscriptionCommands {
Create {
/// JSON file with subscription configuration (use @filename or - for stdin)
file: String,
/// Async operation options
#[command(flatten)]
async_ops: crate::commands::cloud::async_utils::AsyncOperationArgs,
},
/// Update fixed subscription
Update {
/// Subscription ID
id: i32,
/// JSON file with update configuration (use @filename or - for stdin)
file: String,
/// Async operation options
#[command(flatten)]
async_ops: crate::commands::cloud::async_utils::AsyncOperationArgs,
},
/// Delete a fixed subscription
Delete {
Expand All @@ -764,6 +785,9 @@ pub enum CloudFixedSubscriptionCommands {
/// Skip confirmation prompt
#[arg(short, long)]
yes: bool,
/// Async operation options
#[command(flatten)]
async_ops: crate::commands::cloud::async_utils::AsyncOperationArgs,
},
/// Get available Redis versions for fixed subscription
#[command(name = "redis-versions")]
Expand Down
125 changes: 64 additions & 61 deletions crates/redisctl/src/commands/cloud/fixed_database.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#![allow(dead_code)]

use crate::cli::{CloudFixedDatabaseCommands, OutputFormat};
use crate::commands::cloud::async_utils::handle_async_response;
use crate::commands::cloud::utils::{
confirm_action, handle_output, print_formatted_output, read_file_input,
};
Expand Down Expand Up @@ -83,6 +84,7 @@ pub async fn handle_fixed_database_command(
CloudFixedDatabaseCommands::Create {
subscription_id,
file,
async_ops,
} => {
let json_string = read_file_input(file)?;
let request: FixedDatabaseCreateRequest =
Expand All @@ -93,23 +95,26 @@ pub async fn handle_fixed_database_command(
.await
.context("Failed to create fixed database")?;

// Check if response contains a task ID
let json_result =
serde_json::to_value(&result).context("Failed to serialize response")?;
if let Some(task_id) = json_result.get("taskId").and_then(|v| v.as_str()) {
eprintln!("Fixed database creation initiated. Task ID: {}", task_id);
eprintln!(
"Use 'redisctl cloud task wait {}' to monitor progress",
task_id
);
}

let data = handle_output(json_result, output_format, query)?;
print_formatted_output(data, output_format)?;
Ok(())
handle_async_response(
conn_mgr,
profile_name,
json_result,
async_ops,
output_format,
query,
"Fixed database created successfully",
)
.await
}

CloudFixedDatabaseCommands::Update { id, file } => {
CloudFixedDatabaseCommands::Update {
id,
file,
async_ops,
} => {
let (subscription_id, database_id) = parse_fixed_database_id(id)?;
let json_string = read_file_input(file)?;
let request: FixedDatabaseUpdateRequest =
Expand All @@ -120,23 +125,22 @@ pub async fn handle_fixed_database_command(
.await
.context("Failed to update fixed database")?;

// Check if response contains a task ID
let json_result =
serde_json::to_value(&result).context("Failed to serialize response")?;
if let Some(task_id) = json_result.get("taskId").and_then(|v| v.as_str()) {
eprintln!("Fixed database update initiated. Task ID: {}", task_id);
eprintln!(
"Use 'redisctl cloud task wait {}' to monitor progress",
task_id
);
}

let data = handle_output(json_result, output_format, query)?;
print_formatted_output(data, output_format)?;
Ok(())
handle_async_response(
conn_mgr,
profile_name,
json_result,
async_ops,
output_format,
query,
"Fixed database updated successfully",
)
.await
}

CloudFixedDatabaseCommands::Delete { id, yes } => {
CloudFixedDatabaseCommands::Delete { id, yes, async_ops } => {
let (subscription_id, database_id) = parse_fixed_database_id(id)?;

if !yes {
Expand All @@ -152,22 +156,19 @@ pub async fn handle_fixed_database_command(
.await
.context("Failed to delete fixed database")?;

// Check if response contains a task ID
let json_result =
serde_json::to_value(&result).context("Failed to serialize response")?;
if let Some(task_id) = json_result.get("taskId").and_then(|v| v.as_str()) {
eprintln!("Fixed database deletion initiated. Task ID: {}", task_id);
eprintln!(
"Use 'redisctl cloud task wait {}' to monitor progress",
task_id
);
} else {
eprintln!("Fixed database deleted successfully");
}

let data = handle_output(json_result, output_format, query)?;
print_formatted_output(data, output_format)?;
Ok(())
handle_async_response(
conn_mgr,
profile_name,
json_result,
async_ops,
output_format,
query,
"Fixed database deleted successfully",
)
.await
}

CloudFixedDatabaseCommands::BackupStatus { id } => {
Expand All @@ -184,7 +185,7 @@ pub async fn handle_fixed_database_command(
Ok(())
}

CloudFixedDatabaseCommands::Backup { id } => {
CloudFixedDatabaseCommands::Backup { id, async_ops } => {
let (subscription_id, database_id) = parse_fixed_database_id(id)?;

// Create a minimal backup request - most fields are optional
Expand All @@ -201,20 +202,19 @@ pub async fn handle_fixed_database_command(
.await
.context("Failed to initiate backup")?;

// Check if response contains a task ID
let json_result =
serde_json::to_value(&result).context("Failed to serialize response")?;
if let Some(task_id) = json_result.get("taskId").and_then(|v| v.as_str()) {
eprintln!("Backup initiated. Task ID: {}", task_id);
eprintln!(
"Use 'redisctl cloud task wait {}' to monitor progress",
task_id
);
}

let data = handle_output(json_result, output_format, query)?;
print_formatted_output(data, output_format)?;
Ok(())
handle_async_response(
conn_mgr,
profile_name,
json_result,
async_ops,
output_format,
query,
"Backup initiated successfully",
)
.await
}

CloudFixedDatabaseCommands::ImportStatus { id } => {
Expand All @@ -231,7 +231,11 @@ pub async fn handle_fixed_database_command(
Ok(())
}

CloudFixedDatabaseCommands::Import { id, file } => {
CloudFixedDatabaseCommands::Import {
id,
file,
async_ops,
} => {
let (subscription_id, database_id) = parse_fixed_database_id(id)?;
let json_string = read_file_input(file)?;
let request: FixedDatabaseImportRequest =
Expand All @@ -242,20 +246,19 @@ pub async fn handle_fixed_database_command(
.await
.context("Failed to initiate import")?;

// Check if response contains a task ID
let json_result =
serde_json::to_value(&result).context("Failed to serialize response")?;
if let Some(task_id) = json_result.get("taskId").and_then(|v| v.as_str()) {
eprintln!("Import initiated. Task ID: {}", task_id);
eprintln!(
"Use 'redisctl cloud task wait {}' to monitor progress",
task_id
);
}

let data = handle_output(json_result, output_format, query)?;
print_formatted_output(data, output_format)?;
Ok(())
handle_async_response(
conn_mgr,
profile_name,
json_result,
async_ops,
output_format,
query,
"Import initiated successfully",
)
.await
}

CloudFixedDatabaseCommands::SlowLog {
Expand Down
Loading
Loading