actions
/
cache
mirror of https://github.com/actions/cache.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from runs-on/fix/one-s3client 

Only one s3client initialisation
pull/1662/head
Cyril Rohr 2024-02-28 10:35:52 +01:00 committed by GitHub
parent df4fed6d95 f45c4284d8
commit 02aecb09b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/restore-only/index.js vendored
View File

@ -93791,6 +93791,7 @@ const uploadQueueSize = Number(process.env.UPLOAD_QUEUE_SIZE || "4");
const uploadPartSize = Number(process.env.UPLOAD_PART_SIZE || "32") * 1024 * 1024; const uploadPartSize = Number(process.env.UPLOAD_PART_SIZE || "32") * 1024 * 1024;
const downloadQueueSize = Number(process.env.DOWNLOAD_QUEUE_SIZE || "8"); const downloadQueueSize = Number(process.env.DOWNLOAD_QUEUE_SIZE || "8");
const downloadPartSize = Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024; const downloadPartSize = Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024;
const s3Client = new client_s3_1.S3Client({ region });
function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) { function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) {
// don't pass changes upstream // don't pass changes upstream
const components = paths.slice(); const components = paths.slice();
@ -93819,7 +93820,6 @@ function getS3Prefix(paths, { compressionMethod, enableCrossOsArchive }) {
function getCacheEntry(keys, paths, { compressionMethod, enableCrossOsArchive }) { function getCacheEntry(keys, paths, { compressionMethod, enableCrossOsArchive }) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const cacheEntry = {}; const cacheEntry = {};
const s3Client = new client_s3_1.S3Client({ region });
// Find the most recent key matching one of the restoreKeys prefixes // Find the most recent key matching one of the restoreKeys prefixes
for (const restoreKey of keys) { for (const restoreKey of keys) {
const s3Prefix = getS3Prefix(paths, { const s3Prefix = getS3Prefix(paths, {
@ -93857,7 +93857,6 @@ function downloadCache(archiveLocation, archivePath, options) {
if (!region) { if (!region) {
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new client_s3_1.S3Client({ region });
const archiveUrl = new URL(archiveLocation); const archiveUrl = new URL(archiveLocation);
const objectKey = archiveUrl.pathname.slice(1); const objectKey = archiveUrl.pathname.slice(1);
const command = new client_s3_1.GetObjectCommand({ const command = new client_s3_1.GetObjectCommand({
@ -93879,7 +93878,6 @@ function saveCache(key, paths, archivePath, { compressionMethod, enableCrossOsAr
if (!region) { if (!region) {
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new client_s3_1.S3Client({ region });
const s3Prefix = getS3Prefix(paths, { const s3Prefix = getS3Prefix(paths, {
compressionMethod, compressionMethod,
enableCrossOsArchive enableCrossOsArchive

4
dist/restore/index.js vendored
View File

@ -93791,6 +93791,7 @@ const uploadQueueSize = Number(process.env.UPLOAD_QUEUE_SIZE || "4");
const uploadPartSize = Number(process.env.UPLOAD_PART_SIZE || "32") * 1024 * 1024; const uploadPartSize = Number(process.env.UPLOAD_PART_SIZE || "32") * 1024 * 1024;
const downloadQueueSize = Number(process.env.DOWNLOAD_QUEUE_SIZE || "8"); const downloadQueueSize = Number(process.env.DOWNLOAD_QUEUE_SIZE || "8");
const downloadPartSize = Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024; const downloadPartSize = Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024;
const s3Client = new client_s3_1.S3Client({ region });
function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) { function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) {
// don't pass changes upstream // don't pass changes upstream
const components = paths.slice(); const components = paths.slice();
@ -93819,7 +93820,6 @@ function getS3Prefix(paths, { compressionMethod, enableCrossOsArchive }) {
function getCacheEntry(keys, paths, { compressionMethod, enableCrossOsArchive }) { function getCacheEntry(keys, paths, { compressionMethod, enableCrossOsArchive }) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const cacheEntry = {}; const cacheEntry = {};
const s3Client = new client_s3_1.S3Client({ region });
// Find the most recent key matching one of the restoreKeys prefixes // Find the most recent key matching one of the restoreKeys prefixes
for (const restoreKey of keys) { for (const restoreKey of keys) {
const s3Prefix = getS3Prefix(paths, { const s3Prefix = getS3Prefix(paths, {
@ -93857,7 +93857,6 @@ function downloadCache(archiveLocation, archivePath, options) {
if (!region) { if (!region) {
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new client_s3_1.S3Client({ region });
const archiveUrl = new URL(archiveLocation); const archiveUrl = new URL(archiveLocation);
const objectKey = archiveUrl.pathname.slice(1); const objectKey = archiveUrl.pathname.slice(1);
const command = new client_s3_1.GetObjectCommand({ const command = new client_s3_1.GetObjectCommand({
@ -93879,7 +93878,6 @@ function saveCache(key, paths, archivePath, { compressionMethod, enableCrossOsAr
if (!region) { if (!region) {
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new client_s3_1.S3Client({ region });
const s3Prefix = getS3Prefix(paths, { const s3Prefix = getS3Prefix(paths, {
compressionMethod, compressionMethod,
enableCrossOsArchive enableCrossOsArchive

4
dist/save-only/index.js vendored
View File

@ -93791,6 +93791,7 @@ const uploadQueueSize = Number(process.env.UPLOAD_QUEUE_SIZE || "4");
const uploadPartSize = Number(process.env.UPLOAD_PART_SIZE || "32") * 1024 * 1024; const uploadPartSize = Number(process.env.UPLOAD_PART_SIZE || "32") * 1024 * 1024;
const downloadQueueSize = Number(process.env.DOWNLOAD_QUEUE_SIZE || "8"); const downloadQueueSize = Number(process.env.DOWNLOAD_QUEUE_SIZE || "8");
const downloadPartSize = Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024; const downloadPartSize = Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024;
const s3Client = new client_s3_1.S3Client({ region });
function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) { function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) {
// don't pass changes upstream // don't pass changes upstream
const components = paths.slice(); const components = paths.slice();
@ -93819,7 +93820,6 @@ function getS3Prefix(paths, { compressionMethod, enableCrossOsArchive }) {
function getCacheEntry(keys, paths, { compressionMethod, enableCrossOsArchive }) { function getCacheEntry(keys, paths, { compressionMethod, enableCrossOsArchive }) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const cacheEntry = {}; const cacheEntry = {};
const s3Client = new client_s3_1.S3Client({ region });
// Find the most recent key matching one of the restoreKeys prefixes // Find the most recent key matching one of the restoreKeys prefixes
for (const restoreKey of keys) { for (const restoreKey of keys) {
const s3Prefix = getS3Prefix(paths, { const s3Prefix = getS3Prefix(paths, {
@ -93857,7 +93857,6 @@ function downloadCache(archiveLocation, archivePath, options) {
if (!region) { if (!region) {
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new client_s3_1.S3Client({ region });
const archiveUrl = new URL(archiveLocation); const archiveUrl = new URL(archiveLocation);
const objectKey = archiveUrl.pathname.slice(1); const objectKey = archiveUrl.pathname.slice(1);
const command = new client_s3_1.GetObjectCommand({ const command = new client_s3_1.GetObjectCommand({
@ -93879,7 +93878,6 @@ function saveCache(key, paths, archivePath, { compressionMethod, enableCrossOsAr
if (!region) { if (!region) {
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new client_s3_1.S3Client({ region });
const s3Prefix = getS3Prefix(paths, { const s3Prefix = getS3Prefix(paths, {
compressionMethod, compressionMethod,
enableCrossOsArchive enableCrossOsArchive

4
dist/save/index.js vendored
View File

@ -93791,6 +93791,7 @@ const uploadQueueSize = Number(process.env.UPLOAD_QUEUE_SIZE || "4");
const uploadPartSize = Number(process.env.UPLOAD_PART_SIZE || "32") * 1024 * 1024; const uploadPartSize = Number(process.env.UPLOAD_PART_SIZE || "32") * 1024 * 1024;
const downloadQueueSize = Number(process.env.DOWNLOAD_QUEUE_SIZE || "8"); const downloadQueueSize = Number(process.env.DOWNLOAD_QUEUE_SIZE || "8");
const downloadPartSize = Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024; const downloadPartSize = Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024;
const s3Client = new client_s3_1.S3Client({ region });
function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) { function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) {
// don't pass changes upstream // don't pass changes upstream
const components = paths.slice(); const components = paths.slice();
@ -93819,7 +93820,6 @@ function getS3Prefix(paths, { compressionMethod, enableCrossOsArchive }) {
function getCacheEntry(keys, paths, { compressionMethod, enableCrossOsArchive }) { function getCacheEntry(keys, paths, { compressionMethod, enableCrossOsArchive }) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const cacheEntry = {}; const cacheEntry = {};
const s3Client = new client_s3_1.S3Client({ region });
// Find the most recent key matching one of the restoreKeys prefixes // Find the most recent key matching one of the restoreKeys prefixes
for (const restoreKey of keys) { for (const restoreKey of keys) {
const s3Prefix = getS3Prefix(paths, { const s3Prefix = getS3Prefix(paths, {
@ -93857,7 +93857,6 @@ function downloadCache(archiveLocation, archivePath, options) {
if (!region) { if (!region) {
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new client_s3_1.S3Client({ region });
const archiveUrl = new URL(archiveLocation); const archiveUrl = new URL(archiveLocation);
const objectKey = archiveUrl.pathname.slice(1); const objectKey = archiveUrl.pathname.slice(1);
const command = new client_s3_1.GetObjectCommand({ const command = new client_s3_1.GetObjectCommand({
@ -93879,7 +93878,6 @@ function saveCache(key, paths, archivePath, { compressionMethod, enableCrossOsAr
if (!region) { if (!region) {
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new client_s3_1.S3Client({ region });
const s3Prefix = getS3Prefix(paths, { const s3Prefix = getS3Prefix(paths, {
compressionMethod, compressionMethod,
enableCrossOsArchive enableCrossOsArchive

5
src/custom/backend.ts
View File

@ -48,6 +48,8 @@ const downloadQueueSize = Number(process.env.DOWNLOAD_QUEUE_SIZE || "8");
const downloadPartSize = const downloadPartSize =
Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024; Number(process.env.DOWNLOAD_PART_SIZE || "16") * 1024 * 1024;
const s3Client = new S3Client({ region });
export function getCacheVersion( export function getCacheVersion(
paths: string[], paths: string[],
compressionMethod?: CompressionMethod, compressionMethod?: CompressionMethod,
@ -96,7 +98,6 @@ export async function getCacheEntry(
{ compressionMethod, enableCrossOsArchive } { compressionMethod, enableCrossOsArchive }
) { ) {
const cacheEntry: ArtifactCacheEntry = {}; const cacheEntry: ArtifactCacheEntry = {};
const s3Client = new S3Client({ region });
// Find the most recent key matching one of the restoreKeys prefixes // Find the most recent key matching one of the restoreKeys prefixes
for (const restoreKey of keys) { for (const restoreKey of keys) {
@ -147,7 +148,6 @@ export async function downloadCache(
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new S3Client({ region });
const archiveUrl = new URL(archiveLocation); const archiveUrl = new URL(archiveLocation);
const objectKey = archiveUrl.pathname.slice(1); const objectKey = archiveUrl.pathname.slice(1);
const command = new GetObjectCommand({ const command = new GetObjectCommand({
@ -179,7 +179,6 @@ export async function saveCache(
throw new Error("Environment variable RUNS_ON_AWS_REGION not set"); throw new Error("Environment variable RUNS_ON_AWS_REGION not set");
} }
const s3Client = new S3Client({ region });
const s3Prefix = getS3Prefix(paths, { const s3Prefix = getS3Prefix(paths, {
compressionMethod, compressionMethod,
enableCrossOsArchive enableCrossOsArchive