Don't allow cache config to be sourced from config file. Also include…

… env var mapping
vercel · Oct 31, 2024 · 9c99caf · 9c99caf
1 parent 1470a4d
commit 9c99caf
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/turborepo-cache/Cargo.toml b/crates/turborepo-cache/Cargo.toml
@@ -26,9 +26,6 @@ workspace = true
 
 [dependencies]
 base64 = "0.21.0"
-biome_deserialize = { workspace = true }
-biome_deserialize_macros = { workspace = true }
-biome_diagnostics = { workspace = true }
 bytes.workspace = true
 camino = { workspace = true }
 futures = { workspace = true }

diff --git a/crates/turborepo-cache/src/lib.rs b/crates/turborepo-cache/src/lib.rs
@@ -25,7 +25,6 @@ mod upload_progress;
 use std::{backtrace, backtrace::Backtrace};
 
 pub use async_cache::AsyncCache;
-use biome_deserialize_macros::Deserializable;
 use camino::Utf8PathBuf;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
@@ -109,7 +108,7 @@ pub struct CacheHitMetadata {
     pub time_saved: u64,
 }
 
-#[derive(Serialize, Deserialize, Deserializable, Debug, PartialEq, Eq, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub struct CacheActions {
     pub read: bool,
     pub write: bool,
@@ -121,7 +120,7 @@ impl CacheActions {
     }
 }
 
-#[derive(Serialize, Deserialize, Deserializable, Debug, PartialEq, Eq, Clone, Copy, Default)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy, Default)]
 pub struct CacheConfig {
     pub local: CacheActions,
     pub remote: CacheActions,
@@ -142,7 +141,7 @@ impl Default for CacheActions {
     }
 }
 
-#[derive(Clone, Debug, Default, Serialize)]
+#[derive(Clone, Debug, Default)]
 pub struct CacheOpts {
     pub cache_dir: Utf8PathBuf,
     pub cache: CacheConfig,

diff --git a/crates/turborepo-lib/src/config/env.rs b/crates/turborepo-lib/src/config/env.rs
@@ -39,6 +39,7 @@ const TURBO_MAPPING: &[(&str, &str)] = [
     ("turbo_remote_cache_read_only", "remote_cache_read_only"),
     ("turbo_run_summary", "run_summary"),
     ("turbo_allow_no_turbo_json", "allow_no_turbo_json"),
+    ("turbo_cache", "cache"),
 ]
 .as_slice();
 

diff --git a/crates/turborepo-lib/src/config/mod.rs b/crates/turborepo-lib/src/config/mod.rs
@@ -255,6 +255,7 @@ pub struct ConfigurationOptions {
     pub(crate) root_turbo_json_path: Option<AbsoluteSystemPathBuf>,
     pub(crate) force: Option<bool>,
     pub(crate) log_order: Option<LogOrder>,
+    #[serde(skip)]
     pub(crate) cache: Option<CacheConfig>,
     pub(crate) remote_only: Option<bool>,
     pub(crate) remote_cache_read_only: Option<bool>,

diff --git a/crates/turborepo-lib/src/turbo_json/mod.rs b/crates/turborepo-lib/src/turbo_json/mod.rs
@@ -29,7 +29,6 @@ mod loader;
 pub mod parser;
 
 pub use loader::TurboJsonLoader;
-use turborepo_cache::CacheConfig;
 
 #[derive(Serialize, Deserialize, Debug, Default, PartialEq, Clone, Deserializable)]
 #[serde(rename_all = "camelCase")]
@@ -140,8 +139,6 @@ pub struct RawTurboJson {
     pub env_mode: Option<EnvMode>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub cache_dir: Option<Spanned<UnescapedString>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cache: Option<CacheConfig>,
 
     #[deserializable(rename = "//")]
     #[serde(skip)]