From fac32f3ebf3589df06f4e99058ffcfc998d4a560 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 20 Apr 2023 23:45:31 +0200
Subject: [PATCH] better rclone filters

---
 backend/windmill-worker/src/global_cache.rs | 52 ++++++++++-----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/backend/windmill-worker/src/global_cache.rs b/backend/windmill-worker/src/global_cache.rs
index 56ecd988b9..889985bd46 100644
--- a/backend/windmill-worker/src/global_cache.rs
+++ b/backend/windmill-worker/src/global_cache.rs
@@ -147,12 +147,14 @@ pub async fn copy_cache_from_bucket(bucket: &str, tx: Sender<()>) -> error::Resu
             &ROOT_TMP_CACHE_DIR,
             "--size-only",
             "--fast-list",
-            "--exclude",
-            &format!("deno/gen/file/tmp/windmill/**"),
-            "--exclude",
-            &format!("pip/**"),
-            "--exclude",
-            &format!("{TAR_CACHE_FILENAME}"),
+            "--filter",
+            "+ deno/**",
+            "--filter",
+            "+ go/**",
+            "--filter",
+            "+ tar/**",
+            "--filter",
+            "- deno/gen/file/tmp/windmill/**",
         ],
     )
     .await
@@ -185,14 +187,12 @@ pub async fn copy_cache_to_bucket(bucket: &str) -> error::Result<()> {
             &format!(":s3,env_auth=true:{bucket}"),
             "--size-only",
             "--fast-list",
-            "--exclude",
-            &format!("deno/gen/file/tmp/windmill/**"),
-            "--exclude",
-            &format!("{TAR_CACHE_FILENAME}"),
-            "--exclude",
-            &format!("pip/**"),
-            "--exclude",
-            &format!("tar/**"),
+            "--filter",
+            "+ deno/**",
+            "--filter",
+            "+ go/**",
+            "--filter",
+            "- deno/gen/file/tmp/windmill/**",
         ],
     )
     .await
@@ -394,12 +394,12 @@ pub async fn copy_tmp_cache_to_cache() -> error::Result<()> {
             "sync",
             ROOT_TMP_CACHE_DIR,
             ROOT_CACHE_DIR,
-            "--exclude",
-            TAR_CACHE_FILENAME,
-            "--exclude",
-            &format!("pip/**"),
-            "--exclude",
-            &format!("tar/**"),
+            "--filter",
+            "+ deno/**",
+            "--filter",
+            "+ go/**",
+            "--filter",
+            "- deno/gen/file/tmp/windmill/**",
         ],
     )
     .await?;
@@ -487,12 +487,12 @@ pub async fn copy_cache_to_tmp_cache() -> error::Result<()> {
             "sync",
             ROOT_CACHE_DIR,
             ROOT_TMP_CACHE_DIR,
-            "--exclude",
-            TAR_CACHE_FILENAME,
-            "--exclude",
-            &format!("pip/**"),
-            "--exclude",
-            &format!("deno/gen/file/tmp/windmill/**"),
+            "--filter",
+            "+ deno/**",
+            "--filter",
+            "+ go/**",
+            "--filter",
+            "- deno/gen/file/tmp/windmill/**",
         ],
     )
     .await?;