From f3a0c81639662a7da65af49e4032dfc573dd93eb Mon Sep 17 00:00:00 2001 From: Guillaume Bouvignies Date: Tue, 5 Dec 2023 09:52:49 +0100 Subject: [PATCH] fix: strip prefix of s3 resource (#2780) --- backend/windmill-api/src/job_helpers.rs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/backend/windmill-api/src/job_helpers.rs b/backend/windmill-api/src/job_helpers.rs index 9ba9bc8223..e4d3c5b390 100644 --- a/backend/windmill-api/src/job_helpers.rs +++ b/backend/windmill-api/src/job_helpers.rs @@ -631,15 +631,11 @@ async fn get_workspace_s3_resource<'c>( LargeFileStorage::S3Storage(s3_lfs) => s3_lfs, }; - return get_s3_resource( - authed, - user_db, - db, - token, - w_id, - s3_lfs.s3_resource_path.as_str(), - ) - .await; + let stripped_resource_path = match s3_lfs.s3_resource_path.strip_prefix("$res:") { + Some(stripped) => stripped, + None => s3_lfs.s3_resource_path.as_str(), + }; + return get_s3_resource(authed, user_db, db, token, w_id, stripped_resource_path).await; } async fn get_s3_resource<'c>(