Skip to content

fix(account-deletion): list storage keys through the S3 client so Trigger runs can sweep #9193

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

Merged
waleedlatif1 merged 2 commits into from
Oct 18, 2026
Merged

fix(account-deletion): list storage keys through the S3 client so Trigger runs can sweep #9193

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
36c8ea0
fix(account-deletion): list storage keys through the S3 client so Tri…
waleedlatif1 Oct 18, 2026
6f41000
fix(uploads): keep deleteS3ObjectVersion reading its bucket from cust…
waleedlatif1 Oct 18, 2026
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
25 changes: 10 additions & 15 deletions apps/sim/lib/uploads/core/prefix-sweep.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,22 +120,17 @@ export async function listStorageKeyPage(
): Promise<StorageKeyPage> {
signal.throwIfAborted()
if (USE_S3_STORAGE) {
const { ListObjectsV2Command } = await import('@aws-sdk/client-s3')
const { getS3Client } = await import('@/lib/uploads/providers/s3/client')
const { listS3ObjectKeyPage } = await import('@/lib/uploads/providers/s3/client')
const config = getStorageConfig(context)
const page = await getS3Client().send(
new ListObjectsV2Command({
Bucket: config.bucket,
Prefix: prefix,
MaxKeys: STORAGE_KEY_PAGE_SIZE,
...(pageToken ? { ContinuationToken: pageToken } : {}),
}),
{ abortSignal: signal }
)
return keyPage(
(page.Contents ?? []).flatMap((object) => (object.Key ? [object.Key] : [])),
page.IsTruncated ? page.NextContinuationToken : undefined
)
if (!config.bucket) throw new Error(`Bucket missing for ${context} storage`)
const page = await listS3ObjectKeyPage({
bucket: config.bucket,
prefix,
maxKeys: STORAGE_KEY_PAGE_SIZE,
continuationToken: pageToken,
signal,
})
return keyPage(page.keys, page.nextContinuationToken)
}
if (USE_BLOB_STORAGE) {
const { getBlobServiceClient } = await import('@/lib/uploads/providers/blob/client')
Expand Down
27 changes: 27 additions & 0 deletions apps/sim/lib/uploads/providers/s3/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
DeleteObjectsCommand,
GetObjectCommand,
HeadObjectCommand,
ListObjectsV2Command,
ListPartsCommand,
PutObjectCommand,
S3Client,
Expand Down Expand Up @@ -413,6 +414,32 @@ export async function deleteManyFromS3(
return { failed }
}

/**
* Lists one page of object keys under `prefix` in `bucket`, resuming from `continuationToken`
* when given; `nextContinuationToken` is set while the listing has more.
*/
export async function listS3ObjectKeyPage(params: {
bucket: string
prefix: string
maxKeys: number
continuationToken?: string
signal: AbortSignal
}): Promise<{ keys: string[]; nextContinuationToken?: string }> {
const page = await getS3Client().send(
new ListObjectsV2Command({
Bucket: params.bucket,
Prefix: params.prefix,
MaxKeys: params.maxKeys,
...(params.continuationToken ? { ContinuationToken: params.continuationToken } : {}),
}),
{ abortSignal: params.signal }
)
const keys = (page.Contents ?? []).flatMap((object) => (object.Key ? [object.Key] : []))
return page.IsTruncated && page.NextContinuationToken
? { keys, nextContinuationToken: page.NextContinuationToken }
: { keys }
}

/**
* Initiate a multipart upload for S3
*/
Expand Down
Loading