Skip to content

Commit ed174d9

Browse files
chore: wip
1 parent 2d94064 commit ed174d9

4 files changed

Lines changed: 16 additions & 23 deletions

File tree

packages/ts-cloud/bin/cli.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4961,8 +4961,8 @@ app
49614961
// Show aliases if any
49624962
cli.info('\nAliases:')
49634963
for (const dist of distributions) {
4964-
if (dist.Aliases && dist.Aliases.length > 0) {
4965-
cli.info(` ${dist.Id}: ${dist.Aliases.join(', ')}`)
4964+
if (dist.Aliases?.Items && dist.Aliases.Items.length > 0) {
4965+
cli.info(` ${dist.Id}: ${dist.Aliases.Items.join(', ')}`)
49664966
}
49674967
}
49684968
}

packages/ts-cloud/src/aws/cloudfront.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ export class CloudFrontClient {
572572
ARN: dist.ARN,
573573
Status: dist.Status,
574574
DomainName: dist.DomainName,
575-
Aliases: aliases || [],
575+
Aliases: aliases ? { Quantity: aliases.length, Items: aliases } : { Quantity: 0, Items: [] },
576576
Enabled: dist.DistributionConfig?.Enabled === 'true' || dist.DistributionConfig?.Enabled === true,
577577
},
578578
ETag: result.ETag || '',
@@ -1417,7 +1417,7 @@ export class CloudFrontClient {
14171417
*/
14181418
async deleteDistribution(distributionId: string, etag?: string): Promise<void> {
14191419
// If no ETag provided, get it first
1420-
let etagToUse = etag
1420+
let etagToUse = etag || ''
14211421
if (!etagToUse) {
14221422
const getResult = await this.client.request({
14231423
service: 'cloudfront',

packages/ts-cloud/src/aws/s3.ts

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2039,27 +2039,19 @@ export class S3Client {
20392039
*/
20402040
async emptyBucket(bucket: string): Promise<{ deletedCount: number }> {
20412041
let deletedCount = 0
2042-
let continuationToken: string | undefined
20432042

2044-
do {
2045-
// List objects in the bucket
2046-
const listResult = await this.listObjects({
2047-
bucket,
2048-
maxKeys: 1000,
2049-
continuationToken,
2050-
})
2043+
// List all objects in the bucket (handles pagination internally)
2044+
const objects = await this.listAllObjects({ bucket })
20512045

2052-
if (listResult.objects.length === 0) {
2053-
break
2046+
if (objects.length > 0) {
2047+
// Delete objects in batches of 1000
2048+
for (let i = 0; i < objects.length; i += 1000) {
2049+
const batch = objects.slice(i, i + 1000)
2050+
const keys = batch.map((obj: S3Object) => obj.Key)
2051+
await this.deleteObjects(bucket, keys)
2052+
deletedCount += keys.length
20542053
}
2055-
2056-
// Delete objects in batches
2057-
const keys = listResult.objects.map(obj => obj.Key)
2058-
await this.deleteObjects(bucket, keys)
2059-
deletedCount += keys.length
2060-
2061-
continuationToken = listResult.nextContinuationToken
2062-
} while (continuationToken)
2054+
}
20632055

20642056
// Also delete any object versions if versioning is enabled
20652057
try {

tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,6 @@
2929
"@ts-cloud/aws-types": ["./packages/aws-types/src"],
3030
"@ts-cloud/aws-types/*": ["./packages/aws-types/src/*"]
3131
}
32-
}
32+
},
33+
"exclude": ["docs", "dist", "node_modules"]
3334
}

0 commit comments

Comments
 (0)