CLI - Unify copies of the confirmation/--force logic (#1740)

Co-authored-by: Zeke Foppa <bfops@users.noreply.github.com>

Author: bfops

crates/cli/src/subcommands/generate/mod.rs

@@ -18,11 +18,11 @@ use spacetimedb_schema::def::{ModuleDef, ReducerDef, ScopedTypeName, TableDef, T
 use spacetimedb_schema::identifier::Identifier;
 use spacetimedb_schema::schema::TableSchema;
 use std::fs;
-use std::io::Write;
 use std::ops::Deref;
 use std::path::{Path, PathBuf};
 use wasmtime::{Caller, StoreContextMut};
 
+use crate::util::y_or_n;
 use crate::Config;
 
 mod code_indenter;
@@ -190,22 +190,12 @@ pub fn exec(_config: Config, args: &clap::ArgMatches) -> anyhow::Result<()> {
             }
         }
         if !files_to_delete.is_empty() {
-            let mut input = "y".to_string();
             println!("The following files were not generated by this command and will be deleted:");
             for path in &files_to_delete {
                 println!("  {}", path.to_str().unwrap());
             }
 
-            if !force {
-                print!("Are you sure you want to delete these files? [y/N] ");
-                input = "".to_string();
-                std::io::stdout().flush()?;
-                std::io::stdin().read_line(&mut input)?;
-            } else {
-                println!("Force flag present, deleting files without prompting.");
-            }
-
-            if input.trim().to_lowercase() == "y" || input.trim().to_lowercase() == "yes" {
+            if y_or_n(force, "Are you sure you want to delete these files?")? {
                 for path in files_to_delete {
                     fs::remove_file(path)?;
                 }

crates/cli/src/subcommands/identity.rs

@@ -316,7 +316,10 @@ async fn exec_remove(mut config: Config, args: &ArgMatches) -> Result<(), anyhow
     }
 
     fn should_continue(force: bool, prompt: &str) -> anyhow::Result<bool> {
-        Ok(force || y_or_n(&format!("Are you sure you want to remove all identities{}?", prompt))?)
+        y_or_n(
+            force,
+            &format!("Are you sure you want to remove all identities{}?", prompt),
+        )
     }
 
     if let Some(identity_or_name) = identity_or_name {

crates/cli/src/subcommands/local.rs

@@ -1,9 +1,9 @@
 use crate::config::Config;
+use crate::util::y_or_n;
 use clap::ArgAction::SetTrue;
 use clap::ArgMatches;
 use clap::{Arg, Command};
 use spacetimedb::stdb_path;
-use std::io::Write;
 use std::path::PathBuf;
 
 pub fn cli() -> Command {
@@ -60,17 +60,12 @@ async fn exec_clear(_config: Config, args: &ArgMatches) -> Result<(), anyhow::Er
             println!("Worker node database path: <not found>");
         }
 
-        if !force {
-            print!("Are you sure you want to delete all data from the local database? (y/n) ");
-            std::io::stdout().flush()?;
-            let mut input = String::new();
-            std::io::stdin().read_line(&mut input)?;
-            if input.trim().to_lowercase() != "y" && input.trim().to_lowercase() != "yes" {
-                println!("Aborting");
-                return Ok(());
-            }
-        } else {
-            println!("Force flag is present, skipping confirmation");
+        if !y_or_n(
+            force,
+            "Are you sure you want to delete all data from the local database?",
+        )? {
+            println!("Aborting");
+            return Ok(());
         }
 
         if control_node_dir.exists() {

crates/cli/src/subcommands/publish.rs

@@ -6,13 +6,12 @@ use reqwest::{StatusCode, Url};
 use spacetimedb_client_api_messages::name::PublishOp;
 use spacetimedb_client_api_messages::name::{is_address, parse_domain_name, PublishResult};
 use std::fs;
-use std::io::Write;
 use std::path::PathBuf;
 
 use crate::common_args;
 use crate::config::Config;
-use crate::util::unauth_error_context;
 use crate::util::{add_auth_header_opt, get_auth_header};
+use crate::util::{unauth_error_context, y_or_n};
 
 pub fn cli() -> clap::Command {
     clap::Command::new("publish")
@@ -166,25 +165,21 @@ pub async fn exec(mut config: Config, args: &ArgMatches) -> Result<(), anyhow::E
     );
 
     if clear_database {
-        if force {
-            println!("Skipping confirmation due to --force.");
-        } else {
-            // Note: `name_or_address` should be set, because it is `required` in the CLI arg config.
-            println!(
-                "This will DESTROY the current {} module, and ALL corresponding data.",
+        // Note: `name_or_address` should be set, because it is `required` in the CLI arg config.
+        println!(
+            "This will DESTROY the current {} module, and ALL corresponding data.",
+            name_or_address.unwrap()
+        );
+        if !y_or_n(
+            force,
+            format!(
+                "Are you sure you want to proceed? [deleting {}]",
                 name_or_address.unwrap()
-            );
-            print!(
-                "Are you sure you want to proceed? (y/N) [deleting {}] ",
-                name_or_address.unwrap()
-            );
-            std::io::stdout().flush()?;
-            let mut input = String::new();
-            std::io::stdin().read_line(&mut input)?;
-            if input.trim().to_lowercase() != "y" && input.trim().to_lowercase() != "yes" {
-                println!("Aborting");
-                return Ok(());
-            }
+            )
+            .as_str(),
+        )? {
+            println!("Aborting");
+            return Ok(());
         }
         query_params.push(("clear", "true"));
     }

crates/cli/src/subcommands/server.rs

@@ -260,7 +260,7 @@ pub async fn exec_remove(mut config: Config, args: &ArgMatches) -> Result<(), an
         for id in deleted_ids {
             println!("{}", id.identity);
         }
-        if !(force || y_or_n("Continue?")?) {
+        if !y_or_n(force, "Continue?")? {
             anyhow::bail!("Aborted");
         }
 
@@ -339,7 +339,7 @@ pub async fn exec_fingerprint(mut config: Config, args: &ArgMatches) -> Result<(
     let force = args.get_flag("force");
 
     if update_server_fingerprint(&mut config, server, delete_identities).await? {
-        if !(force || y_or_n("Continue?")?) {
+        if !y_or_n(force, "Continue?")? {
             anyhow::bail!("Aborted");
         }
 
@@ -412,7 +412,7 @@ pub async fn exec_edit(mut config: Config, args: &ArgMatches) -> Result<(), anyh
         }
     }
 
-    if !(force || y_or_n("Continue?")?) {
+    if !y_or_n(force, "Continue?")? {
         anyhow::bail!("Aborted");
     }
 

crates/cli/src/subcommands/upgrade.rs

@@ -3,6 +3,7 @@ use std::{env, fs};
 
 extern crate regex;
 
+use crate::util::y_or_n;
 use crate::{version, Config};
 use clap::{Arg, ArgMatches};
 use flate2::read::GzDecoder;
@@ -152,10 +153,8 @@ pub async fn exec(_config: Config, args: &ArgMatches) -> Result<(), anyhow::Erro
 
     if release_version == version::CLI_VERSION {
         println!("You're already running the latest version: {}", version::CLI_VERSION);
-        if !force {
+        if !y_or_n(force, "Do you want to reinstall? ")? {
             return Ok(());
-        } else {
-            println!("Force flag is set, continuing with upgrade.");
         }
     }
 
@@ -177,11 +176,8 @@ pub async fn exec(_config: Config, args: &ArgMatches) -> Result<(), anyhow::Erro
         "This will replace the current executable at {}.",
         current_exe_path.display()
     );
-    print!("Do you want to continue? [y/N] ");
-    std::io::stdout().flush()?;
-    let mut input = String::new();
-    std::io::stdin().read_line(&mut input)?;
-    if input.trim().to_lowercase() != "y" && input.trim().to_lowercase() != "yes" {
+
+    if !y_or_n(force, "Do you want to continue?")? {
         println!("Aborting upgrade.");
         return Ok(());
     }

crates/cli/src/util.rs

@@ -344,13 +344,17 @@ pub fn host_or_url_to_host_and_protocol(host_or_url: &str) -> (&str, Option<&str
 /// Prompt the user for `y` or `n` from stdin.
 ///
 /// Return `false` unless the input is `y`.
-pub fn y_or_n(prompt: &str) -> anyhow::Result<bool> {
+pub fn y_or_n(force: bool, prompt: &str) -> anyhow::Result<bool> {
+    if force {
+        println!("Force flag is present, skipping confirmation");
+        return Ok(true);
+    }
     let mut input = String::new();
-    print!("{} (y/n)", prompt);
+    print!("{} [y/N]", prompt);
     std::io::stdout().flush()?;
     std::io::stdin().read_line(&mut input)?;
-
-    Ok(input.trim() == "y")
+    let input = input.trim().to_lowercase();
+    Ok(input == "y" || input == "yes")
 }
 
 pub fn unauth_error_context<T>(res: anyhow::Result<T>, identity: &str, server: &str) -> anyhow::Result<T> {