From b63b71a3e76e669e9f130d272a6904d4a6e0bb70 Mon Sep 17 00:00:00 2001 From: Oleksandr Prypkhan Date: Wed, 1 May 2024 00:23:36 +0300 Subject: [PATCH 1/2] feat: AWS S3 force path style --- src/custom/backend.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/custom/backend.ts b/src/custom/backend.ts index 9c792de..bed7ebd 100644 --- a/src/custom/backend.ts +++ b/src/custom/backend.ts @@ -40,6 +40,10 @@ const region = process.env.RUNS_ON_AWS_REGION || process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION; +const forcePathStyle = Boolean( + process.env.RUNS_ON_S3_FORCE_PATH_STYLE || + process.env.AWS_S3_FORCE_PATH_STYLE +); const uploadQueueSize = Number(process.env.UPLOAD_QUEUE_SIZE || "4"); const uploadPartSize = @@ -48,7 +52,7 @@ const downloadQueueSize = Number(process.env.DOWNLOAD_QUEUE_SIZE || "8"); const downloadPartSize = Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024; -const s3Client = new S3Client({ region }); +const s3Client = new S3Client({ region, forcePathStyle }); export function getCacheVersion( paths: string[], From 148157c8d68b3661fe1b148fbc3afd2b554f5ac6 Mon Sep 17 00:00:00 2001 From: Oleksandr Prypkhan Date: Thu, 16 May 2024 16:10:51 +0300 Subject: [PATCH 2/2] fix: Check for explicit true string --- src/custom/backend.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/custom/backend.ts b/src/custom/backend.ts index bed7ebd..28edba2 100644 --- a/src/custom/backend.ts +++ b/src/custom/backend.ts @@ -40,10 +40,9 @@ const region = process.env.RUNS_ON_AWS_REGION || process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION; -const forcePathStyle = Boolean( - process.env.RUNS_ON_S3_FORCE_PATH_STYLE || - process.env.AWS_S3_FORCE_PATH_STYLE -); +const forcePathStyle = + process.env.RUNS_ON_S3_FORCE_PATH_STYLE === "true" || + process.env.AWS_S3_FORCE_PATH_STYLE === "true"; const uploadQueueSize = Number(process.env.UPLOAD_QUEUE_SIZE || "4"); const uploadPartSize =