@aws-blocks/core 0.3.0 → 0.4.0

package/dist/scripts/sandbox-empty-buckets.test.js

@@ -0,0 +1,171 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { describe, it } from 'node:test';
+import assert from 'node:assert';
+import { emptyBucket, listStackBucketNames, runDestroyWithRetries, toDeleteObjects } from './sandbox.js';
+// The teardown bucket-emptying must delete BOTH live versions and delete
+// markers — a versioned bucket left with either still blocks `cdk destroy`.
+// This is the exact combination that, done wrong, silently no-ops.
+describe('toDeleteObjects', () => {
+    it('combines versions and delete markers', () => {
+        const out = toDeleteObjects({
+            Versions: [
+                { Key: 'a', VersionId: 'v1' },
+                { Key: 'b', VersionId: 'v2' },
+            ],
+            DeleteMarkers: [{ Key: 'a', VersionId: 'dm1' }],
+        });
+        assert.deepStrictEqual(out, [
+            { Key: 'a', VersionId: 'v1' },
+            { Key: 'b', VersionId: 'v2' },
+            { Key: 'a', VersionId: 'dm1' },
+        ]);
+    });
+    it('returns [] for an empty bucket (no Versions/DeleteMarkers keys)', () => {
+        assert.deepStrictEqual(toDeleteObjects({}), []);
+    });
+    it('tolerates only versions or only delete markers', () => {
+        assert.deepStrictEqual(toDeleteObjects({ Versions: [{ Key: 'x', VersionId: 'v' }] }), [
+            { Key: 'x', VersionId: 'v' },
+        ]);
+        assert.deepStrictEqual(toDeleteObjects({ DeleteMarkers: [{ Key: 'y', VersionId: 'd' }] }), [
+            { Key: 'y', VersionId: 'd' },
+        ]);
+    });
+    it('drops entries without a Key rather than emitting a bad DeleteObjects payload', () => {
+        assert.deepStrictEqual(toDeleteObjects({ Versions: [{ VersionId: 'orphan' }] }), []);
+    });
+});
+describe('listStackBucketNames', () => {
+    it('follows NextToken across pages and returns only S3 buckets', async () => {
+        const seen = [];
+        const send = async (cmd) => {
+            seen.push(cmd.input.NextToken);
+            if (cmd.input.NextToken === undefined) {
+                return {
+                    StackResourceSummaries: [
+                        { ResourceType: 'AWS::S3::Bucket', PhysicalResourceId: 'b1' },
+                        { ResourceType: 'AWS::Lambda::Function', PhysicalResourceId: 'fn' },
+                    ],
+                    NextToken: 't2',
+                };
+            }
+            return { StackResourceSummaries: [{ ResourceType: 'AWS::S3::Bucket', PhysicalResourceId: 'b2' }] };
+        };
+        const cfn = { send };
+        const buckets = await listStackBucketNames(cfn, 'stack');
+        assert.deepStrictEqual(buckets, ['b1', 'b2']);
+        assert.deepStrictEqual(seen, [undefined, 't2']); // paged exactly twice
+    });
+});
+describe('emptyBucket', () => {
+    it('deletes versions + markers, re-lists, and stops when empty', async () => {
+        let lists = 0;
+        const deletePayloads = [];
+        const send = async (cmd) => {
+            if (cmd.constructor.name === 'ListObjectVersionsCommand') {
+                lists++;
+                return lists === 1
+                    ? { Versions: [{ Key: 'a', VersionId: 'v1' }], DeleteMarkers: [{ Key: 'a', VersionId: 'd1' }] }
+                    : {};
+            }
+            if (cmd.constructor.name === 'DeleteObjectsCommand') {
+                deletePayloads.push(cmd.input.Delete.Objects);
+                return {};
+            }
+            throw new Error(`unexpected ${cmd.constructor.name}`);
+        };
+        await emptyBucket({ send }, 'bucket');
+        assert.strictEqual(lists, 2); // listed, deleted, re-listed → empty
+        assert.deepStrictEqual(deletePayloads, [
+            [
+                { Key: 'a', VersionId: 'v1' },
+                { Key: 'a', VersionId: 'd1' },
+            ],
+        ]);
+    });
+    it('stops (no infinite loop) when DeleteObjects reports Errors', async () => {
+        let lists = 0;
+        let deletes = 0;
+        const send = async (cmd) => {
+            if (cmd.constructor.name === 'ListObjectVersionsCommand') {
+                lists++;
+                return { Versions: [{ Key: 'locked', VersionId: 'v1' }] };
+            }
+            if (cmd.constructor.name === 'DeleteObjectsCommand') {
+                deletes++;
+                return { Errors: [{ Key: 'locked', Code: 'AccessDenied' }] };
+            }
+            throw new Error(`unexpected ${cmd.constructor.name}`);
+        };
+        await emptyBucket({ send }, 'bucket');
+        assert.strictEqual(lists, 1); // did NOT re-list after Errors
+        assert.strictEqual(deletes, 1);
+    });
+});
+// The sev2 fix is the wiring: on a destroy failure, buckets get emptied BEFORE
+// the retry. runDestroyWithRetries takes its side effects as deps so we can
+// exercise that ordering without spawning cdk.
+describe('runDestroyWithRetries', () => {
+    it('empties buckets before retrying a failed destroy', async () => {
+        const events = [];
+        let attempts = 0;
+        await runDestroyWithRetries({
+            runDestroy: () => {
+                attempts++;
+                events.push(`destroy#${attempts}`);
+                if (attempts === 1)
+                    throw new Error('bucket not empty');
+            },
+            listStackNames: () => {
+                events.push('list');
+                return ['stackA', 'stackB'];
+            },
+            emptyBuckets: async (names) => {
+                events.push(`empty:${names.join(',')}`);
+            },
+            sleep: async () => {
+                events.push('sleep');
+            },
+            retryDelays: [1],
+        });
+        assert.strictEqual(attempts, 2);
+        // buckets emptied (with the resolved stack names) before the retry destroy
+        assert.deepStrictEqual(events, ['destroy#1', 'list', 'empty:stackA,stackB', 'sleep', 'destroy#2']);
+    });
+    it('does not empty or sleep when the first destroy succeeds', async () => {
+        let emptied = false;
+        let slept = false;
+        let listed = false;
+        await runDestroyWithRetries({
+            runDestroy: () => { },
+            listStackNames: () => {
+                listed = true;
+                return [];
+            },
+            emptyBuckets: async () => {
+                emptied = true;
+            },
+            sleep: async () => {
+                slept = true;
+            },
+        });
+        assert.strictEqual(emptied, false);
+        assert.strictEqual(slept, false);
+        assert.strictEqual(listed, false);
+    });
+    it('throws after exhausting retries', async () => {
+        let attempts = 0;
+        await assert.rejects(runDestroyWithRetries({
+            runDestroy: () => {
+                attempts++;
+                throw new Error('still failing');
+            },
+            listStackNames: () => [],
+            emptyBuckets: async () => { },
+            sleep: async () => { },
+            retryDelays: [1, 1],
+        }), /still failing/);
+        assert.strictEqual(attempts, 3); // initial attempt + 2 retries
+    });
+});

package/dist/scripts/sandbox.d.ts

@@ -1,3 +1,5 @@
+import type { CloudFormationClient } from '@aws-sdk/client-cloudformation';
+import type { S3Client } from '@aws-sdk/client-s3';
 export interface SandboxOptions {
     backendPath: string;
     outDir?: string;
@@ -59,5 +61,57 @@ export declare function buildSandboxDeployArgs({ outDir, projectRoot, backendPat
  */
 export declare function sandboxFailureRecoveryHint(): string;
 export declare function startSandbox(options: SandboxOptions): Promise<string | undefined>;
+/**
+ * Flatten a ListObjectVersions response into the `{ Key, VersionId }[]` shape
+ * DeleteObjects expects, combining live versions AND delete markers. Exported
+ * for unit testing — getting this combination wrong (e.g. missing the delete
+ * markers) leaves a "versioned" bucket that still can't be deleted.
+ */
+export declare function toDeleteObjects(listed: {
+    Versions?: Array<{
+        Key?: string;
+        VersionId?: string;
+    }>;
+    DeleteMarkers?: Array<{
+        Key?: string;
+        VersionId?: string;
+    }>;
+}): Array<{
+    Key: string;
+    VersionId?: string;
+}>;
+/** Collect a stack's S3 bucket physical names (paginated — a large stack has
+ * >100 resources, so a single page can miss the hosting bucket that blocks the
+ * delete). Returns [] if the stack is already gone / not accessible. */
+export declare function listStackBucketNames(cfn: CloudFormationClient, stackName: string): Promise<string[]>;
+/** Empty a versioned bucket: delete every object version + delete marker in
+ * pages of 1000 (the DeleteObjects limit). Stops if a page reports per-key
+ * errors (object-lock / retention) so it can't loop forever. */
+export declare function emptyBucket(s3: S3Client, bucket: string): Promise<void>;
+/** Injectable dependencies for {@link runDestroyWithRetries} — real ones in
+ * `destroySandbox`, fakes in tests so the retry/empty-before-retry wiring (the
+ * sev2 fix) is exercised without spawning cdk. */
+export interface DestroyRetryDeps {
+    /** Run one `cdk destroy` attempt; throws on failure. */
+    runDestroy: () => void;
+    /** Resolve the app's stack names (for bucket enumeration). */
+    listStackNames: () => string[];
+    /** Empty the given stacks' versioned S3 buckets. */
+    emptyBuckets: (stackNames: string[]) => Promise<void>;
+    /** Sleep (VPC-ENI detach window). */
+    sleep: (ms: number) => Promise<void>;
+    /** Backoff between retries. Default: 1min, then 2min. */
+    retryDelays?: number[];
+}
+/**
+ * Retry `cdk destroy`, clearing the two known teardown blockers before each
+ * retry: (1) non-empty versioned S3 buckets — `cdk destroy` relies on each
+ * bucket's autoDeleteObjects Lambda, which never provisioned if the CREATE
+ * failed, so the bucket blocks the delete and the stack (+ its IAM roles) leaks;
+ * we empty them out-of-band — and (2) VPC ENIs that take 60-120s to detach (the
+ * backoff). Stack names are resolved once and reused (topology is stable across
+ * attempts). Factored out with injectable deps so this behavior is unit-testable.
+ */
+export declare function runDestroyWithRetries(deps: DestroyRetryDeps): Promise<void>;
 export declare function destroySandbox(backendPath: string): Promise<void>;
 //# sourceMappingURL=sandbox.d.ts.map

package/dist/scripts/sandbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../src/scripts/sandbox.ts"],"names":[],"mappings":"AAiCA,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,yFAAyF;IACzF,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,wBAAwB;IACvC,4EAA4E;IAC5E,MAAM,EAAE,MAAM,CAAC;IACf,2FAA2F;IAC3F,WAAW,EAAE,MAAM,CAAC;IACpB,kFAAkF;IAClF,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,wBAAwB,GAAG,MAAM,EAAE,CAY/G;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,0BAA0B,IAAI,MAAM,CAYnD;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,cAAc,+BAwMzD;AAED,wBAAsB,cAAc,CAAC,WAAW,EAAE,MAAM,iBAwCvD"}
+{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../src/scripts/sandbox.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAkBnD,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,yFAAyF;IACzF,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,wBAAwB;IACvC,4EAA4E;IAC5E,MAAM,EAAE,MAAM,CAAC;IACf,2FAA2F;IAC3F,WAAW,EAAE,MAAM,CAAC;IACpB,kFAAkF;IAClF,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,wBAAwB,GAAG,MAAM,EAAE,CAY/G;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,0BAA0B,IAAI,MAAM,CAYnD;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,cAAc,+BAwMzD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE;IACvC,QAAQ,CAAC,EAAE,KAAK,CAAC;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvD,aAAa,CAAC,EAAE,KAAK,CAAC;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC5D,GAAG,KAAK,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAI7C;AAED;;wEAEwE;AACxE,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAY1G;AAED;;gEAEgE;AAChE,wBAAsB,WAAW,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB7E;AAmED;;kDAEkD;AAClD,MAAM,WAAW,gBAAgB;IAChC,wDAAwD;IACxD,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,8DAA8D;IAC9D,cAAc,EAAE,MAAM,MAAM,EAAE,CAAC;IAC/B,oDAAoD;IACpD,YAAY,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,qCAAqC;IACrC,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,yDAAyD;IACzD,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBjF;AAED,wBAAsB,cAAc,CAAC,WAAW,EAAE,MAAM,iBAyBvD"}

package/dist/scripts/sandbox.js

@@ -279,6 +279,160 @@ export async function startSandbox(options) {
     process.on("SIGTERM", cleanup);
     await new Promise(() => { });
 }
+/**
+ * Flatten a ListObjectVersions response into the `{ Key, VersionId }[]` shape
+ * DeleteObjects expects, combining live versions AND delete markers. Exported
+ * for unit testing — getting this combination wrong (e.g. missing the delete
+ * markers) leaves a "versioned" bucket that still can't be deleted.
+ */
+export function toDeleteObjects(listed) {
+    return [...(listed.Versions ?? []), ...(listed.DeleteMarkers ?? [])]
+        .filter((v) => v.Key !== undefined)
+        .map((v) => ({ Key: v.Key, VersionId: v.VersionId }));
+}
+/** Collect a stack's S3 bucket physical names (paginated — a large stack has
+ * >100 resources, so a single page can miss the hosting bucket that blocks the
+ * delete). Returns [] if the stack is already gone / not accessible. */
+export async function listStackBucketNames(cfn, stackName) {
+    const { ListStackResourcesCommand } = await import('@aws-sdk/client-cloudformation');
+    const buckets = [];
+    let token;
+    do {
+        const res = await cfn.send(new ListStackResourcesCommand({ StackName: stackName, NextToken: token }));
+        for (const r of res.StackResourceSummaries ?? []) {
+            if (r.ResourceType === 'AWS::S3::Bucket' && r.PhysicalResourceId)
+                buckets.push(r.PhysicalResourceId);
+        }
+        token = res.NextToken;
+    } while (token);
+    return buckets;
+}
+/** Empty a versioned bucket: delete every object version + delete marker in
+ * pages of 1000 (the DeleteObjects limit). Stops if a page reports per-key
+ * errors (object-lock / retention) so it can't loop forever. */
+export async function emptyBucket(s3, bucket) {
+    const { ListObjectVersionsCommand, DeleteObjectsCommand } = await import('@aws-sdk/client-s3');
+    while (true) {
+        const listed = await s3.send(new ListObjectVersionsCommand({ Bucket: bucket, MaxKeys: 1000 }));
+        const objects = toDeleteObjects(listed);
+        if (objects.length === 0)
+            return;
+        const res = await s3.send(new DeleteObjectsCommand({ Bucket: bucket, Delete: { Objects: objects, Quiet: true } }));
+        if (res.Errors && res.Errors.length > 0) {
+            // A bucket we can't fully empty (object-lock / retention / AccessDenied)
+            // will keep blocking `cdk destroy`, so the stack won't tear down until it's
+            // resolved by hand. Log loudly with the first error code — this is the
+            // kind of silent skip that leaks a stack, so make it visible in CI output.
+            const first = res.Errors[0];
+            console.warn(`  ⚠️  ${bucket}: ${res.Errors.length} object(s) could NOT be deleted ` +
+                `(e.g. ${first.Key}: ${first.Code}). This bucket will block stack teardown ` +
+                `until cleared manually.`);
+            return;
+        }
+    }
+}
+/**
+ * Empty every versioned S3 bucket owned by the given stacks. `cdk destroy`
+ * relies on each bucket's `autoDeleteObjects` custom-resource Lambda to empty
+ * it on teardown — but that Lambda never provisions if the CREATE failed (e.g.
+ * a partial/aborted deploy), so the versioned bucket blocks the delete and the
+ * stack (and its IAM roles) leak. Emptying out-of-band before the retry lets
+ * the delete complete. Best-effort: any per-stack/per-bucket error is logged
+ * and skipped so teardown still proceeds.
+ */
+async function emptySandboxBuckets(stackNames) {
+    try {
+        const { CloudFormationClient } = await import('@aws-sdk/client-cloudformation');
+        const { S3Client } = await import('@aws-sdk/client-s3');
+        const cfn = new CloudFormationClient({});
+        // `followRegionRedirects` makes the client transparently retry against a
+        // bucket's real region on a PermanentRedirect, so a bucket that lives
+        // outside AWS_REGION (e.g. a us-east-1 Lambda@Edge stack's bucket) is still
+        // emptied instead of failing silently — closing the exact no-op this fix
+        // targets. It needs no GetBucketLocation permission.
+        const s3 = new S3Client({ followRegionRedirects: true });
+        for (const stackName of stackNames) {
+            let buckets = [];
+            try {
+                buckets = await listStackBucketNames(cfn, stackName);
+            }
+            catch {
+                continue; // stack already gone / not accessible
+            }
+            for (const b of buckets) {
+                try {
+                    await emptyBucket(s3, b);
+                }
+                catch (e) {
+                    console.warn(`  ⚠️  could not empty ${b}: ${e.message}`);
+                }
+            }
+        }
+    }
+    catch (e) {
+        console.warn(`  ⚠️  bucket-emptying step skipped: ${e.message}`);
+    }
+}
+/** Resolve the sandbox app's stack names via `cdk ls` (best-effort; [] on error). */
+function listSandboxStackNames(backendPath, cdkEnv) {
+    try {
+        const out = execFileSync('npm', 
+        // Single-quote backendPath: CDK re-runs the --app string through a shell,
+        // so an unquoted path containing a space would split.
+        ['exec', 'cdk', '--', 'ls', '--context', 'sandboxMode=true', '--app', `npm exec tsx -- -C cdk '${backendPath}'`], 
+        // Capture stderr so a genuine synth/`cdk ls` failure can be logged below
+        // rather than being indistinguishable from "app has zero stacks".
+        { env: cdkEnv, encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
+        return out
+            .split('\n')
+            .map((s) => s.trim())
+            .filter(Boolean);
+    }
+    catch (e) {
+        // Warn (don't stay silent): if this returns [] on a real failure, the retry
+        // skips bucket-emptying — the exact silent-no-op this change exists to avoid.
+        const detail = e.stderr || e.message;
+        console.warn(`  ⚠️  could not list sandbox stacks via 'cdk ls'; skipping bucket-emptying: ${detail}`);
+        return [];
+    }
+}
+/**
+ * Retry `cdk destroy`, clearing the two known teardown blockers before each
+ * retry: (1) non-empty versioned S3 buckets — `cdk destroy` relies on each
+ * bucket's autoDeleteObjects Lambda, which never provisioned if the CREATE
+ * failed, so the bucket blocks the delete and the stack (+ its IAM roles) leaks;
+ * we empty them out-of-band — and (2) VPC ENIs that take 60-120s to detach (the
+ * backoff). Stack names are resolved once and reused (topology is stable across
+ * attempts). Factored out with injectable deps so this behavior is unit-testable.
+ */
+export async function runDestroyWithRetries(deps) {
+    const retryDelays = deps.retryDelays ?? [60_000, 120_000];
+    let stackNames;
+    for (let attempt = 0;; attempt++) {
+        try {
+            deps.runDestroy();
+            console.log(attempt === 0 ? '\n✅ Sandbox destroyed!' : '\n✅ Sandbox destroyed on retry!');
+            return;
+        }
+        catch (error) {
+            if (attempt < retryDelays.length) {
+                if (stackNames === undefined)
+                    stackNames = deps.listStackNames();
+                if (stackNames.length > 0) {
+                    console.log('\n🧹 Emptying versioned S3 buckets before retry...');
+                    await deps.emptyBuckets(stackNames);
+                }
+                const delaySec = retryDelays[attempt] / 1000;
+                console.log(`\n⏳ Stack deletion failed. Retrying in ${delaySec}s (waiting for resource cleanup)...`);
+                await deps.sleep(retryDelays[attempt]);
+            }
+            else {
+                console.error('\n❌ Destroy failed after retries.');
+                throw error;
+            }
+        }
+    }
+}
 export async function destroySandbox(backendPath) {
     return trackCommand('sandbox:destroy', async () => {
         console.log("🗑️  Destroying sandbox...");
@@ -294,32 +448,16 @@ export async function destroySandbox(backendPath) {
             "exec", "cdk", "--", "destroy",
             "--force",
             "--context", "sandboxMode=true",
-            "--app", `npm exec tsx -- -C cdk ${backendPath}`,
+            // Single-quote backendPath: CDK re-runs the --app string through a shell,
+            // so an unquoted path containing a space would split.
+            "--app", `npm exec tsx -- -C cdk '${backendPath}'`,
         ];
         const cdkEnv = { ...process.env, NODE_OPTIONS: "--conditions=cdk", ...getCdkTelemetryEnv('sandbox') };
-        // Retry with backoff for VPC-dependent resources (e.g. Aurora clusters).
-        // CloudFormation deletes the cluster first, but its ENIs take 60-120s to
-        // detach from the VPC subnets asynchronously. The initial destroy fails
-        // because the subnets still have attached ENIs; retrying after the cleanup
-        // window lets the VPC delete succeed.
-        const retryDelays = [60_000, 120_000]; // 1min, then 2min
-        for (let attempt = 0;; attempt++) {
-            try {
-                runSync("npm", cdkArgs, { stdio: "inherit", env: cdkEnv });
-                console.log(attempt === 0 ? "\n✅ Sandbox destroyed!" : "\n✅ Sandbox destroyed on retry!");
-                return;
-            }
-            catch (error) {
-                if (attempt < retryDelays.length) {
-                    const delaySec = retryDelays[attempt] / 1000;
-                    console.log(`\n⏳ Stack deletion failed. Retrying in ${delaySec}s (waiting for resource cleanup)...`);
-                    await new Promise(r => setTimeout(r, retryDelays[attempt]));
-                }
-                else {
-                    console.error("\n❌ Destroy failed after retries.");
-                    throw error;
-                }
-            }
-        }
+        await runDestroyWithRetries({
+            runDestroy: () => runSync('npm', cdkArgs, { stdio: 'inherit', env: cdkEnv }),
+            listStackNames: () => listSandboxStackNames(backendPath, cdkEnv),
+            emptyBuckets: emptySandboxBuckets,
+            sleep: (ms) => new Promise((r) => setTimeout(r, ms)),
+        });
     });
 }

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const CORE_VERSION = "0.3.0";
+export declare const CORE_VERSION = "0.4.0";
 //# sourceMappingURL=version.d.ts.map

package/dist/version.js

@@ -1,2 +1,2 @@
 // Auto-generated by scripts/generate-version.mjs — do not edit manually
-export const CORE_VERSION = '0.3.0';
+export const CORE_VERSION = '0.4.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-blocks/core",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/aws-devtools-labs/aws-blocks.git",
@@ -52,6 +52,7 @@
       "require": "./dist/server/index.js"
     },
     "./scripts": "./dist/scripts/index.js",
+    "./scripts/generate-client-worker": "./dist/scripts/generate-client-worker.js",
     "./db-naming": {
       "types": "./dist/db-naming.d.ts",
       "default": "./dist/db-naming.js"
@@ -78,6 +79,7 @@
   "dependencies": {
     "@aws-blocks/hosting": "*",
     "@aws-blocks/pipeline": "*",
+    "@aws-sdk/client-cloudformation": "^3.700.0",
     "@aws-sdk/client-s3": "^3.700.0",
     "@aws-sdk/client-ssm": "^3.700.0",
     "@aws-sdk/client-sts": "^3.700.0",

package/src/api.test.ts

@@ -23,3 +23,28 @@ test('Different ApiNamespace names should not collide', () => {
   assert.strictEqual((api1 as any)[API_NAMESPACE_MARKER], 'api1');
   assert.strictEqual((api2 as any)[API_NAMESPACE_MARKER], 'api2');
 });
+
+// ApiNamespace records its name on the scope's resolved compute (CDK
+// synth), while staying a silent no-op where no compute is resolvable.
+test('ApiNamespace records its name on a resolvable compute', () => {
+  const compute = { namespaces: [] as string[] };
+  new ApiNamespace({ id: 'app', compute } as never, 'myapi', () => ({ ping: () => 'ok' }));
+  assert.deepStrictEqual(compute.namespaces, ['myapi']);
+});
+
+test('ApiNamespace is a no-op recorder when the scope has no compute', () => {
+  // The common Scope (mock/runtime) has no `compute`; recording must not throw
+  // and the handler is still tagged and returned unchanged.
+  const handler = new ApiNamespace(new Scope('no-compute'), 'plainapi', () => ({ x: () => 1 }));
+  assert.strictEqual((handler as any)[API_NAMESPACE_MARKER], 'plainapi');
+});
+
+test('ApiNamespace records a namespace at most once per compute', () => {
+  // `namespaces` is a set of names: recording the same name twice (e.g. a
+  // re-imported module during synth) must not append a duplicate.
+  const compute = { namespaces: [] as string[] };
+  const scopeLike = { id: 'app', compute } as never;
+  new ApiNamespace(scopeLike, 'dup', () => ({ ping: () => 'ok' }));
+  new ApiNamespace(scopeLike, 'dup', () => ({ ping: () => 'ok' }));
+  assert.deepStrictEqual(compute.namespaces, ['dup']);
+});

package/src/api.ts

@@ -59,6 +59,42 @@ export const API_NAMESPACE_MARKER = Symbol.for('blocks:ApiNamespace');
 
 import type { ScopeParent } from './common/index.js';
 
+/**
+ * Structural view of a scope that resolves a compute carrying a recordable
+ * namespace list. Only the CDK `Scope` satisfies this at runtime (via its
+ * `compute` getter); in the mock/runtime bundles the property is absent.
+ */
+type ComputeResolvingScope = { compute?: { namespaces?: string[] } };
+
+/**
+ * Record this namespace on its resolved compute so request routing can later
+ * map a namespace to the compute that hosts it.
+ *
+ * CDK-synth concern only: in the CDK bundle `scope.compute` resolves to the
+ * namespace's compute (the stack default today), and we append the name to its
+ * `namespaces` list. In the mock/runtime bundles — or a scopeless test — the
+ * property is absent, so `scope.compute` is `undefined` and this is a silent
+ * no-op. The public `ApiNamespace` signature is unchanged; this is a purely
+ * internal side effect.
+ *
+ * No `try/catch`: `BlocksBackend.create()` initializes the default compute
+ * before it imports the backend module that constructs any `ApiNamespace`, so
+ * the `compute` getter always resolves at this call site. If it ever threw
+ * here it would signal a genuine lifecycle violation (an `ApiNamespace` built
+ * before `create()` resolved), which should surface rather than be swallowed.
+ */
+function recordNamespaceOnCompute(scope: ScopeParent | null | undefined, name: string): void {
+  // An API created without a Scope stays unrecorded and routes to the
+  // default compute.
+  if (!scope || typeof scope !== 'object') return;
+  const compute = (scope as ComputeResolvingScope).compute;
+  // Guard against duplicates so `namespaces` stays a set of names: a namespace
+  // could otherwise be recorded twice (e.g. a re-imported module during synth).
+  if (compute && Array.isArray(compute.namespaces) && !compute.namespaces.includes(name)) {
+    compute.namespaces.push(name);
+  }
+}
+
 /**
  * Define a type-safe API namespace that works seamlessly between frontend and backend.
  * 
@@ -157,6 +193,9 @@ export interface ApiNamespaceConstructor {
 export const ApiNamespace: ApiNamespaceConstructor = class ApiNamespace {
   constructor(scope: ScopeParent, name: string, handler: any) {
     handler[API_NAMESPACE_MARKER] = name;
+    // Record the namespace → compute association for per-compute routing.
+    // No-op outside CDK synth. Signature and returned handler are unchanged.
+    recordNamespaceOnCompute(scope, name);
     return handler;
   }
 } as any;

package/src/bb-utils.ts

@@ -11,3 +11,6 @@ export { getMockDataDir } from './common/mock-data.js';
 export { API_NAMESPACE_MARKER } from './api.js';
 export { EventSourceMapping } from './lambda-handler.js';
 export { constantTimeEquals } from './common/crypto.js';
+// Defined in the config module (it owns the config-key contract), re-exported
+// here so BB authors get it alongside the other BB utilities.
+export { sanitizeConfigKey } from './common/config.js';

package/src/cdk/apigateway-account.ts

@@ -0,0 +1,66 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import type * as cdk from 'aws-cdk-lib';
+import { CfnAccount } from 'aws-cdk-lib/aws-apigateway';
+import { ManagedPolicy, Role, ServicePrincipal } from 'aws-cdk-lib/aws-iam';
+
+/**
+ * Global registry key for the per-stack API Gateway CloudWatch Logs account
+ * resource. Deliberately a `Symbol.for(...)` string key so the SAME symbol is
+ * shared across packages (core, hosting) — each package can carry its own copy
+ * of {@link ensureApiGatewayAccount} yet still find and reuse the one account a
+ * sibling package already created on the stack, instead of emitting a second
+ * `AWS::ApiGateway::Account` (which is account/region-level and would clash).
+ */
+const ACCOUNT_KEY = Symbol.for('BLOCKS_APIGATEWAY_ACCOUNT');
+
+/**
+ * Ensure the account-level API Gateway CloudWatch Logs role exists on `stack`,
+ * creating it at most once per stack.
+ *
+ * API Gateway access logging — for both REST (v1) and WebSocket (v2) stages —
+ * requires an `AWS::ApiGateway::Account` whose `cloudWatchRoleArn` points at a
+ * role trusted by `apigateway.amazonaws.com` and carrying
+ * `AmazonAPIGatewayPushToCloudWatchLogs`. Nothing else in a Blocks stack
+ * provisions it, so a clean-account first deploy of any access-logging stage
+ * otherwise fails at CreateStage with "CloudWatch Logs role ARN must be set in
+ * account settings to enable logging".
+ *
+ * Callers should add their stage's dependency on the returned account so the
+ * account setting is applied before the stage is created.
+ *
+ * ⚠️ Single-Blocks-stack-per-region assumption. `AWS::ApiGateway::Account` is an
+ * account/region-level singleton (one effective `cloudWatchRoleArn` per region),
+ * but this provisions one per Blocks stack. If two Blocks stacks in the same
+ * account+region both enable access logging:
+ *   - on deploy, the later stack's role wins (overwrites the account setting); and
+ *   - on teardown of that later stack, its role is deleted and the account
+ *     setting is left pointing at a now-deleted role — silently breaking access
+ *     logging (or blocking `CreateStage`) for the surviving stack until it
+ *     redeploys.
+ * Enabling `accessLogging` is therefore safe for one Blocks stack per region.
+ * Multi-stack support (a shared/imported account) is deferred; if you run
+ * multiple Blocks stacks per region, manage the account role out-of-band and
+ * leave `accessLogging` to a single owner.
+ */
+export function ensureApiGatewayAccount(stack: cdk.Stack): CfnAccount {
+	const existing = (stack as unknown as Record<symbol, CfnAccount | undefined>)[ACCOUNT_KEY];
+	if (existing) return existing;
+
+	const role = new Role(stack, 'BlocksApiGatewayCloudWatchRole', {
+		assumedBy: new ServicePrincipal('apigateway.amazonaws.com'),
+		managedPolicies: [
+			ManagedPolicy.fromAwsManagedPolicyName('service-role/AmazonAPIGatewayPushToCloudWatchLogs'),
+		],
+	});
+
+	// `cloudWatchRoleArn: role.roleArn` already gives CDK an implicit dependency
+	// on the role, so no explicit node.addDependency is needed.
+	const account = new CfnAccount(stack, 'BlocksApiGatewayAccount', {
+		cloudWatchRoleArn: role.roleArn,
+	});
+
+	(stack as unknown as Record<symbol, CfnAccount | undefined>)[ACCOUNT_KEY] = account;
+	return account;
+}