@aws-blocks/core 0.1.17 → 0.2.0

package/src/cdk/internal.ts

@@ -0,0 +1,29 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * Internal CDK entry point — framework- and test-only surface that is
+ * intentionally NOT part of the public API (`@aws-blocks/core` /
+ * `@aws-blocks/core/cdk`).
+ *
+ * The compute abstraction lives behind this path while it has no public,
+ * customer-facing surface. Importing from here is a signal that you are inside
+ * the framework or a test, not a customer.
+ *
+ * Planned removal: once a customer can assign a compute and have it actually
+ * take effect — i.e. `this.compute` resolution and request routing to the
+ * chosen compute both exist, plus a synth-time guard that rejects an assignment
+ * with no route — these exports move to the public CDK entry point
+ * (`@aws-blocks/core/cdk`, re-exported from `index.cdk.ts`) and this file is
+ * deleted. It must NOT be made public before then: a compute a customer can
+ * declare but that is silently ignored is a worse experience than not having
+ * the feature. Until that flip, treat everything here as unstable — no
+ * backward-compatibility guarantee.
+ *
+ * @internal
+ */
+
+export { Compute } from './compute/compute.js';
+// Reserved `/aws-blocks` path segment, needed by concrete computes (e.g.
+// LambdaCompute in @aws-blocks/bb-lambda-compute) to build their API route tree.
+export { BLOCKS_NAMESPACE } from '../constants.js';

package/src/cdk/mixins.test.ts

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { test, describe } from 'node:test';
-import assert from 'node:assert';
 import * as cdk from 'aws-cdk-lib';
 import { Template, Match } from 'aws-cdk-lib/assertions';
 import { Table, AttributeType, BillingMode } from 'aws-cdk-lib/aws-dynamodb';
@@ -110,6 +109,62 @@ describe('sandbox removal policy', () => {
     });
   });
 
+  test('SandboxDisableDeletionProtection mixin: deletionProtection disabled on DynamoDB table', () => {
+    const app = new cdk.App({ context: { sandboxMode: 'true' } });
+    const stack = new cdk.Stack(app, 'TestStack');
+
+    new Table(stack, 'MyTable', {
+      partitionKey: { name: 'pk', type: AttributeType.STRING },
+      billingMode: BillingMode.PAY_PER_REQUEST,
+      deletionProtection: true,
+    });
+
+    RemovalPolicies.of(stack).destroy();
+    Mixins.of(stack).apply(new SandboxDisableDeletionProtection());
+
+    const template = Template.fromStack(stack);
+    // DynamoDB refuses DeleteTable while protection is on, regardless of DeletionPolicy
+    template.hasResourceProperties('AWS::DynamoDB::Table', {
+      DeletionProtectionEnabled: false,
+    });
+    template.hasResource('AWS::DynamoDB::Table', {
+      DeletionPolicy: 'Delete',
+    });
+  });
+
+  test('production mode: deletionProtection stays enabled on DynamoDB table when mixin is not applied', () => {
+    const app = new cdk.App();
+    const stack = new cdk.Stack(app, 'TestStack');
+
+    new Table(stack, 'MyTable', {
+      partitionKey: { name: 'pk', type: AttributeType.STRING },
+      billingMode: BillingMode.PAY_PER_REQUEST,
+      deletionProtection: true,
+    });
+
+    const template = Template.fromStack(stack);
+    template.hasResourceProperties('AWS::DynamoDB::Table', {
+      DeletionProtectionEnabled: true,
+    });
+  });
+
+  test('SandboxDisableDeletionProtection mixin: does not set DeletionProtectionEnabled on unprotected tables', () => {
+    const app = new cdk.App({ context: { sandboxMode: 'true' } });
+    const stack = new cdk.Stack(app, 'TestStack');
+
+    new Table(stack, 'MyTable', {
+      partitionKey: { name: 'pk', type: AttributeType.STRING },
+      billingMode: BillingMode.PAY_PER_REQUEST,
+    });
+
+    Mixins.of(stack).apply(new SandboxDisableDeletionProtection());
+
+    const template = Template.fromStack(stack);
+    template.hasResourceProperties('AWS::DynamoDB::Table', {
+      DeletionProtectionEnabled: Match.absent(),
+    });
+  });
+
   test('SandboxDisableDeletionProtection mixin: skips constructs without deletionProtection', () => {
     const app = new cdk.App();
     const stack = new cdk.Stack(app, 'TestStack');

package/src/cdk/mixins.ts

@@ -6,13 +6,36 @@ import type { IConstruct } from 'constructs';
 import type { IMixin } from 'constructs';
 
 /**
- * Disables deletion protection on any construct that has a `deletionProtection`
- * property (e.g. RDS clusters, RDS instances). Uses duck-typing so it
- * automatically covers current and future resource types.
+ * Property names used across CloudFormation resources to express deletion
+ * protection. L2 constructs and most L1s use `deletionProtection` (e.g. RDS
+ * clusters and instances, ELBv2 load balancers), while others spell it
+ * `deletionProtectionEnabled` (e.g. the DynamoDB `CfnTable` behind an L2
+ * `Table`, Aurora DSQL clusters).
+ */
+const DELETION_PROTECTION_PROPERTIES = ['deletionProtection', 'deletionProtectionEnabled'] as const;
+
+/**
+ * Disables deletion protection on any construct that exposes a deletion
+ * protection property (e.g. RDS clusters, RDS instances, DynamoDB tables).
+ * Uses duck-typing so it automatically covers current and future resource
+ * types, matching both the `deletionProtection` and
+ * `deletionProtectionEnabled` spellings.
+ *
+ * Note that a DynamoDB L2 `Table` only accepts `deletionProtection` as a prop
+ * and does not re-expose it, so tables are matched through their underlying
+ * L1 `CfnTable.deletionProtectionEnabled`.
  *
  * Intended for sandbox teardown — use in the CDK layer alongside
  * `RemovalPolicies.of(stack).destroy()` to ensure `sandbox:destroy` can
- * delete the entire stack without manual cleanup.
+ * delete the entire stack without manual cleanup. DynamoDB refuses
+ * `DeleteTable` while deletion protection is enabled, regardless of the
+ * CloudFormation `DeletionPolicy`.
+ *
+ * @deprecated Prefer the stack-wide `defaults` prop on `BlocksStack`/`BlocksBackend`
+ * (`defaults: BlocksPresets.sandbox` / `.production`, or `sandboxMode ? … : …`).
+ * Amazon-authored Building Blocks now read removal policy + deletion protection
+ * from `defaults`, so this mixin is no longer needed; it is retained only for
+ * backward compatibility.
  *
  * @example
  * ```ts
@@ -27,15 +50,17 @@ import type { IMixin } from 'constructs';
  */
 export class SandboxDisableDeletionProtection extends Mixin implements IMixin {
   supports(construct: any): boolean {
-    return 'deletionProtection' in construct;
+    return DELETION_PROTECTION_PROPERTIES.some((property) => property in construct);
   }
   applyTo(node: IConstruct): void {
     // Only flip explicitly-enabled protection. When undefined (the default),
     // deletion protection is already off — setting it to false would emit the
     // property in the CloudFormation template, which breaks Aurora DB instances
     // (RDS rejects DeletionProtection on cluster members).
-    if ((node as any).deletionProtection === true) {
-      (node as any).deletionProtection = false;
+    for (const property of DELETION_PROTECTION_PROPERTIES) {
+      if ((node as any)[property] === true) {
+        (node as any)[property] = false;
+      }
     }
   }
 }

package/src/common/index.ts

@@ -3,6 +3,7 @@
 
 import type { StackProps } from 'aws-cdk-lib';
 import type { Construct } from 'constructs';
+import type { BlocksDefaults } from '../cdk/blocks-defaults.js';
 import { CORE_VERSION } from '../version.js';
 import { OFFICIAL_BB_NAMES } from './official-bb-names.generated.js';
 export { OFFICIAL_BB_NAMES } from './official-bb-names.generated.js';
@@ -325,6 +326,14 @@ export function computeScopeFullId(scope: { id: string; parent?: any }) {
 export interface BlocksStackProps extends StackProps {
   backendHandlerPath: string;
   backendCDKPath: string;
+  /**
+   * Stack-wide infrastructure defaults applied to every Building Block (removal
+   * policy, deletion protection, …). Start from `BlocksPresets.sandbox` or
+   * `BlocksPresets.production` and override individual fields as needed. Any
+   * field a block also exposes as a per-block option is overridden by that
+   * option. See `BlocksDefaults` in `@aws-blocks/core/cdk`.
+   */
+  defaults: BlocksDefaults;
 }
 
 export class BlocksStack {

package/src/index.cdk.ts

@@ -8,7 +8,11 @@ export { EventSourceMapping } from './lambda-handler.js';
 export { BlocksStackProps } from './common/index.js';
 export { registerSdkIdentifiers, getSdkIdentifiers, getAllSdkIdentifiers, _resetSdkRegistry } from './common/sdk-registry.js';
 export { getConfig, getConfigSync, preloadConfig, loadConfigToProcessEnv, _resetConfigCache } from './common/config.js';
-export { BlocksStack, Scope, SandboxDisableDeletionProtection, BlocksBackend, registerConfig, finalizeConfigRegistry, synthGuard, DEFAULT_NODE_RUNTIME, type BlocksBackendProps } from './cdk/index.js';
+export { BlocksStack, Scope, SandboxDisableDeletionProtection, BlocksBackend, registerConfig, finalizeConfigRegistry, synthGuard, DEFAULT_NODE_RUNTIME, blocksNodejsBundling, type BlocksBackendProps } from './cdk/index.js';
+export {
+  type BlocksDefaults,
+  BlocksPresets,
+} from './cdk/index.js';
 export {
   Hosting,
   type HostingProps,

package/src/rpc.test.ts

@@ -97,6 +97,28 @@ describe('params decoding', () => {
   });
 });
 
+describe('-32602 Invalid Params validation', () => {
+  for (const params of ['abc', 42, true, false, null]) {
+    it(`rejects ${JSON.stringify(params)} params`, () => {
+      const result = parseRpcRequest(JSON.stringify({
+        jsonrpc: '2.0',
+        method: 'api.echo',
+        params,
+        id: 'request-1',
+      }));
+
+      assert.strictEqual(result.ok, false);
+      if (!result.ok) {
+        const response = JSON.parse(result.response);
+        assert.strictEqual(response.error.code, RpcErrorCode.InvalidParams);
+        assert.strictEqual(response.error.data.name, 'InvalidParams');
+        assert.ok(response.error.message.includes('expected an array or object'));
+        assert.strictEqual(response.id, 'request-1');
+      }
+    });
+  }
+});
+
 describe('batch requests (top-level JSON array body)', () => {
   it('rejects an array body as Invalid Request with a null id', () => {
     const result = parseRpcRequest(JSON.stringify([

package/src/rpc.ts

@@ -118,15 +118,31 @@ export function parseRpcRequest(bodyText: string): RpcParseResult {
     };
   }
 
+  const hasParams = Object.hasOwn(parsed, 'params');
+  if (hasParams && (parsed.params === null || typeof parsed.params !== 'object')) {
+    return {
+      ok: false,
+      response: errorResponse(
+        RpcErrorCode.InvalidParams,
+        'Invalid params: expected an array or object',
+        id,
+        { name: 'InvalidParams' },
+      ),
+    };
+  }
+
+  let args: unknown[] = [];
+  if (hasParams) {
+    args = Array.isArray(parsed.params) ? parsed.params : Object.values(parsed.params);
+  }
+
   return {
     ok: true,
     request: {
       apiNamespace: parsed.method.substring(0, dotIndex),
       method: parsed.method.substring(dotIndex + 1),
       // JSON-RPC 2.0 §4.2: params may be an array (positional) or object (named).
-      args: Array.isArray(parsed.params)
-        ? parsed.params
-        : Object.values(parsed.params ?? {}),
+      args,
       id,
     },
   };

package/src/scripts/telemetry.test.ts

@@ -26,6 +26,8 @@ const NO_CI_ENV: Record<string, string> = {
   TF_BUILD: '',
   BITBUCKET_BUILD_NUMBER: '',
   BUILDKITE: '',
+  RENDER: '',
+  TASKCLUSTER_ROOT_URL: '',
   AWS_BLOCKS_DISABLE_TELEMETRY: '',
 };
 

package/src/telemetry/environment.ts

@@ -29,7 +29,9 @@ export function isCI(): boolean {
     process.env.JENKINS_URL ||
     process.env.TF_BUILD ||
     process.env.BITBUCKET_BUILD_NUMBER ||
-    process.env.BUILDKITE
+    process.env.BUILDKITE ||
+    process.env.RENDER ||
+    process.env.TASKCLUSTER_ROOT_URL
   );
 }
 

package/src/telemetry/telemetry.test.ts

@@ -133,6 +133,8 @@ describe('telemetry/environment', () => {
       delete process.env.TF_BUILD;
       delete process.env.BITBUCKET_BUILD_NUMBER;
       delete process.env.BUILDKITE;
+      delete process.env.RENDER;
+      delete process.env.TASKCLUSTER_ROOT_URL;
     });
 
     it('returns false when no CI env vars set', () => {
@@ -153,6 +155,16 @@ describe('telemetry/environment', () => {
       process.env.CODEBUILD_BUILD_ID = 'build-123';
       assert.strictEqual(isCI(), true);
     });
+
+    it('returns true when RENDER is set', () => {
+      process.env.RENDER = 'true';
+      assert.strictEqual(isCI(), true);
+    });
+
+    it('returns true when TASKCLUSTER_ROOT_URL is set', () => {
+      process.env.TASKCLUSTER_ROOT_URL = 'https://tc.example.com';
+      assert.strictEqual(isCI(), true);
+    });
   });
 
   it('detectOS returns a valid platform', () => {

package/src/version.ts

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