update to auto update only

Author: brandonskiser

crates/fig_desktop/src/install.rs

@@ -115,7 +115,7 @@ pub async fn run_install(ctx: Arc<Context>, ignore_immediate_update: bool) {
             use tokio::time::timeout;
             // Check for updates but timeout after 3 seconds to avoid making the user wait too long
             // todo: don't download the index file twice
-            match timeout(Duration::from_secs(3), check_for_updates(true)).await {
+            match timeout(Duration::from_secs(3), check_for_updates(true, true)).await {
                 Ok(Ok(Some(_))) => {
                     crate::update::check_for_update(true, true).await;
                 },

crates/fig_desktop/src/tray.rs

@@ -97,6 +97,7 @@ fn tray_update(proxy: &EventLoopProxy) {
                 ignore_rollout: true,
                 interactive: true,
                 relaunch_dashboard: true,
+                is_auto_update: false,
             },
         )
         .await;
@@ -137,7 +138,7 @@ fn tray_update(proxy: &EventLoopProxy) {
 ///
 /// Returns `true` if we should continue with updating, `false` otherwise.
 async fn should_continue_with_update(ctx: &Context, proxy: &EventLoopProxy) -> bool {
-    match fig_install::check_for_updates(true).await {
+    match fig_install::check_for_updates(true, false).await {
         Ok(Some(pkg)) => {
             let file_type = get_file_type(ctx, &Variant::Full)
                 .await

crates/fig_desktop/src/update.rs

@@ -101,6 +101,7 @@ pub async fn check_for_update(show_webview: bool, relaunch_dashboard: bool) -> b
             ignore_rollout: false,
             interactive: show_webview,
             relaunch_dashboard,
+            is_auto_update: true,
         })
         .await
         {

crates/fig_desktop_api/src/requests/update.rs

@@ -20,13 +20,14 @@ pub async fn update_application(request: UpdateApplicationRequest) -> RequestRes
             ignore_rollout: request.ignore_rollout.unwrap_or(true),
             interactive: request.interactive.unwrap_or(true),
             relaunch_dashboard: request.relaunch_dashboard.unwrap_or(true),
+            is_auto_update: false,
         },
     ));
     RequestResult::success()
 }
 
 pub async fn check_for_updates(_request: CheckForUpdatesRequest) -> RequestResult {
-    fig_install::check_for_updates(true)
+    fig_install::check_for_updates(true, false)
         .await
         .map(|res| {
             Box::new(ServerOriginatedSubMessage::CheckForUpdatesResponse(

crates/fig_install/src/index.rs

@@ -111,6 +111,7 @@ impl Index {
         let current_version = args.current_version;
         let product_name = args.product_name;
         let ignore_rollout = args.ignore_rollout;
+        let is_auto_update = args.is_auto_update;
         let threshold_override = args.threshold_override;
 
         if !self.supported.iter().any(|support| {
@@ -143,7 +144,9 @@ impl Index {
             .filter(|version| {
                 version.update_conditions.is_empty()
                     || version.update_conditions.iter().all(|cond| match cond {
-                        UpdateCondition::AllowedProductNames(product_names) => product_names.contains(product_name),
+                        UpdateCondition::AllowedAutoUpdateProductNames(product_names) => {
+                            !is_auto_update || product_names.contains(product_name)
+                        },
                     })
             })
             .collect::<Vec<&RemoteVersion>>();
@@ -252,6 +255,7 @@ pub struct FindNextVersionArgs<'a> {
     pub file_type: Option<&'a FileType>,
     pub current_version: &'a str,
     pub product_name: &'a ProductName,
+    pub is_auto_update: bool,
     pub ignore_rollout: bool,
     pub threshold_override: Option<u8>,
 }
@@ -286,7 +290,7 @@ pub(crate) struct RemoteVersion {
 #[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub enum UpdateCondition {
-    AllowedProductNames(Vec<ProductName>),
+    AllowedAutoUpdateProductNames(Vec<ProductName>),
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, EnumString, Display)]
@@ -429,6 +433,7 @@ pub async fn check_for_updates(
     variant: &Variant,
     file_type: Option<&FileType>,
     ignore_rollout: bool,
+    is_auto_update: bool,
 ) -> Result<Option<UpdatePackage>, Error> {
     const CURRENT_VERSION: &str = env!("CARGO_PKG_VERSION");
     let product_name = ProductName::default();
@@ -439,6 +444,7 @@ pub async fn check_for_updates(
         current_version: CURRENT_VERSION,
         product_name: &product_name,
         ignore_rollout,
+        is_auto_update,
         threshold_override: None,
     })
 }
@@ -528,6 +534,7 @@ mod tests {
             &Variant::Full,
             Some(FileType::Dmg).as_ref(),
             false,
+            false,
         )
         .await
         .unwrap();
@@ -707,6 +714,7 @@ mod tests {
                 current_version: "1.2.1",
                 product_name: &product_name,
                 ignore_rollout: true,
+                is_auto_update: false,
                 threshold_override: None,
             })
             .unwrap();
@@ -723,6 +731,7 @@ mod tests {
                 current_version: "1.2.0",
                 product_name: &ProductName::Unknown("qv2".to_string()),
                 ignore_rollout: true,
+                is_auto_update: false,
                 threshold_override: None,
             })
             .unwrap()
@@ -740,6 +749,7 @@ mod tests {
             current_version: "1.2.1",
             product_name: &ProductName::AmazonQ,
             ignore_rollout: true,
+            is_auto_update: false,
             threshold_override: None,
         });
         assert!(next.is_err());
@@ -755,6 +765,7 @@ mod tests {
                 current_version: "1.0.5",
                 product_name: &ProductName::Unknown("qv2".to_string()),
                 ignore_rollout: true,
+                is_auto_update: false,
                 threshold_override: None,
             })
             .unwrap()
@@ -763,7 +774,7 @@ mod tests {
     }
 
     #[test]
-    fn index_test_allowed_product_names_update() {
+    fn index_test_allowed_autoupdate_product_names_update() {
         let mut index = load_test_index();
 
         let next = index
@@ -774,16 +785,34 @@ mod tests {
                 current_version: "1.0.5",
                 product_name: &ProductName::AmazonQ,
                 ignore_rollout: true,
+                is_auto_update: false,
+                threshold_override: None,
+            })
+            .unwrap()
+            .expect("should have update package");
+        assert_eq!(
+            next.version.to_string().as_str(),
+            "1.2.1",
+            "amazon q during manual update should update into 1.2.1"
+        );
+        let next = index
+            .find_next_version(FindNextVersionArgs {
+                target_triple: &TargetTriple::X86_64UnknownLinuxGnu,
+                variant: &Variant::Full,
+                file_type: None,
+                current_version: "1.0.5",
+                product_name: &ProductName::AmazonQ,
+                ignore_rollout: true,
+                is_auto_update: true,
                 threshold_override: None,
             })
             .unwrap()
             .expect("should have update package");
         assert_eq!(
             next.version.to_string().as_str(),
             "1.2.0",
-            "amazon q should update into 1.2.0"
+            "amazon q during auto update should update into 1.2.0"
         );
-
         let next = index
             .find_next_version(FindNextVersionArgs {
                 target_triple: &TargetTriple::X86_64UnknownLinuxGnu,
@@ -792,19 +821,22 @@ mod tests {
                 current_version: "1.0.5",
                 product_name: &ProductName::Unknown("qv2".to_string()),
                 ignore_rollout: true,
+                is_auto_update: true,
                 threshold_override: None,
             })
             .unwrap()
             .expect("should have update package");
         assert_eq!(
             next.version.to_string().as_str(),
             "1.2.1",
-            "qv2 should update into 1.2.1"
+            "qv2 during auto update should update into 1.2.1"
         );
 
         // Push a newer update that allows Amazon Q
         let mut last = index.versions.last().cloned().unwrap();
-        last.update_conditions = vec![UpdateCondition::AllowedProductNames(vec![ProductName::AmazonQ])];
+        last.update_conditions = vec![UpdateCondition::AllowedAutoUpdateProductNames(vec![
+            ProductName::AmazonQ,
+        ])];
         last.version = Version::from_str("2.0.0").unwrap();
         index.versions.push(last);
 
@@ -816,6 +848,7 @@ mod tests {
                 current_version: "1.0.5",
                 product_name: &ProductName::AmazonQ,
                 ignore_rollout: true,
+                is_auto_update: true,
                 threshold_override: None,
             })
             .unwrap()
@@ -824,11 +857,11 @@ mod tests {
     }
 
     #[test]
-    fn index_test_empty_allowed_product_names_does_not_update() {
+    fn index_test_empty_allowed_autoupdate_product_names_does_not_update() {
         let mut index = load_test_index();
 
         let mut last = index.versions.last().cloned().unwrap();
-        last.update_conditions = vec![UpdateCondition::AllowedProductNames(vec![])];
+        last.update_conditions = vec![UpdateCondition::AllowedAutoUpdateProductNames(vec![])];
         last.version = Version::from_str("2.0.0").unwrap();
         index.versions.push(last);
 
@@ -840,6 +873,7 @@ mod tests {
                 current_version: "1.0.5",
                 product_name: &ProductName::Unknown("qv2".to_string()),
                 ignore_rollout: true,
+                is_auto_update: true,
                 threshold_override: None,
             })
             .unwrap()

crates/fig_install/src/lib.rs

@@ -144,7 +144,7 @@ pub fn get_max_channel() -> Channel {
         .unwrap()
 }
 
-pub async fn check_for_updates(ignore_rollout: bool) -> Result<Option<UpdatePackage>, Error> {
+pub async fn check_for_updates(ignore_rollout: bool, is_auto_update: bool) -> Result<Option<UpdatePackage>, Error> {
     let manifest = manifest();
     let ctx = Context::new();
     let file_type = match (&manifest.variant, ctx.platform().os()) {
@@ -157,6 +157,7 @@ pub async fn check_for_updates(ignore_rollout: bool) -> Result<Option<UpdatePack
         &manifest.variant,
         file_type.as_ref(),
         ignore_rollout,
+        is_auto_update,
     )
     .await
 }
@@ -177,6 +178,8 @@ pub struct UpdateOptions {
     pub interactive: bool,
     /// If to relaunch into dashboard after update (false will launch in background)
     pub relaunch_dashboard: bool,
+    /// Whether or not the update is being invoked automatically without the user's approval
+    pub is_auto_update: bool,
 }
 
 /// Attempt to update if there is a newer version of Fig
@@ -187,10 +190,11 @@ pub async fn update(
         ignore_rollout,
         interactive,
         relaunch_dashboard,
+        is_auto_update,
     }: UpdateOptions,
 ) -> Result<bool, Error> {
     info!("Checking for updates...");
-    if let Some(update) = check_for_updates(ignore_rollout).await? {
+    if let Some(update) = check_for_updates(ignore_rollout, is_auto_update).await? {
         info!("Found update: {}", update.version);
         debug!("Update info: {:?}", update);
 

crates/fig_install/test_files/test-index.json

@@ -489,7 +489,7 @@
       "version": "1.2.1",
       "updateConditions": [
           {
-              "allowedProductNames": ["qv2"]
+              "allowedAutoUpdateProductNames": ["qv2"]
           }
       ],
       "packages": [

crates/figterm/src/update.rs

@@ -55,7 +55,7 @@ pub fn check_for_update(context: &Context) {
     }
 
     tokio::spawn(async {
-        match fig_install::check_for_updates(false).await {
+        match fig_install::check_for_updates(false, true).await {
             Ok(Some(pkg)) => {
                 if let Err(err) = fig_settings::state::set_value(UPDATE_AVAILABLE_KEY, pkg.version.to_string()) {
                     warn!(?err, "Error setting {UPDATE_AVAILABLE_KEY}: {err}");

crates/q_cli/src/cli/debug/mod.rs

@@ -218,6 +218,8 @@ pub enum DebugSubcommand {
         #[arg(short = 'r', long)]
         enable_rollout: bool,
         #[arg(short, long)]
+        is_auto_update: bool,
+        #[arg(short, long)]
         override_threshold: Option<u8>,
         #[arg(short, long)]
         file_type: String,
@@ -749,6 +751,7 @@ impl DebugSubcommand {
                 version: current_version,
                 enable_rollout,
                 override_threshold,
+                is_auto_update,
                 file_type,
             } => {
                 use fig_install::index::{
@@ -771,6 +774,7 @@ impl DebugSubcommand {
                         current_version,
                         product_name: &product_name,
                         ignore_rollout: !enable_rollout,
+                        is_auto_update: *is_auto_update,
                         threshold_override: *override_threshold,
                     });
 

crates/q_cli/src/cli/update.rs

@@ -102,6 +102,7 @@ impl UpdateArgs {
                 ignore_rollout: !rollout,
                 interactive: !non_interactive,
                 relaunch_dashboard: *relaunch_dashboard,
+                is_auto_update: false,
             },
         )
         .await;
@@ -129,7 +130,10 @@ impl UpdateArgs {
 }
 
 async fn try_linux_update() -> Result<ExitCode> {
-    match (fig_install::check_for_updates(true).await, bundle_metadata().await) {
+    match (
+        fig_install::check_for_updates(true, false).await,
+        bundle_metadata().await,
+    ) {
         (ref update_result @ Ok(Some(ref pkg)), Some(file_type)) => {
             if file_type == FileType::AppImage {
                 let should_continue = dialoguer::Select::with_theme(&dialoguer_theme())