Upgrade prompt is skipped when -y is passed

Author: jdetter

crates/cli/src/subcommands/publish.rs

@@ -246,14 +246,18 @@ fn confirm_and_clear(
     Ok(builder)
 }
 
-fn confirm_major_version_upgrade() -> Result<(), anyhow::Error> {
+fn confirm_major_version_upgrade(force: bool) -> Result<(), anyhow::Error> {
     println!(
         "It looks like you're trying to do a major version upgrade from 1.0 to 2.0. We recommend first looking at the upgrade notes before committing to this upgrade: https://spacetimedb.com/docs/upgrade"
     );
     println!();
     println!("WARNING: Once you publish you cannot revert back to version 1.0.");
     println!();
 
+    if force {
+        return Ok(());
+    }
+
     let mut input = String::new();
     print!("Please type 'upgrade' to accept this change: ");
     let mut stdout = std::io::stdout();
@@ -671,7 +675,7 @@ async fn apply_pre_publish_if_needed(
             PrePublishResult::ManualMigrate(manual) => manual.major_version_upgrade,
         };
         if major_version_upgrade {
-            confirm_major_version_upgrade()?;
+            confirm_major_version_upgrade(force)?;
         }
 
         match pre {

crates/smoketests/src/lib.rs

@@ -1003,19 +1003,25 @@ log = "0.4"
 
     /// Publishes the module with name, clear, and break_clients options.
     pub fn publish_module_with_options(&mut self, name: &str, clear: bool, break_clients: bool) -> Result<String> {
-        self.publish_module_internal(Some(name), clear, break_clients, None)
+        self.publish_module_internal(Some(name), clear, break_clients, true, None)
     }
 
     /// Publishes the module and allows supplying stdin input to the CLI.
     ///
     /// Useful for interactive publish prompts which require typed acknowledgements.
+    /// Note: does NOT pass `--yes` so that interactive prompts are not suppressed.
     pub fn publish_module_with_stdin(&mut self, name: &str, stdin_input: &str) -> Result<String> {
-        self.publish_module_internal(Some(name), false, false, Some(stdin_input))
+        self.publish_module_internal(Some(name), false, false, false, Some(stdin_input))
+    }
+
+    /// Publishes the module without passing `--yes`, so interactive prompts are not suppressed.
+    pub fn publish_module_named_no_yes(&mut self, name: &str) -> Result<String> {
+        self.publish_module_internal(Some(name), false, false, false, None)
     }
 
     /// Internal helper for publishing with options.
     fn publish_module_opts(&mut self, name: Option<&str>, clear: bool) -> Result<String> {
-        self.publish_module_internal(name, clear, false, None)
+        self.publish_module_internal(name, clear, false, true, None)
     }
 
     /// Internal helper for publishing with all options.
@@ -1024,6 +1030,7 @@ log = "0.4"
         name: Option<&str>,
         clear: bool,
         break_clients: bool,
+        force: bool,
         stdin_input: Option<&str>,
     ) -> Result<String> {
         let start = Instant::now();
@@ -1072,9 +1079,12 @@ log = "0.4"
             &self.server_url,
             "--bin-path",
             &wasm_path_str,
-            "--yes",
         ];
 
+        if force {
+            args.push("--yes");
+        }
+
         if clear {
             args.push("--clear-database");
         }

crates/smoketests/tests/smoketests/publish_upgrade_prompt.rs

@@ -33,10 +33,31 @@ fn upgrade_prompt_on_publish() {
     // Switch back to source-built module, which uses current bindings.
     test.write_module_code(MODULE_CODE).unwrap();
 
-    let deny_err = test.publish_module_named(&db_name, false).unwrap_err().to_string();
+    let deny_err = test.publish_module_named_no_yes(&db_name).unwrap_err().to_string();
     assert!(deny_err.contains("major version upgrade from 1.0 to 2.0"));
     assert!(deny_err.contains("Please type 'upgrade' to accept this change:"));
 
     let accepted_identity = test.publish_module_with_stdin(&db_name, "upgrade\n").unwrap();
     assert_eq!(accepted_identity, initial_identity);
 }
+
+#[test]
+fn upgrade_prompt_suppressed_by_yes_flag() {
+    let mut test = Smoketest::builder().autopublish(false).build();
+
+    let old_wasm = old_fixture_wasm();
+    assert!(old_wasm.exists(), "expected old fixture wasm at {}", old_wasm.display());
+
+    let db_name = format!("upgrade-smoke-yes-{}", random_string());
+
+    test.use_precompiled_wasm_path(&old_wasm).unwrap();
+    let initial_identity = test.publish_module_named(&db_name, false).unwrap();
+    assert_eq!(test.database_identity.as_deref(), Some(initial_identity.as_str()));
+
+    // Switch back to source-built module, which uses current bindings.
+    test.write_module_code(MODULE_CODE).unwrap();
+
+    // With --yes, the upgrade prompt should be suppressed and publish should succeed.
+    let accepted_identity = test.publish_module_named(&db_name, false).unwrap();
+    assert_eq!(accepted_identity, initial_identity);
+}