Skip to content
Merged
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
1 change: 1 addition & 0 deletions packages/blobs/src/backend/delete_store.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export interface DeleteStoreResponse {
blobs_deleted: number
has_more: boolean
}
33 changes: 30 additions & 3 deletions packages/blobs/src/main.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1500,7 +1500,7 @@ describe('deleteAll', () => {
const mockStore = new MockFetch()
.delete({
headers: { authorization: `Bearer ${apiToken}` },
response: Response.json({ blobs_deleted: 3 }),
response: Response.json({ blobs_deleted: 3, has_more: false }),
url: `https://api.netlify.com/api/v1/blobs/${siteID}/site:production`,
})
.inject()
Expand Down Expand Up @@ -1542,7 +1542,7 @@ describe('deleteAll', () => {
const mockStore = new MockFetch()
.delete({
headers: { authorization: `Bearer ${apiToken}` },
response: Response.json({ blobs_deleted: 3 }),
response: Response.json({ blobs_deleted: 3, has_more: false }),
url: `https://api.netlify.com/api/v1/blobs/${siteID}/oldie`,
})
.inject()
Expand All @@ -1565,7 +1565,7 @@ describe('deleteAll', () => {
const mockStore = new MockFetch()
.delete({
headers: { authorization: `Bearer ${edgeToken}` },
response: Response.json({ blobs_deleted: 3 }),
response: Response.json({ blobs_deleted: 3, has_more: false }),
url: `${edgeURL}/${siteID}/site:production`,
})
.inject()
Expand Down Expand Up @@ -1605,6 +1605,33 @@ describe('deleteAll', () => {

expect(mockStore.fulfilled).toBeTruthy()
})

test('Handles paginated deletion with multiple batches', async () => {
const mockStore = new MockFetch()
.delete({
headers: { authorization: `Bearer ${edgeToken}` },
response: Response.json({ blobs_deleted: 100, has_more: true }),
url: `${edgeURL}/${siteID}/site:production`,
})
.delete({
headers: { authorization: `Bearer ${edgeToken}` },
response: Response.json({ blobs_deleted: 50, has_more: false }),
url: `${edgeURL}/${siteID}/site:production`,
})
.inject()

const blobs = getStore({
edgeURL,
name: 'production',
token: edgeToken,
siteID,
})

const res = await blobs.deleteAll()

expect(mockStore.fulfilled).toBeTruthy()
expect(res.deletedBlobs).toBe(150)
})
})
})

Expand Down
2 changes: 1 addition & 1 deletion packages/blobs/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ export class BlobsServer {
}
}

return Response.json({ blobs_deleted: blobsDeleted })
return Response.json({ blobs_deleted: blobsDeleted, has_more: false })
}

private async get(req: Request): Promise<Response> {
Expand Down
24 changes: 16 additions & 8 deletions packages/blobs/src/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -152,20 +152,28 @@ export class Store {
}

async deleteAll(): Promise<DeleteStoreResult> {
const res = await this.client.makeRequest({ method: HTTPMethod.DELETE, storeName: this.name })
let totalDeletedBlobs = 0
let hasMore = true

if (res.status !== 200) {
throw new BlobsInternalError(res)
}
while (hasMore) {
const res = await this.client.makeRequest({ method: HTTPMethod.DELETE, storeName: this.name })

if (res.status !== 200) {
throw new BlobsInternalError(res)
}

const data = (await res.json()) as DeleteStoreResponse
const data = (await res.json()) as DeleteStoreResponse

if (typeof data.blobs_deleted !== 'number') {
throw new BlobsInternalError(res)
if (typeof data.blobs_deleted !== 'number') {
throw new BlobsInternalError(res)
}

totalDeletedBlobs += data.blobs_deleted
hasMore = typeof data.has_more === 'boolean' && data.has_more
}

return {
deletedBlobs: data.blobs_deleted,
deletedBlobs: totalDeletedBlobs,
}
}

Expand Down
Loading