Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(cdk-assets): concurrent asset building may occurs ENOENT: no such file or directory, unlink #25293

Closed
wants to merge 2 commits into from
Closed

fix(cdk-assets): concurrent asset building may occurs ENOENT: no such file or directory, unlink #25293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f6221a
fix(cdk-assets): fix error that occurs when building assets concurren…
tockn Apr 25, 2023
42cbef5
Merge branch 'main' into fix/asset-concurrency-publish-unlink-error
corymhall May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions packages/cdk-assets/lib/private/archive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ type Logger = (x: string) => void;
export async function zipDirectory(directory: string, outputFile: string, logger: Logger): Promise<void> {
// We write to a temporary file and rename at the last moment. This is so that if we are
// interrupted during this process, we don't leave a half-finished file in the target location.
const temporaryOutputFile = `${outputFile}.${randomString()}._tmp`;
const temporaryOutputFile = `${outputFile}._tmp`;
await writeZipFile(directory, temporaryOutputFile);
await moveIntoPlace(temporaryOutputFile, outputFile, logger);
}
Expand Down Expand Up @@ -97,7 +97,3 @@ async function pathExists(x: string) {
throw e;
}
}

function randomString() {
return Math.random().toString(36).replace(/[^a-z0-9]+/g, '');
}
6 changes: 5 additions & 1 deletion packages/cdk-assets/lib/private/handlers/files.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export class FileAssetHandler implements IAssetHandler {
const contentType = 'application/zip';

await fs.mkdir(this.fileCacheRoot, { recursive: true });
const packagedPath = path.join(this.fileCacheRoot, `${this.asset.id.assetId}.zip`);
const packagedPath = path.join(this.fileCacheRoot, `${this.asset.id.assetId}.${randomString()}.zip`);

if (await pathExists(packagedPath)) {
this.host.emitMessage(EventType.CACHED, `From cache ${packagedPath}`);
Expand Down Expand Up @@ -272,3 +272,7 @@ async function cached<A, B>(cache: Map<A, B>, key: A, factory: (x: A) => Promise
cache.set(key, fresh);
return fresh;
}

function randomString() {
return Math.random().toString(36).replace(/[^a-z0-9]+/g, '');
}