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.

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(gpg resource): survive errors during cleanup #1713

Merged
merged 1 commit into from
Jul 30, 2024
Merged
Changes from all commits
Commits
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
19 changes: 12 additions & 7 deletions lib/custom-resource-handlers/src/_rmrf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,18 @@ const stat = util.promisify(fs.stat);
const unlink = util.promisify(fs.unlink);

export = async function _rmrf(filePath: string): Promise<void> {
const fstat = await stat(filePath);
if (fstat.isDirectory()) {
for (const child of await readdir(filePath)) {
await _rmrf(path.join(filePath, child));
// All of this is best-effort
try {
const fstat = await stat(filePath);
if (fstat.isDirectory()) {
for (const child of await readdir(filePath)) {
await _rmrf(path.join(filePath, child));
}
await rmdir(filePath);
} else {
await unlink(filePath);
}
await rmdir(filePath);
} else {
await unlink(filePath);
} catch (e: any) {
// If deleting fails, too bad.
}
};