Skip to content
Closed
Show file tree
Hide file tree
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
13 changes: 12 additions & 1 deletion api/server/services/Files/process.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,18 @@ const createDeleteFileWithSecondaryStorage = ({ source, deleteFile, deletionMeth
}

await Promise.all(
secondaryDeleteMethods.map((secondaryDeleteFile) => secondaryDeleteFile(req, file)),
secondaryDeleteMethods.map((secondaryDeleteFile) =>
secondaryDeleteFile(req, file).catch((err) => {
if (isMissingStorageError(err)) {
logger.warn('Secondary file storage was already missing during delete', err);
return;
}
logger.warn(
'Secondary file storage delete failed; continuing so the file record can still be removed',
err,
);
}),
),
);
};
};
Expand Down
38 changes: 38 additions & 0 deletions api/server/services/Files/process.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2703,6 +2703,44 @@ describe('processDeleteRequest', () => {
expect(db.deleteFiles).toHaveBeenCalledWith(['code-resource-file']);
expect(result).toEqual({ deletedFileIds: ['code-resource-file'], failedFileIds: [] });
});

it('still removes metadata when secondary code-env delete fails permanently', async () => {
const primaryDelete = jest.fn().mockResolvedValue(undefined);
const codeDelete = jest
.fn()
.mockRejectedValue(Object.assign(new Error('session gone'), { status: 403 }));
getStrategyFunctions.mockImplementation((source) =>
source === FileSources.execute_code
? { deleteFile: codeDelete }
: { deleteFile: primaryDelete },
);
db.deleteFiles.mockResolvedValue({ deletedCount: 1 });
const req = {
body: {},
config: {},
user: { id: 'user-123', tenantId: 'tenant-a' },
};
const file = {
file_id: 'code-resource-file',
filepath: '/uploads/code-resource.txt',
source: FileSources.local,
metadata: {
codeEnvRef: {
kind: 'agent',
id: 'agent-abc',
storage_session_id: 'sess-1',
file_id: 'fid-1',
},
},
};

const result = await processDeleteRequest({ req, files: [file] });

expect(primaryDelete).toHaveBeenCalledWith(req, file, undefined);
expect(codeDelete).toHaveBeenCalledWith(req, file);
expect(db.deleteFiles).toHaveBeenCalledWith(['code-resource-file']);
expect(result).toEqual({ deletedFileIds: ['code-resource-file'], failedFileIds: [] });
});
});

describe('sweepExpiredFiles', () => {
Expand Down