From e3d28b95074db6f5331fde7bcbf027779a85acea Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 19 Sep 2023 18:15:01 +0200
Subject: [PATCH] feat: support pinned versions for bun in deployed scripts

---
 backend/windmill-worker/nsjail/run.bun.config.proto | 9 ---------
 backend/windmill-worker/src/bun_executor.rs         | 7 ++++++-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/backend/windmill-worker/nsjail/run.bun.config.proto b/backend/windmill-worker/nsjail/run.bun.config.proto
index 8f96f18612..367c1c44de 100644
--- a/backend/windmill-worker/nsjail/run.bun.config.proto
+++ b/backend/windmill-worker/nsjail/run.bun.config.proto
@@ -71,14 +71,6 @@ mount {
 }
 
 
-mount {
-    src: "{JOB_DIR}/node_modules"
-    dst: "/tmp/bun/node_modules"
-    is_bind: true
-    mandatory: false
-}
-
-
 mount {
     src: "{JOB_DIR}/wrapper.ts"
     dst: "/tmp/bun/wrapper.ts"
@@ -139,7 +131,6 @@ mount {
     src: "{CACHE_DIR}"
     dst: "/tmp/windmill/cache/bun"
     is_bind: true
-    rw: true
     mandatory: false
 }
 
diff --git a/backend/windmill-worker/src/bun_executor.rs b/backend/windmill-worker/src/bun_executor.rs
index 7473aa8b20..8eac5bcb58 100644
--- a/backend/windmill-worker/src/bun_executor.rs
+++ b/backend/windmill-worker/src/bun_executor.rs
@@ -25,7 +25,10 @@ use crate::{
 #[cfg(feature = "enterprise")]
 use crate::MAX_BUFFERED_DEDICATED_JOBS;
 
-use tokio::{fs::File, process::Command};
+use tokio::{
+    fs::{remove_dir_all, File},
+    process::Command,
+};
 
 #[cfg(feature = "enterprise")]
 use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
@@ -227,6 +230,7 @@ pub async fn handle_bun_job(
             common_bun_proc_envs.clone(),
         )
         .await?;
+        remove_dir_all(format!("{}/node_modules", job_dir)).await?;
     } else if !*DISABLE_NSJAIL {
         logs.push_str("\n\n--- BUN INSTALL ---\n");
         set_logs(&logs, &job.id, &db).await;
@@ -243,6 +247,7 @@ pub async fn handle_bun_job(
             false,
         )
         .await?;
+        remove_dir_all(format!("{}/node_modules", job_dir)).await?;
     }
 
     logs.push_str("\n\n--- BUN CODE EXECUTION ---\n");