cdk-nextjs 0.6.2 → 0.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.jsii +2404 -2723
- package/.jsii.tabl.json +1 -1
- package/API.md +1681 -1930
- package/CLAUDE.md +2 -1
- package/README.md +429 -130
- package/assets/lambdas/post-deploy/post-deploy.lambda/index.js +148 -169
- package/assets/lambdas/redeploy-stage/redeploy-stage.lambda/index.js +875 -0
- package/docs/adapter-runtime.md +185 -0
- package/docs/breaking-changes.md +667 -4
- package/docs/caching-guide.md +156 -112
- package/docs/cdk-nextjs-cfn-exec-policy.json +2 -1
- package/docs/development-guide.md +1 -1
- package/docs/harness-coverage.md +598 -0
- package/docs/init-cache-deployment.md +32 -1
- package/docs/next-build-output-guide.md +30 -20
- package/examples/README.md +5 -1
- package/lib/adapter/__fixtures__/app-playground-base-path.json +4926 -0
- package/lib/adapter/__fixtures__/app-playground.json +4917 -0
- package/lib/adapter/__fixtures__/pages-i18n.json +1728 -0
- package/lib/adapter/adapter.mjs +1551 -185
- package/lib/adapter/adapter.test.js +106 -0
- package/lib/adapter/aws-cache-store.d.ts +489 -0
- package/lib/adapter/aws-cache-store.js +1004 -0
- package/lib/adapter/aws-cache-store.test.d.ts +1 -0
- package/lib/adapter/aws-cache-store.test.js +361 -0
- package/lib/adapter/build-outputs.d.ts +80 -0
- package/lib/adapter/build-outputs.js +857 -0
- package/lib/adapter/build-outputs.test.d.ts +1 -0
- package/lib/adapter/build-outputs.test.js +863 -0
- package/lib/adapter/cache-handler.d.ts +9 -2
- package/lib/adapter/cache-handler.js +72 -96
- package/lib/adapter/cache-handler.mjs +18956 -17774
- package/lib/adapter/cache-handler.test.js +263 -31
- package/lib/adapter/cache-kinds.d.ts +32 -0
- package/lib/adapter/cache-kinds.js +35 -0
- package/lib/adapter/cache-kinds.test.d.ts +1 -0
- package/lib/adapter/cache-kinds.test.js +69 -0
- package/lib/adapter/cache-utils.d.ts +90 -0
- package/lib/adapter/cache-utils.js +199 -4
- package/lib/adapter/cache-utils.test.d.ts +1 -0
- package/lib/adapter/cache-utils.test.js +179 -0
- package/lib/adapter/function-groups.d.ts +215 -0
- package/lib/adapter/function-groups.js +1099 -0
- package/lib/adapter/function-groups.test.d.ts +1 -0
- package/lib/adapter/function-groups.test.js +743 -0
- package/lib/adapter/init-cache.d.ts +6 -0
- package/lib/adapter/init-cache.js +245 -0
- package/lib/adapter/init-cache.test.d.ts +1 -0
- package/lib/adapter/init-cache.test.js +137 -0
- package/lib/adapter/local-file-cache-handler.d.ts +23 -0
- package/lib/adapter/local-file-cache-handler.js +52 -1
- package/lib/adapter/memory-cache-handler.d.ts +26 -17
- package/lib/adapter/memory-cache-handler.js +32 -50
- package/lib/adapter/memory-cache-handler.test.js +105 -85
- package/lib/adapter/s3-cache-handler.d.ts +179 -40
- package/lib/adapter/s3-cache-handler.js +807 -277
- package/lib/adapter/s3-cache-handler.test.js +1186 -31
- package/lib/adapter/use-cache-common.d.ts +90 -0
- package/lib/adapter/use-cache-common.js +250 -0
- package/lib/adapter/use-cache-common.test.d.ts +1 -0
- package/lib/adapter/use-cache-common.test.js +646 -0
- package/lib/adapter/use-cache-default-handler.d.ts +24 -0
- package/lib/adapter/use-cache-default-handler.js +90 -0
- package/lib/adapter/use-cache-default-handler.mjs +38645 -0
- package/lib/adapter/use-cache-handlers.test.d.ts +1 -0
- package/lib/adapter/use-cache-handlers.test.js +349 -0
- package/lib/adapter/use-cache-remote-handler.d.ts +26 -0
- package/lib/adapter/use-cache-remote-handler.js +186 -0
- package/lib/{image-optimization/handler.mjs → adapter/use-cache-remote-handler.mjs} +33572 -38798
- package/lib/generated-structs/OptionalNextjsApiProps.d.ts +59 -0
- package/lib/generated-structs/OptionalNextjsApiProps.js +3 -0
- package/lib/generated-structs/OptionalNextjsCacheProps.d.ts +15 -6
- package/lib/generated-structs/OptionalNextjsCacheProps.js +1 -1
- package/lib/generated-structs/OptionalNextjsContainersProps.d.ts +25 -11
- package/lib/generated-structs/OptionalNextjsContainersProps.js +1 -1
- package/lib/generated-structs/OptionalNextjsDistributionProps.d.ts +31 -9
- package/lib/generated-structs/OptionalNextjsDistributionProps.js +1 -1
- package/lib/generated-structs/OptionalNextjsPostDeployProps.d.ts +8 -0
- package/lib/generated-structs/OptionalNextjsPostDeployProps.js +1 -1
- package/lib/generated-structs/OptionalPostDeployCustomResourceProperties.d.ts +6 -4
- package/lib/generated-structs/OptionalPostDeployCustomResourceProperties.js +1 -1
- package/lib/index.d.ts +6 -7
- package/lib/index.js +2 -4
- package/lib/lambdas/post-deploy/prune-cache-bucket.d.ts +7 -3
- package/lib/lambdas/post-deploy/prune-cache-bucket.js +57 -71
- package/lib/lambdas/post-deploy/prune-cache-bucket.test.d.ts +1 -0
- package/lib/lambdas/post-deploy/prune-cache-bucket.test.js +114 -0
- package/lib/lambdas/post-deploy/prune-revalidation-table.d.ts +1 -0
- package/lib/lambdas/post-deploy/prune-revalidation-table.js +23 -31
- package/lib/lambdas/post-deploy/prune-revalidation-table.test.d.ts +1 -0
- package/lib/lambdas/post-deploy/prune-revalidation-table.test.js +71 -0
- package/lib/lambdas/post-deploy/prune-s3.d.ts +14 -5
- package/lib/lambdas/post-deploy/prune-s3.js +41 -12
- package/lib/lambdas/post-deploy/prune-s3.test.js +97 -18
- package/lib/lambdas/redeploy-stage/redeploy-stage-function.d.ts +13 -0
- package/lib/lambdas/redeploy-stage/redeploy-stage-function.js +55 -0
- package/lib/lambdas/redeploy-stage/redeploy-stage.d.ts +24 -0
- package/lib/lambdas/redeploy-stage/redeploy-stage.js +68 -0
- package/lib/lambdas/redeploy-stage/redeploy-stage.lambda.d.ts +20 -0
- package/lib/lambdas/redeploy-stage/redeploy-stage.lambda.js +24 -0
- package/lib/lambdas/redeploy-stage/redeploy-stage.test.d.ts +1 -0
- package/lib/lambdas/redeploy-stage/redeploy-stage.test.js +93 -0
- package/lib/nextjs-api.d.ts +102 -18
- package/lib/nextjs-api.js +338 -38
- package/lib/nextjs-api.test.js +537 -1
- package/lib/nextjs-build/global-containers.Dockerfile +15 -10
- package/lib/nextjs-build/nextjs-build.d.ts +339 -63
- package/lib/nextjs-build/nextjs-build.js +684 -327
- package/lib/nextjs-build/nextjs-build.test.d.ts +1 -0
- package/lib/nextjs-build/nextjs-build.test.js +412 -0
- package/lib/nextjs-build/patch-fetch.js +1 -1
- package/lib/nextjs-build/patch-fetch.test.js +166 -11
- package/lib/nextjs-build/regional-containers.Dockerfile +17 -10
- package/lib/nextjs-cache.d.ts +82 -4
- package/lib/nextjs-cache.js +186 -10
- package/lib/nextjs-cache.test.js +176 -1
- package/lib/nextjs-compute/nextjs-compute-base-props.d.ts +21 -8
- package/lib/nextjs-compute/nextjs-compute-base-props.js +41 -1
- package/lib/nextjs-compute/nextjs-compute-base-props.test.d.ts +1 -0
- package/lib/nextjs-compute/nextjs-compute-base-props.test.js +44 -0
- package/lib/nextjs-compute/nextjs-containers.d.ts +19 -0
- package/lib/nextjs-compute/nextjs-containers.js +57 -20
- package/lib/nextjs-compute/nextjs-functions.d.ts +122 -7
- package/lib/nextjs-compute/nextjs-functions.js +113 -67
- package/lib/nextjs-compute/nextjs-functions.test.d.ts +1 -0
- package/lib/nextjs-compute/nextjs-functions.test.js +99 -0
- package/lib/nextjs-distribution.d.ts +194 -23
- package/lib/nextjs-distribution.js +535 -62
- package/lib/nextjs-distribution.test.d.ts +1 -0
- package/lib/nextjs-distribution.test.js +697 -0
- package/lib/nextjs-post-deploy.d.ts +13 -5
- package/lib/nextjs-post-deploy.js +13 -10
- package/lib/nextjs-post-deploy.test.d.ts +1 -0
- package/lib/nextjs-post-deploy.test.js +34 -0
- package/lib/nextjs-static-assets.d.ts +17 -4
- package/lib/nextjs-static-assets.js +22 -5
- package/lib/root-constructs/nextjs-base-construct.d.ts +102 -58
- package/lib/root-constructs/nextjs-base-construct.js +139 -47
- package/lib/root-constructs/nextjs-global-containers.d.ts +18 -20
- package/lib/root-constructs/nextjs-global-containers.js +20 -71
- package/lib/root-constructs/nextjs-global-functions.d.ts +26 -28
- package/lib/root-constructs/nextjs-global-functions.js +52 -70
- package/lib/root-constructs/nextjs-regional-containers.d.ts +18 -5
- package/lib/root-constructs/nextjs-regional-containers.js +8 -15
- package/lib/root-constructs/nextjs-regional-functions.d.ts +22 -18
- package/lib/root-constructs/nextjs-regional-functions.js +8 -26
- package/lib/runtime/api-gateway-path.d.ts +34 -0
- package/lib/runtime/api-gateway-path.js +71 -0
- package/lib/runtime/api-gateway-path.test.d.ts +1 -0
- package/lib/runtime/api-gateway-path.test.js +65 -0
- package/lib/runtime/case-redirect.d.ts +22 -0
- package/lib/runtime/case-redirect.js +63 -0
- package/lib/runtime/case-redirect.test.d.ts +1 -0
- package/lib/runtime/case-redirect.test.js +32 -0
- package/lib/runtime/core.d.ts +234 -0
- package/lib/runtime/core.js +1216 -0
- package/lib/runtime/core.test.d.ts +1 -0
- package/lib/runtime/core.test.js +1686 -0
- package/lib/runtime/deployment-root.d.ts +13 -0
- package/lib/runtime/deployment-root.js +29 -0
- package/lib/runtime/dispatch.d.ts +331 -0
- package/lib/runtime/dispatch.js +751 -0
- package/lib/runtime/dispatch.test.d.ts +1 -0
- package/lib/runtime/dispatch.test.js +853 -0
- package/lib/runtime/entrypoints.d.ts +57 -0
- package/lib/runtime/entrypoints.js +115 -0
- package/lib/runtime/http/abort-signal.d.ts +6 -0
- package/lib/runtime/http/abort-signal.js +19 -0
- package/lib/runtime/http/abort-signal.test.d.ts +1 -0
- package/lib/runtime/http/abort-signal.test.js +49 -0
- package/lib/runtime/http/node-server.d.ts +38 -0
- package/lib/runtime/http/node-server.js +99 -0
- package/lib/runtime/http/node-server.test.d.ts +1 -0
- package/lib/runtime/http/node-server.test.js +96 -0
- package/lib/runtime/http/node-sink.d.ts +16 -0
- package/lib/runtime/http/node-sink.js +48 -0
- package/lib/runtime/http/node-sink.test.d.ts +1 -0
- package/lib/runtime/http/node-sink.test.js +66 -0
- package/lib/runtime/http/request.d.ts +62 -0
- package/lib/runtime/http/request.js +134 -0
- package/lib/runtime/http/request.test.d.ts +1 -0
- package/lib/runtime/http/request.test.js +103 -0
- package/lib/runtime/http/response.d.ts +77 -0
- package/lib/runtime/http/response.js +229 -0
- package/lib/runtime/http/response.test.d.ts +1 -0
- package/lib/runtime/http/response.test.js +178 -0
- package/lib/runtime/http/sink.d.ts +73 -0
- package/lib/runtime/http/sink.js +188 -0
- package/lib/runtime/http/sink.test.d.ts +1 -0
- package/lib/runtime/http/sink.test.js +257 -0
- package/lib/runtime/image-utils.d.ts +78 -0
- package/lib/runtime/image-utils.js +129 -0
- package/lib/runtime/image-utils.test.d.ts +1 -0
- package/lib/runtime/image-utils.test.js +237 -0
- package/lib/runtime/image.d.ts +76 -0
- package/lib/runtime/image.js +296 -0
- package/lib/runtime/image.test.d.ts +1 -0
- package/lib/runtime/image.test.js +405 -0
- package/lib/runtime/lambda-event.d.ts +4 -0
- package/lib/runtime/lambda-event.js +113 -0
- package/lib/runtime/lambda-event.test.d.ts +1 -0
- package/lib/runtime/lambda-event.test.js +119 -0
- package/lib/runtime/lambda.mjs +41600 -0
- package/lib/runtime/load-module.d.ts +8 -0
- package/lib/runtime/load-module.js +35 -0
- package/lib/runtime/manifest.d.ts +215 -0
- package/lib/runtime/manifest.js +118 -0
- package/lib/runtime/middleware.d.ts +43 -0
- package/lib/runtime/middleware.js +113 -0
- package/lib/runtime/middleware.test.d.ts +1 -0
- package/lib/runtime/middleware.test.js +259 -0
- package/lib/runtime/next-modules.d.ts +71 -0
- package/lib/runtime/next-modules.js +144 -0
- package/lib/runtime/next-modules.test.d.ts +1 -0
- package/lib/runtime/next-modules.test.js +34 -0
- package/lib/runtime/public-files.d.ts +32 -0
- package/lib/runtime/public-files.js +117 -0
- package/lib/runtime/public-files.test.d.ts +1 -0
- package/lib/runtime/public-files.test.js +97 -0
- package/lib/runtime/server.mjs +41593 -0
- package/lib/runtime/static-files.d.ts +50 -0
- package/lib/runtime/static-files.js +266 -0
- package/lib/runtime/static-files.test.d.ts +1 -0
- package/lib/runtime/static-files.test.js +118 -0
- package/lib/runtime/util.d.ts +28 -0
- package/lib/runtime/util.js +79 -0
- package/lib/utils/base-path.d.ts +106 -13
- package/lib/utils/base-path.js +254 -41
- package/lib/utils/base-path.test.js +219 -51
- package/lib/utils/get-architecture.d.ts +7 -8
- package/lib/utils/get-architecture.js +12 -13
- package/lib/utils/zip-directory.d.ts +14 -0
- package/lib/utils/zip-directory.js +121 -0
- package/lib/utils/zip-directory.test.d.ts +1 -0
- package/lib/utils/zip-directory.test.js +99 -0
- package/package.json +22 -3
- package/scripts/capture-adapter-fixture.mjs +325 -0
- package/scripts/e2e-deploy.sh +398 -0
- package/scripts/e2e-harness/README.md +707 -0
- package/scripts/e2e-harness/app.js +370 -0
- package/scripts/e2e-harness/common.sh +249 -0
- package/scripts/e2e-harness/screen.mjs +302 -0
- package/scripts/e2e-harness/stage-proxy.mjs +145 -0
- package/scripts/e2e-harness/type-filters.mjs +47 -0
- package/scripts/e2e-logs.sh +75 -0
- package/scripts/e2e-offline.sh +91 -0
- package/scripts/e2e-sweep.sh +370 -0
- package/scripts/e2e-warm.sh +114 -0
- package/scripts/zero-config-build.mjs +418 -0
- package/docs/1k-concurrent-users-executions.png +0 -0
- package/docs/plans/adapter-runtime-release.md +0 -362
- package/docs/plans/phase-0-image-function-opt-in.md +0 -295
- package/lib/generated-structs/OptionalDockerImageFunctionProps.d.ts +0 -425
- package/lib/generated-structs/OptionalDockerImageFunctionProps.js +0 -3
- package/lib/image-optimization/handler-utils.d.ts +0 -34
- package/lib/image-optimization/handler-utils.js +0 -83
- package/lib/image-optimization/handler-utils.test.js +0 -178
- package/lib/nextjs-build/functions.Dockerfile +0 -31
- package/lib/nextjs-compute/nextjs-image-function.d.ts +0 -53
- package/lib/nextjs-compute/nextjs-image-function.js +0 -59
- package/lib/utils/experimental-flags.d.ts +0 -24
- package/lib/utils/experimental-flags.js +0 -30
- /package/lib/{image-optimization/handler-utils.test.d.ts → adapter/adapter.test.d.ts} +0 -0
|
@@ -10,89 +10,75 @@ const client_s3_1 = require("@aws-sdk/client-s3");
|
|
|
10
10
|
const debug_1 = __importDefault(require("debug"));
|
|
11
11
|
const debug = (0, debug_1.default)("cdk-nextjs:post-deploy:prune-cache-bucket");
|
|
12
12
|
const s3Client = new client_s3_1.S3Client();
|
|
13
|
+
const PRUNE_BUDGET_MS = 3 * 60_000;
|
|
13
14
|
/**
|
|
14
|
-
* Given `bucketName` and `currentBuildId`,
|
|
15
|
-
*
|
|
16
|
-
*
|
|
15
|
+
* Given `bucketName` and `currentBuildId`, delete every cache object that isn't
|
|
16
|
+
* under the current build's `{buildId}/` prefix (no leading slash).
|
|
17
|
+
*
|
|
18
|
+
* The top level is listed with a delimiter, so the current build, which can
|
|
19
|
+
* hold any number of `'use cache: remote'` entries, is never walked. Each old
|
|
20
|
+
* build prefix is then listed and deleted page by page. Top-level keys outside
|
|
21
|
+
* any build prefix (legacy objects) are deleted too.
|
|
17
22
|
*/
|
|
18
23
|
async function pruneCacheBucket(props) {
|
|
19
24
|
const { bucketName, currentBuildId } = props;
|
|
20
|
-
const
|
|
21
|
-
|
|
22
|
-
let
|
|
25
|
+
const deadline = Date.now() + PRUNE_BUDGET_MS;
|
|
26
|
+
const oldPrefixes = [];
|
|
27
|
+
let deleted = 0;
|
|
28
|
+
let continuationToken;
|
|
23
29
|
do {
|
|
24
|
-
|
|
25
|
-
const listObjectsV2Input = {
|
|
30
|
+
const page = await s3Client.send(new client_s3_1.ListObjectsV2Command({
|
|
26
31
|
Bucket: bucketName,
|
|
32
|
+
Delimiter: "/",
|
|
27
33
|
ContinuationToken: continuationToken,
|
|
28
|
-
};
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
|
|
34
|
+
}));
|
|
35
|
+
for (const { Prefix } of page.CommonPrefixes ?? []) {
|
|
36
|
+
if (Prefix && Prefix !== `${currentBuildId}/`)
|
|
37
|
+
oldPrefixes.push(Prefix);
|
|
32
38
|
}
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
const objectBuildId = buildIdMatch[1]; // Extract BUILD_ID from capture group
|
|
44
|
-
// Delete if it's not the current build ID
|
|
45
|
-
return objectBuildId !== currentBuildId;
|
|
39
|
+
deleted += await deleteObjects(bucketName, page.Contents);
|
|
40
|
+
continuationToken = page.NextContinuationToken;
|
|
41
|
+
} while (continuationToken);
|
|
42
|
+
debug(`Found ${oldPrefixes.length} old build prefixes to delete`);
|
|
43
|
+
for (const [i, prefix] of oldPrefixes.entries()) {
|
|
44
|
+
continuationToken = undefined;
|
|
45
|
+
do {
|
|
46
|
+
if (Date.now() > deadline) {
|
|
47
|
+
console.warn(`Cache bucket pruning stopped at its time budget after deleting ${deleted} objects; ${oldPrefixes.length - i} old build prefixes are left for the next deploy`);
|
|
48
|
+
return;
|
|
46
49
|
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
.map((obj) => ({ Key: obj.Key })));
|
|
56
|
-
if (listResponse.NextContinuationToken) {
|
|
57
|
-
continuationToken = listResponse.NextContinuationToken;
|
|
58
|
-
}
|
|
59
|
-
listObjectsCount++;
|
|
60
|
-
// assume less than 100K objects (100 * 1K objects per ListObjectsV2Command = 100K)
|
|
61
|
-
} while (continuationToken && listObjectsCount <= 100);
|
|
62
|
-
// Delete objects in parallel batches (respecting S3's 1000 objects per request limit)
|
|
63
|
-
if (objectsToDelete.length > 0) {
|
|
64
|
-
const deleteBatches = [];
|
|
65
|
-
for (let i = 0; i < objectsToDelete.length; i += 1000) {
|
|
66
|
-
const batch = objectsToDelete.slice(i, i + 1000);
|
|
67
|
-
deleteBatches.push(batch);
|
|
68
|
-
}
|
|
69
|
-
await processBatch(deleteBatches, 5, // Process up to 5 delete batches in parallel
|
|
70
|
-
async (batch) => {
|
|
71
|
-
try {
|
|
72
|
-
debug(`Deleting cache objects: ${batch.map((b) => b.Key)} from ${bucketName}`);
|
|
73
|
-
await s3Client.send(new client_s3_1.DeleteObjectsCommand({
|
|
74
|
-
Bucket: bucketName,
|
|
75
|
-
Delete: { Objects: batch },
|
|
76
|
-
}));
|
|
77
|
-
debug(`Deleted ${batch.length} cache objects from ${bucketName}`);
|
|
78
|
-
}
|
|
79
|
-
catch (error) {
|
|
80
|
-
console.error("Error deleting cache objects:", error);
|
|
81
|
-
}
|
|
82
|
-
});
|
|
50
|
+
const page = await s3Client.send(new client_s3_1.ListObjectsV2Command({
|
|
51
|
+
Bucket: bucketName,
|
|
52
|
+
Prefix: prefix,
|
|
53
|
+
ContinuationToken: continuationToken,
|
|
54
|
+
}));
|
|
55
|
+
deleted += await deleteObjects(bucketName, page.Contents);
|
|
56
|
+
continuationToken = page.NextContinuationToken;
|
|
57
|
+
} while (continuationToken);
|
|
83
58
|
}
|
|
84
|
-
debug(`Cache bucket pruning complete. Deleted ${
|
|
59
|
+
debug(`Cache bucket pruning complete. Deleted ${deleted} objects from ${bucketName}`);
|
|
85
60
|
}
|
|
86
61
|
/**
|
|
87
|
-
*
|
|
62
|
+
* Delete one listed page of objects. ListObjectsV2 returns at most 1000 keys a
|
|
63
|
+
* page, which is also the DeleteObjects limit, so a page is one request.
|
|
64
|
+
* Returns how many objects were sent for deletion.
|
|
88
65
|
*/
|
|
89
|
-
async function
|
|
90
|
-
const
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
66
|
+
async function deleteObjects(bucketName, contents = []) {
|
|
67
|
+
const objects = contents
|
|
68
|
+
.filter((obj) => obj.Key)
|
|
69
|
+
.map((obj) => ({ Key: obj.Key }));
|
|
70
|
+
if (objects.length === 0)
|
|
71
|
+
return 0;
|
|
72
|
+
try {
|
|
73
|
+
debug(`Deleting cache objects: ${objects.map((o) => o.Key)} from ${bucketName}`);
|
|
74
|
+
await s3Client.send(new client_s3_1.DeleteObjectsCommand({
|
|
75
|
+
Bucket: bucketName,
|
|
76
|
+
Delete: { Objects: objects },
|
|
77
|
+
}));
|
|
78
|
+
}
|
|
79
|
+
catch (error) {
|
|
80
|
+
console.error("Error deleting cache objects:", error);
|
|
95
81
|
}
|
|
96
|
-
return
|
|
82
|
+
return objects.length;
|
|
97
83
|
}
|
|
98
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prune-cache-bucket.js","sourceRoot":"","sources":["../../../src/lambdas/post-deploy/prune-cache-bucket.ts"],"names":[],"mappings":"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","sourcesContent":["// eslint-disable-next-line import/no-extraneous-dependencies\nimport {\n  S3Client,\n  ListObjectsV2Command,\n  DeleteObjectsCommand,\n  ListObjectsV2CommandInput,\n} from \"@aws-sdk/client-s3\";\n// eslint-disable-next-line import/no-extraneous-dependencies\nimport getDebug from \"debug\";\n\nconst debug = getDebug(\"cdk-nextjs:post-deploy:prune-cache-bucket\");\n\nconst s3Client = new S3Client();\n\ninterface PruneCacheBucketProps {\n  bucketName: string;\n  currentBuildId: string;\n}\n\n/**\n * Given `bucketName` and `currentBuildId`, list all objects in the cache bucket\n * and delete any that have BUILD_ID prefixes that don't match the current build ID.\n * Cache objects are prefixed with {buildId}/ pattern (no leading slash).\n */\nexport async function pruneCacheBucket(props: PruneCacheBucketProps) {\n  const { bucketName, currentBuildId } = props;\n\n  const objectsToDelete: { Key: string }[] = [];\n  let continuationToken: string | undefined = undefined;\n  let listObjectsCount = 0;\n\n  do {\n    // List objects in the bucket\n    const listObjectsV2Input: ListObjectsV2CommandInput = {\n      Bucket: bucketName,\n      ContinuationToken: continuationToken,\n    };\n    const listResponse = await s3Client.send(\n      new ListObjectsV2Command(listObjectsV2Input),\n    );\n\n    if (!listResponse.Contents || listResponse.Contents.length === 0) {\n      break;\n    }\n\n    // Filter objects that have old BUILD_ID prefixes\n    const oldCacheObjects = listResponse.Contents.filter((obj) => {\n      if (!obj.Key) return false;\n\n      // Check if the object key starts with a BUILD_ID prefix pattern\n      // Expected pattern: {buildId}/* (buildId followed by slash, no leading slash)\n      // Regex /^([^\\/]+)\\// matches: BUILD_ID/... and captures BUILD_ID in group 1\n      // Example: \"abc123def456/pages/index.html\" captures \"abc123def456\"\n      const buildIdMatch = obj.Key.match(/^([^\\/]+)\\//);\n      if (buildIdMatch) {\n        const objectBuildId = buildIdMatch[1]; // Extract BUILD_ID from capture group\n        // Delete if it's not the current build ID\n        return objectBuildId !== currentBuildId;\n      }\n\n      // Also delete objects that don't follow the BUILD_ID prefix pattern\n      // These might be legacy cache objects or objects with leading slashes\n      return true;\n    });\n\n    debug(\n      `Found ${oldCacheObjects.length} cache objects with old BUILD_ID prefixes to delete`,\n    );\n\n    // Add objects to delete list\n    objectsToDelete.push(\n      ...oldCacheObjects\n        .filter((obj) => obj.Key)\n        .map((obj) => ({ Key: obj.Key! })),\n    );\n\n    if (listResponse.NextContinuationToken) {\n      continuationToken = listResponse.NextContinuationToken;\n    }\n    listObjectsCount++;\n    // assume less than 100K objects (100 * 1K objects per ListObjectsV2Command = 100K)\n  } while (continuationToken && listObjectsCount <= 100);\n\n  // Delete objects in parallel batches (respecting S3's 1000 objects per request limit)\n  if (objectsToDelete.length > 0) {\n    const deleteBatches = [];\n\n    for (let i = 0; i < objectsToDelete.length; i += 1000) {\n      const batch = objectsToDelete.slice(i, i + 1000);\n      deleteBatches.push(batch);\n    }\n\n    await processBatch(\n      deleteBatches,\n      5, // Process up to 5 delete batches in parallel\n      async (batch) => {\n        try {\n          debug(\n            `Deleting cache objects: ${batch.map((b) => b.Key)} from ${bucketName}`,\n          );\n          await s3Client.send(\n            new DeleteObjectsCommand({\n              Bucket: bucketName,\n              Delete: { Objects: batch },\n            }),\n          );\n          debug(`Deleted ${batch.length} cache objects from ${bucketName}`);\n        } catch (error) {\n          console.error(\"Error deleting cache objects:\", error);\n        }\n      },\n    );\n  }\n\n  debug(\n    `Cache bucket pruning complete. Deleted ${objectsToDelete.length} objects from ${bucketName}`,\n  );\n}\n\n/**\n * Process objects in batches to avoid overwhelming the system\n */\nasync function processBatch<T, R>(\n  items: T[],\n  batchSize: number,\n  processFn: (item: T) => Promise<R>,\n): Promise<R[]> {\n  const results: R[] = [];\n\n  for (let i = 0; i < items.length; i += batchSize) {\n    const batch = items.slice(i, i + batchSize);\n    const batchResults = await Promise.all(batch.map(processFn));\n    results.push(...batchResults);\n  }\n\n  return results;\n}\n"]}
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prune-cache-bucket.js","sourceRoot":"","sources":["../../../src/lambdas/post-deploy/prune-cache-bucket.ts"],"names":[],"mappings":"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","sourcesContent":["// eslint-disable-next-line import/no-extraneous-dependencies\nimport {\n  S3Client,\n  ListObjectsV2Command,\n  ListObjectsV2CommandOutput,\n  DeleteObjectsCommand,\n  _Object,\n} from \"@aws-sdk/client-s3\";\n// eslint-disable-next-line import/no-extraneous-dependencies\nimport getDebug from \"debug\";\n\nconst debug = getDebug(\"cdk-nextjs:post-deploy:prune-cache-bucket\");\n\nconst s3Client = new S3Client();\n\nconst PRUNE_BUDGET_MS = 3 * 60_000;\n\ninterface PruneCacheBucketProps {\n  bucketName: string;\n  currentBuildId: string;\n}\n\n/**\n * Given `bucketName` and `currentBuildId`, delete every cache object that isn't\n * under the current build's `{buildId}/` prefix (no leading slash).\n *\n * The top level is listed with a delimiter, so the current build, which can\n * hold any number of `'use cache: remote'` entries, is never walked. Each old\n * build prefix is then listed and deleted page by page. Top-level keys outside\n * any build prefix (legacy objects) are deleted too.\n */\nexport async function pruneCacheBucket(props: PruneCacheBucketProps) {\n  const { bucketName, currentBuildId } = props;\n  const deadline = Date.now() + PRUNE_BUDGET_MS;\n\n  const oldPrefixes: string[] = [];\n  let deleted = 0;\n  let continuationToken: string | undefined;\n  do {\n    const page: ListObjectsV2CommandOutput = await s3Client.send(\n      new ListObjectsV2Command({\n        Bucket: bucketName,\n        Delimiter: \"/\",\n        ContinuationToken: continuationToken,\n      }),\n    );\n    for (const { Prefix } of page.CommonPrefixes ?? []) {\n      if (Prefix && Prefix !== `${currentBuildId}/`) oldPrefixes.push(Prefix);\n    }\n    deleted += await deleteObjects(bucketName, page.Contents);\n    continuationToken = page.NextContinuationToken;\n  } while (continuationToken);\n\n  debug(`Found ${oldPrefixes.length} old build prefixes to delete`);\n\n  for (const [i, prefix] of oldPrefixes.entries()) {\n    continuationToken = undefined;\n    do {\n      if (Date.now() > deadline) {\n        console.warn(\n          `Cache bucket pruning stopped at its time budget after deleting ${deleted} objects; ${oldPrefixes.length - i} old build prefixes are left for the next deploy`,\n        );\n        return;\n      }\n      const page: ListObjectsV2CommandOutput = await s3Client.send(\n        new ListObjectsV2Command({\n          Bucket: bucketName,\n          Prefix: prefix,\n          ContinuationToken: continuationToken,\n        }),\n      );\n      deleted += await deleteObjects(bucketName, page.Contents);\n      continuationToken = page.NextContinuationToken;\n    } while (continuationToken);\n  }\n\n  debug(\n    `Cache bucket pruning complete. Deleted ${deleted} objects from ${bucketName}`,\n  );\n}\n\n/**\n * Delete one listed page of objects. ListObjectsV2 returns at most 1000 keys a\n * page, which is also the DeleteObjects limit, so a page is one request.\n * Returns how many objects were sent for deletion.\n */\nasync function deleteObjects(bucketName: string, contents: _Object[] = []) {\n  const objects = contents\n    .filter((obj) => obj.Key)\n    .map((obj) => ({ Key: obj.Key! }));\n  if (objects.length === 0) return 0;\n  try {\n    debug(\n      `Deleting cache objects: ${objects.map((o) => o.Key)} from ${bucketName}`,\n    );\n    await s3Client.send(\n      new DeleteObjectsCommand({\n        Bucket: bucketName,\n        Delete: { Objects: objects },\n      }),\n    );\n  } catch (error) {\n    console.error(\"Error deleting cache objects:\", error);\n  }\n  return objects.length;\n}\n"]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
/* eslint-disable import/no-extraneous-dependencies */
|
|
4
|
+
// Only the client is mocked, as in `prune-s3.test.ts`: `prune-cache-bucket`
|
|
5
|
+
// constructs its client at module scope, before the mock variables exist.
|
|
6
|
+
jest.mock("@aws-sdk/client-s3", () => ({
|
|
7
|
+
...jest.requireActual("@aws-sdk/client-s3"),
|
|
8
|
+
S3Client: jest.fn(() => ({
|
|
9
|
+
send: (...args) => holder.send(...args),
|
|
10
|
+
})),
|
|
11
|
+
}));
|
|
12
|
+
const client_s3_1 = require("@aws-sdk/client-s3");
|
|
13
|
+
const prune_cache_bucket_1 = require("./prune-cache-bucket");
|
|
14
|
+
const holder = { send: jest.fn() };
|
|
15
|
+
/**
|
|
16
|
+
* A fake bucket: ListObjectsV2 honours `Prefix` and `Delimiter`, and pages
|
|
17
|
+
* `pageSize` keys at a time via the token `<offset>`; the last page carries no
|
|
18
|
+
* NextContinuationToken, as S3 returns it.
|
|
19
|
+
*/
|
|
20
|
+
function stubBucket(keys, pageSize = 2) {
|
|
21
|
+
holder.send.mockImplementation((command) => {
|
|
22
|
+
if (!(command instanceof client_s3_1.ListObjectsV2Command))
|
|
23
|
+
return Promise.resolve({});
|
|
24
|
+
const { Prefix = "", Delimiter, ContinuationToken } = command.input;
|
|
25
|
+
const entries = [];
|
|
26
|
+
for (const key of keys.filter((k) => k.startsWith(Prefix))) {
|
|
27
|
+
const cut = Delimiter ? key.indexOf(Delimiter, Prefix.length) : -1;
|
|
28
|
+
if (cut < 0) {
|
|
29
|
+
entries.push({ key });
|
|
30
|
+
}
|
|
31
|
+
else {
|
|
32
|
+
const prefix = key.slice(0, cut + 1);
|
|
33
|
+
if (!entries.some((entry) => entry.prefix === prefix)) {
|
|
34
|
+
entries.push({ prefix });
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
const offset = Number(ContinuationToken ?? 0);
|
|
39
|
+
const page = entries.slice(offset, offset + pageSize);
|
|
40
|
+
return Promise.resolve({
|
|
41
|
+
Contents: page.filter((e) => e.key).map((e) => ({ Key: e.key })),
|
|
42
|
+
CommonPrefixes: page
|
|
43
|
+
.filter((e) => e.prefix)
|
|
44
|
+
.map((e) => ({ Prefix: e.prefix })),
|
|
45
|
+
NextContinuationToken: offset + pageSize < entries.length
|
|
46
|
+
? String(offset + pageSize)
|
|
47
|
+
: undefined,
|
|
48
|
+
});
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
function sent(type) {
|
|
52
|
+
return holder.send.mock.calls
|
|
53
|
+
.map(([command]) => command)
|
|
54
|
+
.filter((command) => command instanceof type);
|
|
55
|
+
}
|
|
56
|
+
function deletedKeys() {
|
|
57
|
+
return sent(client_s3_1.DeleteObjectsCommand).flatMap((command) => command.input.Delete.Objects.map((object) => object.Key));
|
|
58
|
+
}
|
|
59
|
+
describe("pruneCacheBucket", () => {
|
|
60
|
+
beforeEach(() => {
|
|
61
|
+
holder.send.mockReset();
|
|
62
|
+
});
|
|
63
|
+
it("deletes every old build prefix across pages, and loose keys", async () => {
|
|
64
|
+
stubBucket([
|
|
65
|
+
"current/a.json",
|
|
66
|
+
"current/_use-cache/1.entry",
|
|
67
|
+
"old1/a.json",
|
|
68
|
+
"old1/_use-cache/1.entry",
|
|
69
|
+
"old1/_use-cache/2.entry",
|
|
70
|
+
"old2/a.json",
|
|
71
|
+
"loose.json",
|
|
72
|
+
"/leading-slash.json",
|
|
73
|
+
]);
|
|
74
|
+
await (0, prune_cache_bucket_1.pruneCacheBucket)({ bucketName: "cache", currentBuildId: "current" });
|
|
75
|
+
expect(deletedKeys().sort()).toEqual([
|
|
76
|
+
"/leading-slash.json",
|
|
77
|
+
"loose.json",
|
|
78
|
+
"old1/_use-cache/1.entry",
|
|
79
|
+
"old1/_use-cache/2.entry",
|
|
80
|
+
"old1/a.json",
|
|
81
|
+
"old2/a.json",
|
|
82
|
+
].sort());
|
|
83
|
+
});
|
|
84
|
+
// The current build can hold unbounded 'use cache: remote' entries, so it
|
|
85
|
+
// must never be walked: the delimited top-level listing only names it.
|
|
86
|
+
it("never lists inside the current build", async () => {
|
|
87
|
+
stubBucket([
|
|
88
|
+
...Array.from({ length: 10 }, (_, i) => `current/_use-cache/${i}.entry`),
|
|
89
|
+
"old/a.json",
|
|
90
|
+
]);
|
|
91
|
+
await (0, prune_cache_bucket_1.pruneCacheBucket)({ bucketName: "cache", currentBuildId: "current" });
|
|
92
|
+
expect(sent(client_s3_1.ListObjectsV2Command).map(({ input }) => input.Delimiter ?? input.Prefix)).toEqual(["/", "old/"]);
|
|
93
|
+
expect(deletedKeys()).toEqual(["old/a.json"]);
|
|
94
|
+
});
|
|
95
|
+
// A huge old build must not run the Lambda into its timeout, which would
|
|
96
|
+
// leave CloudFormation waiting on the custom resource.
|
|
97
|
+
it("stops at its time budget and leaves the rest for the next deploy", async () => {
|
|
98
|
+
stubBucket(["old/a.json", "old/b.json", "old/c.json"], 1);
|
|
99
|
+
let clock = 0;
|
|
100
|
+
const nowSpy = jest.spyOn(Date, "now").mockImplementation(() => clock);
|
|
101
|
+
const warnSpy = jest.spyOn(console, "warn").mockImplementation(() => { });
|
|
102
|
+
holder.send.mockImplementation(((stub) => (command) => {
|
|
103
|
+
if (command instanceof client_s3_1.DeleteObjectsCommand)
|
|
104
|
+
clock += 2 * 60_000;
|
|
105
|
+
return stub(command);
|
|
106
|
+
})(holder.send.getMockImplementation()));
|
|
107
|
+
await (0, prune_cache_bucket_1.pruneCacheBucket)({ bucketName: "cache", currentBuildId: "current" });
|
|
108
|
+
expect(deletedKeys()).toEqual(["old/a.json", "old/b.json"]);
|
|
109
|
+
expect(warnSpy).toHaveBeenCalled();
|
|
110
|
+
nowSpy.mockRestore();
|
|
111
|
+
warnSpy.mockRestore();
|
|
112
|
+
});
|
|
113
|
+
});
|
|
114
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prune-cache-bucket.test.js","sourceRoot":"","sources":["../../../src/lambdas/post-deploy/prune-cache-bucket.test.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable import/no-extraneous-dependencies */\n// Only the client is mocked, as in `prune-s3.test.ts`: `prune-cache-bucket`\n// constructs its client at module scope, before the mock variables exist.\njest.mock(\"@aws-sdk/client-s3\", () => ({\n  ...jest.requireActual(\"@aws-sdk/client-s3\"),\n  S3Client: jest.fn(() => ({\n    send: (...args: unknown[]) => holder.send(...args),\n  })),\n}));\n\nimport { DeleteObjectsCommand, ListObjectsV2Command } from \"@aws-sdk/client-s3\";\nimport { pruneCacheBucket } from \"./prune-cache-bucket\";\n\nconst holder = { send: jest.fn() };\n\n/**\n * A fake bucket: ListObjectsV2 honours `Prefix` and `Delimiter`, and pages\n * `pageSize` keys at a time via the token `<offset>`; the last page carries no\n * NextContinuationToken, as S3 returns it.\n */\nfunction stubBucket(keys: string[], pageSize = 2): void {\n  holder.send.mockImplementation((command: unknown) => {\n    if (!(command instanceof ListObjectsV2Command)) return Promise.resolve({});\n    const { Prefix = \"\", Delimiter, ContinuationToken } = command.input;\n    const entries: { key?: string; prefix?: string }[] = [];\n    for (const key of keys.filter((k) => k.startsWith(Prefix))) {\n      const cut = Delimiter ? key.indexOf(Delimiter, Prefix.length) : -1;\n      if (cut < 0) {\n        entries.push({ key });\n      } else {\n        const prefix = key.slice(0, cut + 1);\n        if (!entries.some((entry) => entry.prefix === prefix)) {\n          entries.push({ prefix });\n        }\n      }\n    }\n    const offset = Number(ContinuationToken ?? 0);\n    const page = entries.slice(offset, offset + pageSize);\n    return Promise.resolve({\n      Contents: page.filter((e) => e.key).map((e) => ({ Key: e.key })),\n      CommonPrefixes: page\n        .filter((e) => e.prefix)\n        .map((e) => ({ Prefix: e.prefix })),\n      NextContinuationToken:\n        offset + pageSize < entries.length\n          ? String(offset + pageSize)\n          : undefined,\n    });\n  });\n}\n\nfunction sent<T>(type: new (...args: any[]) => T): T[] {\n  return holder.send.mock.calls\n    .map(([command]) => command)\n    .filter((command): command is T => command instanceof type);\n}\n\nfunction deletedKeys(): (string | undefined)[] {\n  return sent(DeleteObjectsCommand).flatMap((command) =>\n    command.input.Delete!.Objects!.map((object) => object.Key),\n  );\n}\n\ndescribe(\"pruneCacheBucket\", () => {\n  beforeEach(() => {\n    holder.send.mockReset();\n  });\n\n  it(\"deletes every old build prefix across pages, and loose keys\", async () => {\n    stubBucket([\n      \"current/a.json\",\n      \"current/_use-cache/1.entry\",\n      \"old1/a.json\",\n      \"old1/_use-cache/1.entry\",\n      \"old1/_use-cache/2.entry\",\n      \"old2/a.json\",\n      \"loose.json\",\n      \"/leading-slash.json\",\n    ]);\n\n    await pruneCacheBucket({ bucketName: \"cache\", currentBuildId: \"current\" });\n\n    expect(deletedKeys().sort()).toEqual(\n      [\n        \"/leading-slash.json\",\n        \"loose.json\",\n        \"old1/_use-cache/1.entry\",\n        \"old1/_use-cache/2.entry\",\n        \"old1/a.json\",\n        \"old2/a.json\",\n      ].sort(),\n    );\n  });\n\n  // The current build can hold unbounded 'use cache: remote' entries, so it\n  // must never be walked: the delimited top-level listing only names it.\n  it(\"never lists inside the current build\", async () => {\n    stubBucket([\n      ...Array.from({ length: 10 }, (_, i) => `current/_use-cache/${i}.entry`),\n      \"old/a.json\",\n    ]);\n\n    await pruneCacheBucket({ bucketName: \"cache\", currentBuildId: \"current\" });\n\n    expect(\n      sent(ListObjectsV2Command).map(\n        ({ input }) => input.Delimiter ?? input.Prefix,\n      ),\n    ).toEqual([\"/\", \"old/\"]);\n    expect(deletedKeys()).toEqual([\"old/a.json\"]);\n  });\n\n  // A huge old build must not run the Lambda into its timeout, which would\n  // leave CloudFormation waiting on the custom resource.\n  it(\"stops at its time budget and leaves the rest for the next deploy\", async () => {\n    stubBucket([\"old/a.json\", \"old/b.json\", \"old/c.json\"], 1);\n    let clock = 0;\n    const nowSpy = jest.spyOn(Date, \"now\").mockImplementation(() => clock);\n    const warnSpy = jest.spyOn(console, \"warn\").mockImplementation(() => {});\n    holder.send.mockImplementation(\n      ((stub) => (command: unknown) => {\n        if (command instanceof DeleteObjectsCommand) clock += 2 * 60_000;\n        return stub(command);\n      })(holder.send.getMockImplementation()!),\n    );\n\n    await pruneCacheBucket({ bucketName: \"cache\", currentBuildId: \"current\" });\n\n    expect(deletedKeys()).toEqual([\"old/a.json\", \"old/b.json\"]);\n    expect(warnSpy).toHaveBeenCalled();\n    nowSpy.mockRestore();\n    warnSpy.mockRestore();\n  });\n});\n"]}
|
|
@@ -8,6 +8,7 @@ interface PruneRevalidationTableProps {
|
|
|
8
8
|
*
|
|
9
9
|
* Schema:
|
|
10
10
|
* - Revalidation entries: pk=buildId, sk=tag#cacheKey
|
|
11
|
+
* - Revalidation log rows: pk=buildId#log, sk=timestamp#tag
|
|
11
12
|
* - Metadata entry: pk="METADATA", sk="CURRENT_BUILD", buildId=currentBuildId
|
|
12
13
|
*/
|
|
13
14
|
export declare function pruneRevalidationTable(props: PruneRevalidationTableProps): Promise<void>;
|
|
@@ -8,6 +8,7 @@ exports.pruneRevalidationTable = pruneRevalidationTable;
|
|
|
8
8
|
const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
|
|
9
9
|
// eslint-disable-next-line import/no-extraneous-dependencies
|
|
10
10
|
const debug_1 = __importDefault(require("debug"));
|
|
11
|
+
const prune_s3_1 = require("./prune-s3");
|
|
11
12
|
const debug = (0, debug_1.default)("cdk-nextjs:post-deploy:prune-revalidation-table");
|
|
12
13
|
const dynamoClient = new client_dynamodb_1.DynamoDBClient();
|
|
13
14
|
/**
|
|
@@ -16,6 +17,7 @@ const dynamoClient = new client_dynamodb_1.DynamoDBClient();
|
|
|
16
17
|
*
|
|
17
18
|
* Schema:
|
|
18
19
|
* - Revalidation entries: pk=buildId, sk=tag#cacheKey
|
|
20
|
+
* - Revalidation log rows: pk=buildId#log, sk=timestamp#tag
|
|
19
21
|
* - Metadata entry: pk="METADATA", sk="CURRENT_BUILD", buildId=currentBuildId
|
|
20
22
|
*/
|
|
21
23
|
async function pruneRevalidationTable(props) {
|
|
@@ -47,21 +49,23 @@ async function pruneRevalidationTable(props) {
|
|
|
47
49
|
return;
|
|
48
50
|
}
|
|
49
51
|
debug(`Pruning revalidation entries for previous build: ${previousBuildId}`);
|
|
50
|
-
// 2. Query all items for previous build ID (efficient partition
|
|
52
|
+
// 2. Query all items for previous build ID (efficient partition queries):
|
|
53
|
+
// its marker rows, and its revalidation log rows, which a table without TTL
|
|
54
|
+
// would otherwise keep forever.
|
|
51
55
|
const itemsToDelete = [];
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
for (const item of response.Items) {
|
|
56
|
+
for (const pk of [previousBuildId, `${previousBuildId}#log`]) {
|
|
57
|
+
let lastEvaluatedKey = undefined;
|
|
58
|
+
do {
|
|
59
|
+
const queryCommand = new client_dynamodb_1.QueryCommand({
|
|
60
|
+
TableName: tableName,
|
|
61
|
+
KeyConditionExpression: "pk = :pk",
|
|
62
|
+
ExpressionAttributeValues: {
|
|
63
|
+
":pk": { S: pk },
|
|
64
|
+
},
|
|
65
|
+
ExclusiveStartKey: lastEvaluatedKey,
|
|
66
|
+
});
|
|
67
|
+
const response = await dynamoClient.send(queryCommand);
|
|
68
|
+
for (const item of response.Items ?? []) {
|
|
65
69
|
if (item.pk?.S && item.sk?.S) {
|
|
66
70
|
itemsToDelete.push({
|
|
67
71
|
pk: { S: item.pk.S },
|
|
@@ -69,9 +73,9 @@ async function pruneRevalidationTable(props) {
|
|
|
69
73
|
});
|
|
70
74
|
}
|
|
71
75
|
}
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
}
|
|
76
|
+
lastEvaluatedKey = response.LastEvaluatedKey;
|
|
77
|
+
} while (lastEvaluatedKey);
|
|
78
|
+
}
|
|
75
79
|
debug(`Found ${itemsToDelete.length} revalidation entries to delete for build ${previousBuildId}`);
|
|
76
80
|
// 3. Delete items in batches (respecting DynamoDB's 25 items per batch limit)
|
|
77
81
|
if (itemsToDelete.length > 0) {
|
|
@@ -80,7 +84,7 @@ async function pruneRevalidationTable(props) {
|
|
|
80
84
|
const batch = itemsToDelete.slice(i, i + 25);
|
|
81
85
|
deleteBatches.push(batch);
|
|
82
86
|
}
|
|
83
|
-
await processBatch(deleteBatches, 5, // Process up to 5 delete batches in parallel
|
|
87
|
+
await (0, prune_s3_1.processBatch)(deleteBatches, 5, // Process up to 5 delete batches in parallel
|
|
84
88
|
async (batch) => {
|
|
85
89
|
try {
|
|
86
90
|
const deleteRequests = batch.map((item) => ({
|
|
@@ -121,16 +125,4 @@ async function updateMetadata(tableName, currentBuildId) {
|
|
|
121
125
|
await dynamoClient.send(putCommand);
|
|
122
126
|
debug(`Updated metadata with current build ID: ${currentBuildId}`);
|
|
123
127
|
}
|
|
124
|
-
/**
|
|
125
|
-
* Process items in batches to avoid overwhelming the system
|
|
126
|
-
*/
|
|
127
|
-
async function processBatch(items, batchSize, processFn) {
|
|
128
|
-
const results = [];
|
|
129
|
-
for (let i = 0; i < items.length; i += batchSize) {
|
|
130
|
-
const batch = items.slice(i, i + batchSize);
|
|
131
|
-
const batchResults = await Promise.all(batch.map(processFn));
|
|
132
|
-
results.push(...batchResults);
|
|
133
|
-
}
|
|
134
|
-
return results;
|
|
135
|
-
}
|
|
136
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prune-revalidation-table.js","sourceRoot":"","sources":["../../../src/lambdas/post-deploy/prune-revalidation-table.ts"],"names":[],"mappings":"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","sourcesContent":["// eslint-disable-next-line import/no-extraneous-dependencies\nimport {\n  DynamoDBClient,\n  QueryCommand,\n  GetItemCommand,\n  PutItemCommand,\n  BatchWriteItemCommand,\n} from \"@aws-sdk/client-dynamodb\";\n// eslint-disable-next-line import/no-extraneous-dependencies\nimport getDebug from \"debug\";\n\nconst debug = getDebug(\"cdk-nextjs:post-deploy:prune-revalidation-table\");\n\nconst dynamoClient = new DynamoDBClient();\n\ninterface PruneRevalidationTableProps {\n  tableName: string;\n  currentBuildId: string;\n}\n\n/**\n * Given `tableName` and `currentBuildId`, query the previous build's revalidation entries\n * and delete them efficiently. Uses metadata entry to track current build ID.\n *\n * Schema:\n * - Revalidation entries: pk=buildId, sk=tag#cacheKey\n * - Metadata entry: pk=\"METADATA\", sk=\"CURRENT_BUILD\", buildId=currentBuildId\n */\nexport async function pruneRevalidationTable(\n  props: PruneRevalidationTableProps,\n) {\n  const { tableName, currentBuildId } = props;\n\n  // 1. Read metadata to get previous build ID\n  const getCommand = new GetItemCommand({\n    TableName: tableName,\n    Key: {\n      pk: { S: \"METADATA\" },\n      sk: { S: \"CURRENT_BUILD\" },\n    },\n  });\n\n  let previousBuildId: string | undefined;\n  try {\n    const metadataResponse = await dynamoClient.send(getCommand);\n    previousBuildId = metadataResponse.Item?.buildId?.S;\n  } catch (error) {\n    debug(\"No metadata entry found, this may be the first deployment\");\n  }\n\n  if (!previousBuildId) {\n    debug(\"No previous build to prune\");\n    // Update metadata with current build ID for next deployment\n    await updateMetadata(tableName, currentBuildId);\n    return;\n  }\n\n  if (previousBuildId === currentBuildId) {\n    debug(\n      `Previous build ID matches current build ID (${currentBuildId}), nothing to prune`,\n    );\n    return;\n  }\n\n  debug(`Pruning revalidation entries for previous build: ${previousBuildId}`);\n\n  // 2. Query all items for previous build ID (efficient partition query)\n  const itemsToDelete: Array<{ pk: { S: string }; sk: { S: string } }> = [];\n  let lastEvaluatedKey: Record<string, any> | undefined = undefined;\n\n  do {\n    const queryCommand: QueryCommand = new QueryCommand({\n      TableName: tableName,\n      KeyConditionExpression: \"pk = :pk\",\n      ExpressionAttributeValues: {\n        \":pk\": { S: previousBuildId },\n      },\n      ExclusiveStartKey: lastEvaluatedKey,\n    });\n\n    const response = await dynamoClient.send(queryCommand);\n\n    if (response.Items && response.Items.length > 0) {\n      for (const item of response.Items) {\n        if (item.pk?.S && item.sk?.S) {\n          itemsToDelete.push({\n            pk: { S: item.pk.S },\n            sk: { S: item.sk.S },\n          });\n        }\n      }\n    }\n\n    lastEvaluatedKey = response.LastEvaluatedKey;\n  } while (lastEvaluatedKey);\n\n  debug(\n    `Found ${itemsToDelete.length} revalidation entries to delete for build ${previousBuildId}`,\n  );\n\n  // 3. Delete items in batches (respecting DynamoDB's 25 items per batch limit)\n  if (itemsToDelete.length > 0) {\n    const deleteBatches = [];\n\n    for (let i = 0; i < itemsToDelete.length; i += 25) {\n      const batch = itemsToDelete.slice(i, i + 25);\n      deleteBatches.push(batch);\n    }\n\n    await processBatch(\n      deleteBatches,\n      5, // Process up to 5 delete batches in parallel\n      async (batch) => {\n        try {\n          const deleteRequests = batch.map((item) => ({\n            DeleteRequest: {\n              Key: item,\n            },\n          }));\n\n          debug(\n            `Deleting revalidation entries: ${batch.map((b) => `${b.pk.S}/${b.sk.S}`).join(\", \")} from ${tableName}`,\n          );\n\n          await dynamoClient.send(\n            new BatchWriteItemCommand({\n              RequestItems: {\n                [tableName]: deleteRequests,\n              },\n            }),\n          );\n\n          debug(\n            `Deleted ${batch.length} revalidation entries from ${tableName}`,\n          );\n        } catch (error) {\n          console.error(\"Error deleting revalidation entries:\", error);\n        }\n      },\n    );\n  }\n\n  // 4. Update metadata with new build ID\n  await updateMetadata(tableName, currentBuildId);\n\n  debug(\n    `Revalidation table pruning complete. Deleted ${itemsToDelete.length} entries from ${tableName}`,\n  );\n}\n\n/**\n * Update the metadata entry with the current build ID\n */\nasync function updateMetadata(\n  tableName: string,\n  currentBuildId: string,\n): Promise<void> {\n  const putCommand = new PutItemCommand({\n    TableName: tableName,\n    Item: {\n      pk: { S: \"METADATA\" },\n      sk: { S: \"CURRENT_BUILD\" },\n      buildId: { S: currentBuildId },\n      updatedAt: { N: Date.now().toString() },\n    },\n  });\n\n  await dynamoClient.send(putCommand);\n  debug(`Updated metadata with current build ID: ${currentBuildId}`);\n}\n\n/**\n * Process items in batches to avoid overwhelming the system\n */\nasync function processBatch<T, R>(\n  items: T[],\n  batchSize: number,\n  processFn: (item: T) => Promise<R>,\n): Promise<R[]> {\n  const results: R[] = [];\n\n  for (let i = 0; i < items.length; i += batchSize) {\n    const batch = items.slice(i, i + batchSize);\n    const batchResults = await Promise.all(batch.map(processFn));\n    results.push(...batchResults);\n  }\n\n  return results;\n}\n"]}
|
|
128
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prune-revalidation-table.js","sourceRoot":"","sources":["../../../src/lambdas/post-deploy/prune-revalidation-table.ts"],"names":[],"mappings":";;;;;AA8BA,wDA0HC;AAxJD,6DAA6D;AAC7D,8DAMkC;AAClC,6DAA6D;AAC7D,kDAA6B;AAC7B,yCAA0C;AAE1C,MAAM,KAAK,GAAG,IAAA,eAAQ,EAAC,iDAAiD,CAAC,CAAC;AAE1E,MAAM,YAAY,GAAG,IAAI,gCAAc,EAAE,CAAC;AAO1C;;;;;;;;GAQG;AACI,KAAK,UAAU,sBAAsB,CAC1C,KAAkC;IAElC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAE5C,4CAA4C;IAC5C,MAAM,UAAU,GAAG,IAAI,gCAAc,CAAC;QACpC,SAAS,EAAE,SAAS;QACpB,GAAG,EAAE;YACH,EAAE,EAAE,EAAE,CAAC,EAAE,UAAU,EAAE;YACrB,EAAE,EAAE,EAAE,CAAC,EAAE,eAAe,EAAE;SAC3B;KACF,CAAC,CAAC;IAEH,IAAI,eAAmC,CAAC;IACxC,IAAI,CAAC;QACH,MAAM,gBAAgB,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC7D,eAAe,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IACtD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,KAAK,CAAC,2DAA2D,CAAC,CAAC;IACrE,CAAC;IAED,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,KAAK,CAAC,4BAA4B,CAAC,CAAC;QACpC,4DAA4D;QAC5D,MAAM,cAAc,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QAChD,OAAO;IACT,CAAC;IAED,IAAI,eAAe,KAAK,cAAc,EAAE,CAAC;QACvC,KAAK,CACH,+CAA+C,cAAc,qBAAqB,CACnF,CAAC;QACF,OAAO;IACT,CAAC;IAED,KAAK,CAAC,oDAAoD,eAAe,EAAE,CAAC,CAAC;IAE7E,0EAA0E;IAC1E,4EAA4E;IAC5E,gCAAgC;IAChC,MAAM,aAAa,GAAoD,EAAE,CAAC;IAE1E,KAAK,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,GAAG,eAAe,MAAM,CAAC,EAAE,CAAC;QAC7D,IAAI,gBAAgB,GAAoC,SAAS,CAAC;QAClE,GAAG,CAAC;YACF,MAAM,YAAY,GAAiB,IAAI,8BAAY,CAAC;gBAClD,SAAS,EAAE,SAAS;gBACpB,sBAAsB,EAAE,UAAU;gBAClC,yBAAyB,EAAE;oBACzB,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;iBACjB;gBACD,iBAAiB,EAAE,gBAAgB;aACpC,CAAC,CAAC;YAEH,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAEvD,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC;gBACxC,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;oBAC7B,aAAa,CAAC,IAAI,CAAC;wBACjB,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE;wBACpB,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE;qBACrB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,CAAC;QAC/C,CAAC,QAAQ,gBAAgB,EAAE;IAC7B,CAAC;IAED,KAAK,CACH,SAAS,aAAa,CAAC,MAAM,6CAA6C,eAAe,EAAE,CAC5F,CAAC;IAEF,8EAA8E;IAC9E,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,MAAM,aAAa,GAAG,EAAE,CAAC;QAEzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;YAClD,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;YAC7C,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;QAED,MAAM,IAAA,uBAAY,EAChB,aAAa,EACb,CAAC,EAAE,6CAA6C;QAChD,KAAK,EAAE,KAAK,EAAE,EAAE;YACd,IAAI,CAAC;gBACH,MAAM,cAAc,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBAC1C,aAAa,EAAE;wBACb,GAAG,EAAE,IAAI;qBACV;iBACF,CAAC,CAAC,CAAC;gBAEJ,KAAK,CACH,kCAAkC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,SAAS,EAAE,CACzG,CAAC;gBAEF,MAAM,YAAY,CAAC,IAAI,CACrB,IAAI,uCAAqB,CAAC;oBACxB,YAAY,EAAE;wBACZ,CAAC,SAAS,CAAC,EAAE,cAAc;qBAC5B;iBACF,CAAC,CACH,CAAC;gBAEF,KAAK,CACH,WAAW,KAAK,CAAC,MAAM,8BAA8B,SAAS,EAAE,CACjE,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;IAED,uCAAuC;IACvC,MAAM,cAAc,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IAEhD,KAAK,CACH,gDAAgD,aAAa,CAAC,MAAM,iBAAiB,SAAS,EAAE,CACjG,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,cAAc,CAC3B,SAAiB,EACjB,cAAsB;IAEtB,MAAM,UAAU,GAAG,IAAI,gCAAc,CAAC;QACpC,SAAS,EAAE,SAAS;QACpB,IAAI,EAAE;YACJ,EAAE,EAAE,EAAE,CAAC,EAAE,UAAU,EAAE;YACrB,EAAE,EAAE,EAAE,CAAC,EAAE,eAAe,EAAE;YAC1B,OAAO,EAAE,EAAE,CAAC,EAAE,cAAc,EAAE;YAC9B,SAAS,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,EAAE;SACxC;KACF,CAAC,CAAC;IAEH,MAAM,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpC,KAAK,CAAC,2CAA2C,cAAc,EAAE,CAAC,CAAC;AACrE,CAAC","sourcesContent":["// eslint-disable-next-line import/no-extraneous-dependencies\nimport {\n  DynamoDBClient,\n  QueryCommand,\n  GetItemCommand,\n  PutItemCommand,\n  BatchWriteItemCommand,\n} from \"@aws-sdk/client-dynamodb\";\n// eslint-disable-next-line import/no-extraneous-dependencies\nimport getDebug from \"debug\";\nimport { processBatch } from \"./prune-s3\";\n\nconst debug = getDebug(\"cdk-nextjs:post-deploy:prune-revalidation-table\");\n\nconst dynamoClient = new DynamoDBClient();\n\ninterface PruneRevalidationTableProps {\n  tableName: string;\n  currentBuildId: string;\n}\n\n/**\n * Given `tableName` and `currentBuildId`, query the previous build's revalidation entries\n * and delete them efficiently. Uses metadata entry to track current build ID.\n *\n * Schema:\n * - Revalidation entries: pk=buildId, sk=tag#cacheKey\n * - Revalidation log rows: pk=buildId#log, sk=timestamp#tag\n * - Metadata entry: pk=\"METADATA\", sk=\"CURRENT_BUILD\", buildId=currentBuildId\n */\nexport async function pruneRevalidationTable(\n  props: PruneRevalidationTableProps,\n) {\n  const { tableName, currentBuildId } = props;\n\n  // 1. Read metadata to get previous build ID\n  const getCommand = new GetItemCommand({\n    TableName: tableName,\n    Key: {\n      pk: { S: \"METADATA\" },\n      sk: { S: \"CURRENT_BUILD\" },\n    },\n  });\n\n  let previousBuildId: string | undefined;\n  try {\n    const metadataResponse = await dynamoClient.send(getCommand);\n    previousBuildId = metadataResponse.Item?.buildId?.S;\n  } catch (error) {\n    debug(\"No metadata entry found, this may be the first deployment\");\n  }\n\n  if (!previousBuildId) {\n    debug(\"No previous build to prune\");\n    // Update metadata with current build ID for next deployment\n    await updateMetadata(tableName, currentBuildId);\n    return;\n  }\n\n  if (previousBuildId === currentBuildId) {\n    debug(\n      `Previous build ID matches current build ID (${currentBuildId}), nothing to prune`,\n    );\n    return;\n  }\n\n  debug(`Pruning revalidation entries for previous build: ${previousBuildId}`);\n\n  // 2. Query all items for previous build ID (efficient partition queries):\n  // its marker rows, and its revalidation log rows, which a table without TTL\n  // would otherwise keep forever.\n  const itemsToDelete: Array<{ pk: { S: string }; sk: { S: string } }> = [];\n\n  for (const pk of [previousBuildId, `${previousBuildId}#log`]) {\n    let lastEvaluatedKey: Record<string, any> | undefined = undefined;\n    do {\n      const queryCommand: QueryCommand = new QueryCommand({\n        TableName: tableName,\n        KeyConditionExpression: \"pk = :pk\",\n        ExpressionAttributeValues: {\n          \":pk\": { S: pk },\n        },\n        ExclusiveStartKey: lastEvaluatedKey,\n      });\n\n      const response = await dynamoClient.send(queryCommand);\n\n      for (const item of response.Items ?? []) {\n        if (item.pk?.S && item.sk?.S) {\n          itemsToDelete.push({\n            pk: { S: item.pk.S },\n            sk: { S: item.sk.S },\n          });\n        }\n      }\n\n      lastEvaluatedKey = response.LastEvaluatedKey;\n    } while (lastEvaluatedKey);\n  }\n\n  debug(\n    `Found ${itemsToDelete.length} revalidation entries to delete for build ${previousBuildId}`,\n  );\n\n  // 3. Delete items in batches (respecting DynamoDB's 25 items per batch limit)\n  if (itemsToDelete.length > 0) {\n    const deleteBatches = [];\n\n    for (let i = 0; i < itemsToDelete.length; i += 25) {\n      const batch = itemsToDelete.slice(i, i + 25);\n      deleteBatches.push(batch);\n    }\n\n    await processBatch(\n      deleteBatches,\n      5, // Process up to 5 delete batches in parallel\n      async (batch) => {\n        try {\n          const deleteRequests = batch.map((item) => ({\n            DeleteRequest: {\n              Key: item,\n            },\n          }));\n\n          debug(\n            `Deleting revalidation entries: ${batch.map((b) => `${b.pk.S}/${b.sk.S}`).join(\", \")} from ${tableName}`,\n          );\n\n          await dynamoClient.send(\n            new BatchWriteItemCommand({\n              RequestItems: {\n                [tableName]: deleteRequests,\n              },\n            }),\n          );\n\n          debug(\n            `Deleted ${batch.length} revalidation entries from ${tableName}`,\n          );\n        } catch (error) {\n          console.error(\"Error deleting revalidation entries:\", error);\n        }\n      },\n    );\n  }\n\n  // 4. Update metadata with new build ID\n  await updateMetadata(tableName, currentBuildId);\n\n  debug(\n    `Revalidation table pruning complete. Deleted ${itemsToDelete.length} entries from ${tableName}`,\n  );\n}\n\n/**\n * Update the metadata entry with the current build ID\n */\nasync function updateMetadata(\n  tableName: string,\n  currentBuildId: string,\n): Promise<void> {\n  const putCommand = new PutItemCommand({\n    TableName: tableName,\n    Item: {\n      pk: { S: \"METADATA\" },\n      sk: { S: \"CURRENT_BUILD\" },\n      buildId: { S: currentBuildId },\n      updatedAt: { N: Date.now().toString() },\n    },\n  });\n\n  await dynamoClient.send(putCommand);\n  debug(`Updated metadata with current build ID: ${currentBuildId}`);\n}\n"]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
/* eslint-disable import/no-extraneous-dependencies */
|
|
4
|
+
// Only the client is mocked, as in `prune-cache-bucket.test.ts`: the module
|
|
5
|
+
// constructs its client at module scope, before the mock variables exist.
|
|
6
|
+
jest.mock("@aws-sdk/client-dynamodb", () => ({
|
|
7
|
+
...jest.requireActual("@aws-sdk/client-dynamodb"),
|
|
8
|
+
DynamoDBClient: jest.fn(() => ({
|
|
9
|
+
send: (...args) => holder.send(...args),
|
|
10
|
+
})),
|
|
11
|
+
}));
|
|
12
|
+
const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
|
|
13
|
+
const prune_revalidation_table_1 = require("./prune-revalidation-table");
|
|
14
|
+
const holder = { send: jest.fn() };
|
|
15
|
+
/**
|
|
16
|
+
* A fake table whose metadata names `previousBuildId`; each Query pages
|
|
17
|
+
* `pageSize` rows at a time of the partition asked for.
|
|
18
|
+
*/
|
|
19
|
+
function stubTable(previousBuildId, rows, pageSize = 2) {
|
|
20
|
+
holder.send.mockImplementation((command) => {
|
|
21
|
+
if (command instanceof client_dynamodb_1.GetItemCommand) {
|
|
22
|
+
return Promise.resolve({ Item: { buildId: { S: previousBuildId } } });
|
|
23
|
+
}
|
|
24
|
+
if (command instanceof client_dynamodb_1.QueryCommand) {
|
|
25
|
+
const pk = command.input.ExpressionAttributeValues[":pk"].S;
|
|
26
|
+
const offset = Number(command.input.ExclusiveStartKey?.offset.N ?? 0);
|
|
27
|
+
const sks = rows[pk] ?? [];
|
|
28
|
+
return Promise.resolve({
|
|
29
|
+
Items: sks
|
|
30
|
+
.slice(offset, offset + pageSize)
|
|
31
|
+
.map((sk) => ({ pk: { S: pk }, sk: { S: sk } })),
|
|
32
|
+
LastEvaluatedKey: offset + pageSize < sks.length
|
|
33
|
+
? { offset: { N: String(offset + pageSize) } }
|
|
34
|
+
: undefined,
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
return Promise.resolve({});
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
function sent(type) {
|
|
41
|
+
return holder.send.mock.calls
|
|
42
|
+
.map(([command]) => command)
|
|
43
|
+
.filter((command) => command instanceof type);
|
|
44
|
+
}
|
|
45
|
+
describe("pruneRevalidationTable", () => {
|
|
46
|
+
beforeEach(() => {
|
|
47
|
+
holder.send.mockReset();
|
|
48
|
+
});
|
|
49
|
+
it("deletes the previous build's marker and log rows, then records the current build", async () => {
|
|
50
|
+
stubTable("old", {
|
|
51
|
+
old: ["tag-a", "tag-b", "tag-c"],
|
|
52
|
+
"old#log": ["000000000000001#tag-a", "000000000000002#tag-b"],
|
|
53
|
+
current: ["tag-a"],
|
|
54
|
+
"current#log": ["000000000000003#tag-a"],
|
|
55
|
+
});
|
|
56
|
+
await (0, prune_revalidation_table_1.pruneRevalidationTable)({
|
|
57
|
+
tableName: "table",
|
|
58
|
+
currentBuildId: "current",
|
|
59
|
+
});
|
|
60
|
+
const deleted = sent(client_dynamodb_1.BatchWriteItemCommand).flatMap((command) => command.input.RequestItems.table.map((request) => `${request.DeleteRequest.Key.pk.S}/${request.DeleteRequest.Key.sk.S}`));
|
|
61
|
+
expect(deleted.sort()).toEqual([
|
|
62
|
+
"old/tag-a",
|
|
63
|
+
"old/tag-b",
|
|
64
|
+
"old/tag-c",
|
|
65
|
+
"old#log/000000000000001#tag-a",
|
|
66
|
+
"old#log/000000000000002#tag-b",
|
|
67
|
+
].sort());
|
|
68
|
+
expect(sent(client_dynamodb_1.PutItemCommand)[0].input.Item.buildId.S).toBe("current");
|
|
69
|
+
});
|
|
70
|
+
});
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJ1bmUtcmV2YWxpZGF0aW9uLXRhYmxlLnRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGFtYmRhcy9wb3N0LWRlcGxveS9wcnVuZS1yZXZhbGlkYXRpb24tdGFibGUudGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHNEQUFzRDtBQUN0RCw0RUFBNEU7QUFDNUUsMEVBQTBFO0FBQzFFLElBQUksQ0FBQyxJQUFJLENBQUMsMEJBQTBCLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQztJQUMzQyxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsMEJBQTBCLENBQUM7SUFDakQsY0FBYyxFQUFFLElBQUksQ0FBQyxFQUFFLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQztRQUM3QixJQUFJLEVBQUUsQ0FBQyxHQUFHLElBQWUsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQztLQUNuRCxDQUFDLENBQUM7Q0FDSixDQUFDLENBQUMsQ0FBQztBQUVKLDhEQUtrQztBQUNsQyx5RUFBb0U7QUFFcEUsTUFBTSxNQUFNLEdBQUcsRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUM7QUFFbkM7OztHQUdHO0FBQ0gsU0FBUyxTQUFTLENBQ2hCLGVBQXVCLEVBQ3ZCLElBQThCLEVBQzlCLFFBQVEsR0FBRyxDQUFDO0lBRVosTUFBTSxDQUFDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLE9BQWdCLEVBQUUsRUFBRTtRQUNsRCxJQUFJLE9BQU8sWUFBWSxnQ0FBYyxFQUFFLENBQUM7WUFDdEMsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQUUsSUFBSSxFQUFFLEVBQUUsT0FBTyxFQUFFLEVBQUUsQ0FBQyxFQUFFLGVBQWUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ3hFLENBQUM7UUFDRCxJQUFJLE9BQU8sWUFBWSw4QkFBWSxFQUFFLENBQUM7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QUMsSUFBSSxFQUFFLENBQ1QsQ0FBQztRQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsZ0NBQWMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUN4RSxDQUFDLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyogZXNsaW50LWRpc2FibGUgaW1wb3J0L25vLWV4dHJhbmVvdXMtZGVwZW5kZW5jaWVzICovXG4vLyBPbmx5IHRoZSBjbGllbnQgaXMgbW9ja2VkLCBhcyBpbiBgcHJ1bmUtY2FjaGUtYnVja2V0LnRlc3QudHNgOiB0aGUgbW9kdWxlXG4vLyBjb25zdHJ1Y3RzIGl0cyBjbGllbnQgYXQgbW9kdWxlIHNjb3BlLCBiZWZvcmUgdGhlIG1vY2sgdmFyaWFibGVzIGV4aXN0LlxuamVzdC5tb2NrKFwiQGF3cy1zZGsvY2xpZW50LWR5bmFtb2RiXCIsICgpID0+ICh7XG4gIC4uLmplc3QucmVxdWlyZUFjdHVhbChcIkBhd3Mtc2RrL2NsaWVudC1keW5hbW9kYlwiKSxcbiAgRHluYW1vREJDbGllbnQ6IGplc3QuZm4oKCkgPT4gKHtcbiAgICBzZW5kOiAoLi4uYXJnczogdW5rbm93bltdKSA9PiBob2xkZXIuc2VuZCguLi5hcmdzKSxcbiAgfSkpLFxufSkpO1xuXG5pbXBvcnQge1xuICBCYXRjaFdyaXRlSXRlbUNvbW1hbmQsXG4gIEdldEl0ZW1Db21tYW5kLFxuICBQdXRJdGVtQ29tbWFuZCxcbiAgUXVlcnlDb21tYW5kLFxufSBmcm9tIFwiQGF3cy1zZGsvY2xpZW50LWR5bmFtb2RiXCI7XG5pbXBvcnQgeyBwcnVuZVJldmFsaWRhdGlvblRhYmxlIH0gZnJvbSBcIi4vcHJ1bmUtcmV2YWxpZGF0aW9uLXRhYmxlXCI7XG5cbmNvbnN0IGhvbGRlciA9IHsgc2VuZDogamVzdC5mbigpIH07XG5cbi8qKlxuICogQSBmYWtlIHRhYmxlIHdob3NlIG1ldGFkYXRhIG5hbWVzIGBwcmV2aW91c0J1aWxkSWRgOyBlYWNoIFF1ZXJ5IHBhZ2VzXG4gKiBgcGFnZVNpemVgIHJvd3MgYXQgYSB0aW1lIG9mIHRoZSBwYXJ0aXRpb24gYXNrZWQgZm9yLlxuICovXG5mdW5jdGlvbiBzdHViVGFibGUoXG4gIHByZXZpb3VzQnVpbGRJZDogc3RyaW5nLFxuICByb3dzOiBSZWNvcmQ8c3RyaW5nLCBzdHJpbmdbXT4sXG4gIHBhZ2VTaXplID0gMixcbik6IHZvaWQge1xuICBob2xkZXIuc2VuZC5tb2NrSW1wbGVtZW50YXRpb24oKGNvbW1hbmQ6IHVua25vd24pID0+IHtcbiAgICBpZiAoY29tbWFuZCBpbnN0YW5jZW9mIEdldEl0ZW1Db21tYW5kKSB7XG4gICAgICByZXR1cm4gUHJvbWlzZS5yZXNvbHZlKHsgSXRlbTogeyBidWlsZElkOiB7IFM6IHByZXZpb3VzQnVpbGRJZCB9IH0gfSk7XG4gICAgfVxuICAgIGlmIChjb21tYW5kIGluc3RhbmNlb2YgUXVlcnlDb21tYW5kKSB7XG4gICAgICBjb25zdCBwayA9IGNvbW1hbmQuaW5wdXQuRXhwcmVzc2lvbkF0dHJpYnV0ZVZhbHVlcyFbXCI6cGtcIl0uUyE7XG4gICAgICBjb25zdCBvZmZzZXQgPSBOdW1iZXIoY29tbWFuZC5pbnB1dC5FeGNsdXNpdmVTdGFydEtleT8ub2Zmc2V0Lk4gPz8gMCk7XG4gICAgICBjb25zdCBza3MgPSByb3dzW3BrXSA/PyBbXTtcbiAgICAgIHJldHVybiBQcm9taXNlLnJlc29sdmUoe1xuICAgICAgICBJdGVtczogc2tzXG4gICAgICAgICAgLnNsaWNlKG9mZnNldCwgb2Zmc2V0ICsgcGFnZVNpemUpXG4gICAgICAgICAgLm1hcCgoc2spID0+ICh7IHBrOiB7IFM6IHBrIH0sIHNrOiB7IFM6IHNrIH0gfSkpLFxuICAgICAgICBMYXN0RXZhbHVhdGVkS2V5OlxuICAgICAgICAgIG9mZnNldCArIHBhZ2VTaXplIDwgc2tzLmxlbmd0aFxuICAgICAgICAgICAgPyB7IG9mZnNldDogeyBOOiBTdHJpbmcob2Zmc2V0ICsgcGFnZVNpemUpIH0gfVxuICAgICAgICAgICAgOiB1bmRlZmluZWQsXG4gICAgICB9KTtcbiAgICB9XG4gICAgcmV0dXJuIFByb21pc2UucmVzb2x2ZSh7fSk7XG4gIH0pO1xufVxuXG5mdW5jdGlvbiBzZW50PFQ+KHR5cGU6IG5ldyAoLi4uYXJnczogYW55W10pID0+IFQpOiBUW10ge1xuICByZXR1cm4gaG9sZGVyLnNlbmQubW9jay5jYWxsc1xuICAgIC5tYXAoKFtjb21tYW5kXSkgPT4gY29tbWFuZClcbiAgICAuZmlsdGVyKChjb21tYW5kKTogY29tbWFuZCBpcyBUID0+IGNvbW1hbmQgaW5zdGFuY2VvZiB0eXBlKTtcbn1cblxuZGVzY3JpYmUoXCJwcnVuZVJldmFsaWRhdGlvblRhYmxlXCIsICgpID0+IHtcbiAgYmVmb3JlRWFjaCgoKSA9PiB7XG4gICAgaG9sZGVyLnNlbmQubW9ja1Jlc2V0KCk7XG4gIH0pO1xuXG4gIGl0KFwiZGVsZXRlcyB0aGUgcHJldmlvdXMgYnVpbGQncyBtYXJrZXIgYW5kIGxvZyByb3dzLCB0aGVuIHJlY29yZHMgdGhlIGN1cnJlbnQgYnVpbGRcIiwgYXN5bmMgKCkgPT4ge1xuICAgIHN0dWJUYWJsZShcIm9sZFwiLCB7XG4gICAgICBvbGQ6IFtcInRhZy1hXCIsIFwidGFnLWJcIiwgXCJ0YWctY1wiXSxcbiAgICAgIFwib2xkI2xvZ1wiOiBbXCIwMDAwMDAwMDAwMDAwMDEjdGFnLWFcIiwgXCIwMDAwMDAwMDAwMDAwMDIjdGFnLWJcIl0sXG4gICAgICBjdXJyZW50OiBbXCJ0YWctYVwiXSxcbiAgICAgIFwiY3VycmVudCNsb2dcIjogW1wiMDAwMDAwMDAwMDAwMDAzI3RhZy1hXCJdLFxuICAgIH0pO1xuXG4gICAgYXdhaXQgcHJ1bmVSZXZhbGlkYXRpb25UYWJsZSh7XG4gICAgICB0YWJsZU5hbWU6IFwidGFibGVcIixcbiAgICAgIGN1cnJlbnRCdWlsZElkOiBcImN1cnJlbnRcIixcbiAgICB9KTtcblxuICAgIGNvbnN0IGRlbGV0ZWQgPSBzZW50KEJhdGNoV3JpdGVJdGVtQ29tbWFuZCkuZmxhdE1hcCgoY29tbWFuZCkgPT5cbiAgICAgIGNvbW1hbmQuaW5wdXQuUmVxdWVzdEl0ZW1zIS50YWJsZS5tYXAoXG4gICAgICAgIChyZXF1ZXN0KSA9PlxuICAgICAgICAgIGAke3JlcXVlc3QuRGVsZXRlUmVxdWVzdCEuS2V5IS5way5TfS8ke3JlcXVlc3QuRGVsZXRlUmVxdWVzdCEuS2V5IS5zay5TfWAsXG4gICAgICApLFxuICAgICk7XG4gICAgZXhwZWN0KGRlbGV0ZWQuc29ydCgpKS50b0VxdWFsKFxuICAgICAgW1xuICAgICAgICBcIm9sZC90YWctYVwiLFxuICAgICAgICBcIm9sZC90YWctYlwiLFxuICAgICAgICBcIm9sZC90YWctY1wiLFxuICAgICAgICBcIm9sZCNsb2cvMDAwMDAwMDAwMDAwMDAxI3RhZy1hXCIsXG4gICAgICAgIFwib2xkI2xvZy8wMDAwMDAwMDAwMDAwMDIjdGFnLWJcIixcbiAgICAgIF0uc29ydCgpLFxuICAgICk7XG4gICAgZXhwZWN0KHNlbnQoUHV0SXRlbUNvbW1hbmQpWzBdLmlucHV0Lkl0ZW0hLmJ1aWxkSWQuUykudG9CZShcImN1cnJlbnRcIik7XG4gIH0pO1xufSk7XG4iXX0=
|
|
@@ -7,16 +7,25 @@ interface PruneS3Props {
|
|
|
7
7
|
msTtl: number;
|
|
8
8
|
/**
|
|
9
9
|
* S3 key prefix the app's static assets live under. Surrounding slashes are
|
|
10
|
-
* normalized away. Scopes pruning to this app's objects so that apps
|
|
11
|
-
* branches sharing one bucket under different `basePath`s don't delete
|
|
12
|
-
* other's assets. Empty or omitted prunes the
|
|
10
|
+
* normalized away. Scopes pruning to this app's `_next/` objects so that apps
|
|
11
|
+
* or branches sharing one bucket under different `basePath`s don't delete
|
|
12
|
+
* each other's assets. Empty or omitted prunes `_next/` at the bucket root.
|
|
13
13
|
*/
|
|
14
14
|
keyPrefix?: string;
|
|
15
15
|
}
|
|
16
16
|
/**
|
|
17
17
|
* Given `bucketName`, `currentBuildId`, and `msTtl`, list the objects under
|
|
18
|
-
* `keyPrefix` and delete any that 1/
|
|
19
|
-
*
|
|
18
|
+
* `keyPrefix`'s `_next/` and delete any that 1/ carry a build id that is not
|
|
19
|
+
* `currentBuildId` and 2/ were created more than `msTtl` ago.
|
|
20
|
+
*
|
|
21
|
+
* An object with no build id at all is kept. It was not uploaded by this
|
|
22
|
+
* construct's `BucketDeployment` — which stamps every object it writes — so
|
|
23
|
+
* nothing here knows whether some other stack is serving it, and deleting a live
|
|
24
|
+
* asset 404s a page while keeping a stale one only costs storage.
|
|
20
25
|
*/
|
|
21
26
|
export declare function pruneS3(props: PruneS3Props): Promise<void>;
|
|
27
|
+
/**
|
|
28
|
+
* Process objects in batches to avoid overwhelming the system
|
|
29
|
+
*/
|
|
30
|
+
export declare function processBatch<T, R>(items: T[], batchSize: number, processFn: (item: T) => Promise<R>): Promise<R[]>;
|
|
22
31
|
export {};
|