chore(config): move TURBO_REMOTE_CACHE_READ_ONLY to config

Author: chris-olszewski

crates/turborepo-lib/src/cli/mod.rs

@@ -898,8 +898,8 @@ pub struct RunArgs {
     #[clap(long, value_parser=NonEmptyStringValueParser::new(), conflicts_with = "profile")]
     pub anon_profile: Option<String>,
     /// Treat remote cache as read only
-    #[clap(long, env = "TURBO_REMOTE_CACHE_READ_ONLY", value_name = "BOOL", action = ArgAction::Set, default_value = "false", default_missing_value = "true", num_args = 0..=1)]
-    pub remote_cache_read_only: bool,
+    #[clap(long, default_missing_value = "true")]
+    pub remote_cache_read_only: Option<Option<bool>>,
     /// Generate a summary of the turbo run
     #[clap(long, env = "TURBO_RUN_SUMMARY", default_missing_value = "true")]
     pub summarize: Option<Option<bool>>,
@@ -924,7 +924,7 @@ impl Default for RunArgs {
             no_daemon: false,
             profile: None,
             anon_profile: None,
-            remote_cache_read_only: false,
+            remote_cache_read_only: None,
             summarize: None,
             experimental_space_id: None,
             parallel: false,
@@ -954,13 +954,22 @@ impl RunArgs {
         }
     }
 
+    pub fn remote_cache_read_only(&self) -> Option<bool> {
+        let remote_cache_read_only = self.remote_cache_read_only?;
+        Some(remote_cache_read_only.unwrap_or(true))
+    }
+
     pub fn track(&self, telemetry: &CommandEventBuilder) {
         // default to true
         track_usage!(telemetry, self.no_cache, |val| val);
         track_usage!(telemetry, self.daemon, |val| val);
         track_usage!(telemetry, self.no_daemon, |val| val);
         track_usage!(telemetry, self.parallel, |val| val);
-        track_usage!(telemetry, self.remote_cache_read_only, |val| val);
+        track_usage!(
+            telemetry,
+            self.remote_cache_read_only().unwrap_or_default(),
+            |val| val
+        );
 
         // default to None
         track_usage!(telemetry, &self.profile, Option::is_some);

crates/turborepo-lib/src/commands/mod.rs

@@ -102,6 +102,11 @@ impl CommandBase {
                     .execution_args()
                     .and_then(|args| args.remote_only()),
             )
+            .with_remote_cache_read_only(
+                self.args
+                    .run_args()
+                    .and_then(|args| args.remote_cache_read_only()),
+            )
             .build()
     }
 

crates/turborepo-lib/src/config/env.rs

@@ -36,6 +36,7 @@ const TURBO_MAPPING: &[(&str, &str)] = [
     ("turbo_force", "force"),
     ("turbo_log_order", "log_order"),
     ("turbo_remote_only", "remote_only"),
+    ("turbo_remote_cache_read_only", "remote_cache_read_only"),
 ]
 .as_slice();
 
@@ -82,6 +83,7 @@ impl ResolvedConfigurationOptions for EnvVars {
 
         let force = self.truthy_value("force").flatten();
         let remote_only = self.truthy_value("remote_only").flatten();
+        let remote_cache_read_only = self.truthy_value("remote_cache_read_only").flatten();
 
         // Process timeout
         let timeout = self
@@ -165,6 +167,7 @@ impl ResolvedConfigurationOptions for EnvVars {
             daemon,
             force,
             remote_only,
+            remote_cache_read_only,
 
             // Processed numbers
             timeout,
@@ -309,6 +312,7 @@ mod test {
         env.insert("turbo_force".into(), "1".into());
         env.insert("turbo_log_order".into(), "grouped".into());
         env.insert("turbo_remote_only".into(), "1".into());
+        env.insert("turbo_remote_cache_read_only".into(), "1".into());
 
         let config = EnvVars::new(&env)
             .unwrap()
@@ -318,6 +322,7 @@ mod test {
         assert!(config.force());
         assert_eq!(config.log_order(), LogOrder::Grouped);
         assert!(config.remote_only());
+        assert!(config.remote_cache_read_only());
         assert_eq!(turbo_api, config.api_url.unwrap());
         assert_eq!(turbo_login, config.login_url.unwrap());
         assert_eq!(turbo_team, config.team_slug.unwrap());
@@ -353,6 +358,7 @@ mod test {
         env.insert("turbo_force".into(), "".into());
         env.insert("turbo_log_order".into(), "".into());
         env.insert("turbo_remote_only".into(), "".into());
+        env.insert("turbo_remote_cache_read_only".into(), "".into());
 
         let config = EnvVars::new(&env)
             .unwrap()
@@ -373,6 +379,7 @@ mod test {
         assert!(!config.force());
         assert_eq!(config.log_order(), LogOrder::Auto);
         assert!(!config.remote_only());
+        assert!(!config.remote_cache_read_only());
     }
 
     #[test]

crates/turborepo-lib/src/config/mod.rs

@@ -237,6 +237,7 @@ pub struct ConfigurationOptions {
     pub(crate) force: Option<bool>,
     pub(crate) log_order: Option<LogOrder>,
     pub(crate) remote_only: Option<bool>,
+    pub(crate) remote_cache_read_only: Option<bool>,
 }
 
 #[derive(Default)]
@@ -352,6 +353,10 @@ impl ConfigurationOptions {
         self.remote_only.unwrap_or_default()
     }
 
+    pub fn remote_cache_read_only(&self) -> bool {
+        self.remote_cache_read_only.unwrap_or_default()
+    }
+
     pub fn root_turbo_json_path(&self, repo_root: &AbsoluteSystemPath) -> AbsoluteSystemPathBuf {
         self.root_turbo_json_path
             .clone()

crates/turborepo-lib/src/opts.rs

@@ -363,7 +363,7 @@ impl<'a> From<OptsInputs<'a>> for CacheOpts {
         CacheOpts {
             cache_dir: inputs.config.cache_dir().into(),
             skip_filesystem: inputs.config.remote_only(),
-            remote_cache_read_only: inputs.run_args.remote_cache_read_only,
+            remote_cache_read_only: inputs.config.remote_cache_read_only(),
             workers: inputs.run_args.cache_workers,
             skip_remote,
             remote_cache_opts,