refactor(opts): remove config from opts

crates/turborepo-cache/src/http.rs

@@ -337,7 +337,12 @@ mod test {
             "2.0.0",
             true,
         )?;
-        let opts = CacheOpts::default();
+        let opts = CacheOpts {
+            cache_dir: ".turbo/cache".into(),
+            cache: Default::default(),
+            workers: 0,
+            remote_cache_opts: None,
+        };
         let api_auth = APIAuth {
             team_id: Some("my-team".to_string()),
             token: "my-token".to_string(),

crates/turborepo-cache/src/lib.rs

@@ -172,7 +172,7 @@ impl Default for CacheActions {
     }
 }
 
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct CacheOpts {
     pub cache_dir: Utf8PathBuf,
     pub cache: CacheConfig,
@@ -182,7 +182,7 @@ pub struct CacheOpts {
 
 #[derive(Debug, Default, Clone, Serialize, Deserialize, PartialEq, Eq)]
 pub struct RemoteCacheOpts {
-    unused_team_id: Option<String>,
+    pub unused_team_id: Option<String>,
     signature: bool,
 }
 

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

@@ -1283,8 +1283,7 @@ pub async fn run(
             }
         }
         Command::Config => {
-            let base = CommandBase::new(cli_args.clone(), repo_root, version, color_config)?;
-            config::run(base).await?;
+            config::run(repo_root, cli_args).await?;
             Ok(0)
         }
         Command::Ls {

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

@@ -1,8 +1,9 @@
 use camino::Utf8Path;
 use serde::Serialize;
+use turbopath::AbsoluteSystemPathBuf;
 use turborepo_repository::{package_graph::PackageGraph, package_json::PackageJson};
 
-use crate::{cli, cli::EnvMode, commands::CommandBase, turbo_json::UIMode};
+use crate::{cli, cli::EnvMode, commands::CommandBase, turbo_json::UIMode, Args};
 
 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
@@ -26,11 +27,11 @@ struct ConfigOutput<'a> {
     cache_dir: &'a Utf8Path,
 }
 
-pub async fn run(base: CommandBase) -> Result<(), cli::Error> {
-    let config = base.config();
-    let root_package_json = PackageJson::load(&base.repo_root.join_component("package.json"))?;
+pub async fn run(repo_root: AbsoluteSystemPathBuf, args: Args) -> Result<(), cli::Error> {
+    let config = CommandBase::config_init(&repo_root, &args)?;
+    let root_package_json = PackageJson::load(&repo_root.join_component("package.json"))?;
 
-    let package_graph = PackageGraph::builder(&base.repo_root, root_package_json)
+    let package_graph = PackageGraph::builder(&repo_root, root_package_json)
         .build()
         .await?;
 

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

@@ -174,8 +174,9 @@ pub async fn link(
     let api_client = base.api_client()?;
     let token = base
         .opts()
-        .config
-        .token()
+        .api_client_opts
+        .token
+        .as_deref()
         .ok_or_else(|| Error::TokenNotFound {
             command: base.color_config.apply(BOLD.apply_to("`npx turbo login`")),
         })?;
@@ -639,7 +640,7 @@ mod test {
             .build()?;
 
         let mut base = CommandBase::from_opts(
-            Opts::new(&Args::default(), config)?,
+            Opts::new(&repo_root, &Args::default(), config)?,
             repo_root.clone(),
             "1.0.0",
             ColorConfig::new(false),
@@ -701,7 +702,7 @@ mod test {
             .build()?;
 
         let mut base = CommandBase::from_opts(
-            Opts::new(&Args::default(), config)?,
+            Opts::new(&repo_root, &Args::default(), config)?,
             repo_root.clone(),
             "",
             ColorConfig::new(false),

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

@@ -15,9 +15,9 @@ pub async fn sso_login(
     telemetry.track_login_method(LoginMethod::SSO);
     let api_client: APIClient = base.api_client()?;
     let color_config = base.color_config;
-    let login_url_config = base.config().login_url().to_string();
+    let login_url_config = base.opts.api_client_opts.login_url.to_string();
     let options = LoginOptions {
-        existing_token: base.config().token(),
+        existing_token: base.opts.api_client_opts.token.as_deref(),
         sso_team: Some(sso_team),
         force,
         ..LoginOptions::new(
@@ -72,9 +72,11 @@ pub async fn login(
 
     let api_client: APIClient = base.api_client()?;
     let color_config = base.color_config;
-    let login_url_config = base.config().login_url().to_string();
+    let login_url_config = base.opts.api_client_opts.login_url.to_string();
+    let existing_token = base.opts.api_client_opts.token.as_deref();
+
     let options = LoginOptions {
-        existing_token: base.config().token(),
+        existing_token,
         force,
         ..LoginOptions::new(
             &color_config,

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

@@ -45,7 +45,7 @@ impl CommandBase {
         color_config: ColorConfig,
     ) -> Result<Self, cli::Error> {
         let config = Self::config_init(&repo_root, &args)?;
-        let opts = Opts::new(&args, config)?;
+        let opts = Opts::new(&repo_root, &args, config)?;
 
         Ok(Self {
             repo_root,
@@ -69,7 +69,7 @@ impl CommandBase {
         }
     }
 
-    fn config_init(
+    pub fn config_init(
         repo_root: &AbsoluteSystemPath,
         args: &Args,
     ) -> Result<ConfigurationOptions, ConfigError> {
@@ -143,11 +143,10 @@ impl CommandBase {
     }
 
     pub fn api_auth(&self) -> Result<Option<APIAuth>, ConfigError> {
-        let config = self.config();
-        let team_id = config.team_id();
-        let team_slug = config.team_slug();
+        let team_id = self.opts.api_client_opts.team_id.as_ref();
+        let team_slug = self.opts.api_client_opts.team_slug.as_ref();
 
-        let Some(token) = config.token() else {
+        let Some(token) = &self.opts.api_client_opts.token else {
             return Ok(None);
         };
 
@@ -158,18 +157,12 @@ impl CommandBase {
         }))
     }
 
-    pub fn config(&self) -> &ConfigurationOptions {
-        &self.opts.config
-    }
-
     pub fn api_client(&self) -> Result<APIClient, ConfigError> {
-        let config = &self.opts.config;
-        let api_url = config.api_url();
-        let timeout = config.timeout();
-        let upload_timeout = config.upload_timeout();
+        let timeout = self.opts.api_client_opts.timeout;
+        let upload_timeout = self.opts.api_client_opts.upload_timeout;
 
         APIClient::new(
-            api_url,
+            &self.opts.api_client_opts.api_url,
             if timeout > 0 {
                 Some(Duration::from_secs(timeout))
             } else {
@@ -181,7 +174,7 @@ impl CommandBase {
                 None
             },
             self.version,
-            config.preflight(),
+            self.opts.api_client_opts.preflight,
         )
         .map_err(ConfigError::ApiClient)
     }

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

@@ -263,7 +263,7 @@ impl<'a> Prune<'a> {
         output_dir: &str,
         telemetry: CommandEventBuilder,
     ) -> Result<Self, Error> {
-        let allow_missing_package_manager = base.config().allow_no_package_manager();
+        let allow_missing_package_manager = base.opts().config_opts.allow_no_package_manager;
         telemetry.track_arg_usage(
             "dangerously-allow-missing-package-manager",
             allow_missing_package_manager,

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

@@ -16,7 +16,8 @@ enum UnlinkSpacesResult {
 }
 
 fn unlink_remote_caching(base: &mut CommandBase) -> Result<(), cli::Error> {
-    let needs_disabling = base.config().team_id().is_some() || base.config().team_slug().is_some();
+    let needs_disabling = base.opts.api_client_opts.team_id.is_some()
+        || base.opts.api_client_opts.team_slug.is_some();
 
     let output = if needs_disabling {
         let local_config_path = base.local_config_path();
@@ -56,7 +57,8 @@ fn unlink_remote_caching(base: &mut CommandBase) -> Result<(), cli::Error> {
 }
 
 fn unlink_spaces(base: &mut CommandBase) -> Result<(), cli::Error> {
-    let needs_disabling = base.config().team_id().is_some() || base.config().team_slug().is_some();
+    let needs_disabling = base.opts().api_client_opts.team_id.is_some()
+        || base.opts().api_client_opts.team_slug.is_some();
 
     if needs_disabling {
         let local_config_path = base.local_config_path();

crates/turborepo-lib/src/diagnostics.rs

@@ -406,8 +406,8 @@ impl Diagnostic for RemoteCacheDiagnostic {
             let (has_team_id, has_team_slug) = {
                 let base = base.lock().await;
                 (
-                    base.config().team_id().is_some(),
-                    base.config().team_slug().is_some(),
+                    base.opts().api_client_opts.team_id.is_some(),
+                    base.opts().api_client_opts.team_slug.is_some(),
                 )
             };