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

Jump to bottom

fix(cdk-assets): concurrent asset builds can leave a corrupted archive #23677

Merged
merged 4 commits into from
Jan 18, 2023
Merged

fix(cdk-assets): concurrent asset builds can leave a corrupted archive #23677

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4b7616
fix(archive): Use a UUID for the temp file prefix to prevent concurre…
rscharer Jan 13, 2023
22f5102
Ensure that the directory for the temp file and te target file match
rscharer Jan 13, 2023
a20c604
Update archive.ts
rix0rrr Jan 18, 2023
0c81b8d
Merge branch 'main' into rscharer/patch-23290
mergify[bot] Jan 18, 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
5 changes: 3 additions & 2 deletions packages/cdk-assets/lib/private/archive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { randomUUID } from 'crypto';
import { createWriteStream, promises as fs } from 'fs';
import * as path from 'path';
import * as glob from 'glob';
Expand All @@ -11,7 +12,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}._tmp`;
const temporaryOutputFile = `${outputFile}.${randomUUID()}._tmp`;
await writeZipFile(directory, temporaryOutputFile);
await moveIntoPlace(temporaryOutputFile, outputFile, logger);
}
Expand Down Expand Up @@ -96,4 +97,4 @@ async function pathExists(x: string) {
}
throw e;
}
}
}