diff --git a/package-lock.json b/package-lock.json index bab1459..379cc28 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "bazels3cache", - "version": "1.0.1", + "version": "1.0.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/config.ts b/src/config.ts index 930b3c9..f1d19ea 100644 --- a/src/config.ts +++ b/src/config.ts @@ -27,7 +27,7 @@ export interface Config { socketTimeoutSeconds?: number; maxEntrySizeBytes?: number; allowGccDepfiles?: boolean; - + s3Prefix?: string; asyncUpload?: { enabled?: boolean; maxPendingUploadMB?: number; diff --git a/src/server.ts b/src/server.ts index efb68d6..b176ba4 100644 --- a/src/server.ts +++ b/src/server.ts @@ -222,7 +222,7 @@ export function startServer(s3: AWS.S3, config: Config, onDoneInitializing: () = } else { const s3request = s3.getObject({ Bucket: config.bucket, - Key: s3key + Key: config.s3Prefix + s3key }).promise(); s3request @@ -300,7 +300,7 @@ export function startServer(s3: AWS.S3, config: Config, onDoneInitializing: () = const streamedBody = fs.createReadStream(pth); const s3request = s3.upload({ Bucket: config.bucket, - Key: s3key, + Key: config.s3Prefix + s3key, Body: streamedBody, // Very important: The bucket owner needs full control of the uploaded // object, so that they can share the object with all the appropriate @@ -351,7 +351,7 @@ export function startServer(s3: AWS.S3, config: Config, onDoneInitializing: () = } else { const s3request = s3.headObject({ Bucket: config.bucket, - Key: s3key + Key: config.s3Prefix + s3key }).promise(); s3request @@ -375,7 +375,7 @@ export function startServer(s3: AWS.S3, config: Config, onDoneInitializing: () = const s3request = s3.deleteObject({ Bucket: config.bucket, - Key: s3key + Key: config.s3Prefix + s3key }).promise(); s3request