From f36856332ef151a65b7f98a0bd9972bef96a67ff Mon Sep 17 00:00:00 2001 From: itchyny Date: Wed, 14 Feb 2024 13:16:07 +0900 Subject: [PATCH] Filter S3 objects by common prefix to reduce number of API call --- packages/cache/lib/internal/cacheHttpClient.js | 11 +++++++++++ packages/cache/lib/internal/cacheHttpClient.js.map | 2 +- packages/cache/src/internal/cacheHttpClient.ts | 12 ++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/packages/cache/lib/internal/cacheHttpClient.js b/packages/cache/lib/internal/cacheHttpClient.js index 718a5ef784..5dc3b3b06c 100644 --- a/packages/cache/lib/internal/cacheHttpClient.js +++ b/packages/cache/lib/internal/cacheHttpClient.js @@ -97,6 +97,17 @@ function getCacheEntryS3(s3Options, s3BucketName, keys, paths) { const param = { Bucket: s3BucketName }; + if (primaryKey.includes('/')) { + let prefix = primaryKey.replace(/[^/]*$/, ''); + while (prefix.endsWith('/')) { + if (keys.every((k) => k.startsWith(prefix))) { + core.debug(`Object prefix: ${prefix}`); + param.Prefix = prefix; + break; + } + prefix = prefix.replace(/[^/]*\/$/, ''); + } + } for (;;) { core.debug(`ListObjects Count: ${count}`); if (s3ContinuationToken != undefined) { diff --git a/packages/cache/lib/internal/cacheHttpClient.js.map b/packages/cache/lib/internal/cacheHttpClient.js.map index 03eea3bc5c..bb9f39005c 100644 --- a/packages/cache/lib/internal/cacheHttpClient.js.map +++ b/packages/cache/lib/internal/cacheHttpClient.js.map @@ -1 +1 @@ -{"version":3,"file":"cacheHttpClient.js","sourceRoot":"","sources":["../../src/internal/cacheHttpClient.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"cacheHttpClient.js","sourceRoot":"","sources":["../../src/internal/cacheHttpClient.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/cache/src/internal/cacheHttpClient.ts b/packages/cache/src/internal/cacheHttpClient.ts index ca27560257..d223463efc 100644 --- a/packages/cache/src/internal/cacheHttpClient.ts +++ b/packages/cache/src/internal/cacheHttpClient.ts @@ -132,6 +132,18 @@ async function getCacheEntryS3( Bucket: s3BucketName } as ListObjectsV2CommandInput + if (primaryKey.includes('/')) { + let prefix = primaryKey.replace(/[^/]*$/, '') + while (prefix.endsWith('/')) { + if (keys.every((k) => k.startsWith(prefix))) { + core.debug(`Object prefix: ${prefix}`) + param.Prefix = prefix + break + } + prefix = prefix.replace(/[^/]*\/$/, '') + } + } + for (;;) { core.debug(`ListObjects Count: ${count}`) if (s3ContinuationToken != undefined) {