@aws-blocks/core 0.1.17 → 0.1.18

package/dist/cdk/blocks-backend.d.ts

@@ -1,5 +1,6 @@
 import * as cdk from 'aws-cdk-lib';
 import * as apigateway from 'aws-cdk-lib/aws-apigateway';
+import * as iam from 'aws-cdk-lib/aws-iam';
 import { Construct } from 'constructs';
 /**
  * Validate that the Node.js process was started with `--conditions=cdk`.
@@ -19,6 +20,7 @@ export declare function setupBlocksInfra(scope: Construct, props: BlocksBackendP
     handler: cdk.aws_lambda_nodejs.NodejsFunction;
     gateway: cdk.aws_apigateway.RestApi;
     apiUrl: string;
+    executionRole: cdk.aws_iam.Role;
 };
 /**
  * Standalone CDK construct that provisions the Blocks backend: a single Lambda
@@ -42,6 +44,8 @@ export declare class BlocksBackend extends Construct {
     readonly gateway: apigateway.RestApi;
     readonly handler: cdk.aws_lambda_nodejs.NodejsFunction;
     readonly backendHandlerPath: string;
+    /** Shared IAM role assumed by all Blocks compute. Building Blocks grant to this role. */
+    readonly executionRole: iam.IRole;
     /**
      * The fullId used by child Scopes to compute their env var names,
      * construct IDs, and physical resource names (e.g., DynamoDB table names).

package/dist/cdk/blocks-backend.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blocks-backend.d.ts","sourceRoot":"","sources":["../../src/cdk/blocks-backend.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AAEnC,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAEzD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAQvC;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,IAAI,IAAI,CAkB/C;AAED,MAAM,WAAW,kBAAkB;IACjC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,4EAA4E;AAC5E,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,kBAAkB,EAAE,EAAE,CAAC,EAAE,MAAM;;;;EA0GxF;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,aAAc,SAAQ,SAAS;IAC1C,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,SAAgB,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC;IAC5C,SAAgB,OAAO,EAAE,GAAG,CAAC,iBAAiB,CAAC,cAAc,CAAC;IAC9D,SAAgB,kBAAkB,EAAE,MAAM,CAAC;IAE3C;;;;;;;;;;;;;;;;;;OAkBG;IACH,IAAI,MAAM,IAAI,MAAM,CAUnB;IAED,OAAO;WAmBM,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB;CAsB5E"}
+{"version":3,"file":"blocks-backend.d.ts","sourceRoot":"","sources":["../../src/cdk/blocks-backend.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AAEnC,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAE3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAQvC;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,IAAI,IAAI,CAkB/C;AAED,MAAM,WAAW,kBAAkB;IACjC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,4EAA4E;AAC5E,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,kBAAkB,EAAE,EAAE,CAAC,EAAE,MAAM;;;;;EA6HxF;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,aAAc,SAAQ,SAAS;IAC1C,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,SAAgB,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC;IAC5C,SAAgB,OAAO,EAAE,GAAG,CAAC,iBAAiB,CAAC,cAAc,CAAC;IAC9D,SAAgB,kBAAkB,EAAE,MAAM,CAAC;IAC3C,yFAAyF;IACzF,SAAgB,aAAa,EAAE,GAAG,CAAC,KAAK,CAAC;IAEzC;;;;;;;;;;;;;;;;;;OAkBG;IACH,IAAI,MAAM,IAAI,MAAM,CAUnB;IAED,OAAO;WAoBM,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB;CAsB5E"}

package/dist/cdk/blocks-backend.js

@@ -3,6 +3,7 @@
 import * as cdk from 'aws-cdk-lib';
 import * as lambda from 'aws-cdk-lib/aws-lambda-nodejs';
 import * as apigateway from 'aws-cdk-lib/aws-apigateway';
+import * as iam from 'aws-cdk-lib/aws-iam';
 import { CfnGroup } from 'aws-cdk-lib/aws-resourcegroups';
 import { Construct } from 'constructs';
 import { pathToFileURL } from 'node:url';
@@ -35,10 +36,28 @@ export function assertCdkConditionActive() {
 }
 /** Shared infra setup — creates Lambda + API Gateway on the given scope. */
 export function setupBlocksInfra(scope, props, id) {
+    // ── Shared execution role ──────────────────────────────────────────────
+    // A single IAM role that every Building Block grants to. Provisioned here so
+    // it exists before the backend module is imported (Building Blocks reach it
+    // via `scope.executionRole`). Block grants sit on the role's default (inline)
+    // policy, exactly as they did on the auto-generated NodejsFunction role.
+    //
+    // AWSLambdaBasicExecutionRole is attached explicitly because the auto-role
+    // included it by default — omitting it would silently break CloudWatch Logs.
+    const executionRole = new iam.Role(scope, 'BlocksRole', {
+        // CompositePrincipal (rather than a bare ServicePrincipal) so additional
+        // compute types can assume this same shared role as they are introduced
+        // (e.g. ECS tasks via ecs-tasks.amazonaws.com), by adding principals here.
+        assumedBy: new iam.CompositePrincipal(new iam.ServicePrincipal('lambda.amazonaws.com')),
+        managedPolicies: [
+            iam.ManagedPolicy.fromAwsManagedPolicyName('service-role/AWSLambdaBasicExecutionRole'),
+        ],
+    });
     const handler = new lambda.NodejsFunction(scope, 'Handler', {
         entry: props.backendHandlerPath,
         runtime: DEFAULT_NODE_RUNTIME,
         handler: 'handler',
+        role: executionRole,
         memorySize: 2048,
         timeout: cdk.Duration.seconds(60 * 15),
         environment: {
@@ -126,7 +145,7 @@ export function setupBlocksInfra(scope, props, id) {
     registerConfig(scope, 'BB_RESOURCES_GROUP_URL', resourcesUrl);
     registerConfig(scope, 'BB_SETTINGS_GROUP_URL', settingsUrl);
     registerBuiltinRoutes();
-    return { handler, gateway: api, apiUrl: `${api.url}${BLOCKS_RPC_PREFIX.slice(1)}` };
+    return { handler, gateway: api, apiUrl: `${api.url}${BLOCKS_RPC_PREFIX.slice(1)}`, executionRole };
 }
 /**
  * Standalone CDK construct that provisions the Blocks backend: a single Lambda
@@ -150,6 +169,8 @@ export class BlocksBackend extends Construct {
     gateway;
     handler;
     backendHandlerPath;
+    /** Shared IAM role assumed by all Blocks compute. Building Blocks grant to this role. */
+    executionRole;
     /**
      * The fullId used by child Scopes to compute their env var names,
      * construct IDs, and physical resource names (e.g., DynamoDB table names).
@@ -189,6 +210,7 @@ export class BlocksBackend extends Construct {
         this.handler = infra.handler;
         this.gateway = infra.gateway;
         this.apiUrl = infra.apiUrl;
+        this.executionRole = infra.executionRole;
         // Override BLOCKS_STACK_NAME to include the parent stack name so runtime
         // resource lookups (DynamoDB table names) match the CDK-time fullId
         // and are unique per deployment.

package/dist/cdk/blocks-backend.test.js

@@ -5,8 +5,10 @@ import assert from 'node:assert';
 import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'node:path';
 import * as cdk from 'aws-cdk-lib';
-import { Template } from 'aws-cdk-lib/assertions';
+import { Template, Match } from 'aws-cdk-lib/assertions';
+import { PolicyStatement } from 'aws-cdk-lib/aws-iam';
 import { BlocksBackend } from './blocks-backend.js';
+import { Scope } from './index.js';
 // Simulate the CDK condition being active (tests import CDK files directly)
 before(() => {
     process.env.NODE_OPTIONS = (process.env.NODE_OPTIONS ?? '') + ' --conditions=cdk';
@@ -16,6 +18,7 @@ const handlerPath = join(__dirname, '__fixtures__', 'handler.js');
 const sideEffectBackendPath = join(__dirname, '__fixtures__', 'side-effect-backend.js');
 const factoryBackendPath = join(__dirname, '__fixtures__', 'factory-backend.js');
 const fullIdConstructBackendPath = join(__dirname, '__fixtures__', 'fullid-construct-backend.js');
+const EXECUTION_ROLE_MARKER_ACTION = 'blocks-test:MarkerAction';
 describe('ESM cache-busting (multi-stage)', () => {
     test('BlocksBackend.create() with same backendCDKPath but different IDs produces constructs in each', async () => {
         const app = new cdk.App();
@@ -66,6 +69,73 @@ describe('synth shape (drop into existing stack)', () => {
         template.resourceCountIs('AWS::ApiGateway::RestApi', 2);
     });
 });
+describe('shared execution role', () => {
+    test('exposes executionRole on the backend', async () => {
+        const app = new cdk.App();
+        const parent = new cdk.Stack(app, 'RoleSurfaceStack');
+        const backend = await BlocksBackend.create(parent, 'Blocks', {
+            backendHandlerPath: handlerPath,
+            backendCDKPath: sideEffectBackendPath,
+        });
+        assert.ok(backend.executionRole, 'BlocksBackend should expose .executionRole');
+    });
+    test('synth produces a Lambda-assumable role with basic execution, and the handler uses it', async () => {
+        const app = new cdk.App();
+        const parent = new cdk.Stack(app, 'RoleSynthStack');
+        await BlocksBackend.create(parent, 'Blocks', {
+            backendHandlerPath: handlerPath,
+            backendCDKPath: sideEffectBackendPath,
+        });
+        const template = Template.fromStack(parent);
+        // The shared role (logical id derived from the 'BlocksRole' construct id)
+        // is assumable by Lambda and carries AWSLambdaBasicExecutionRole (so
+        // CloudWatch Logs keep working after swapping off the auto-role). Other
+        // roles exist (API Gateway CloudWatch role, config BucketDeployment role),
+        // so we target ours by logical id.
+        const roles = template.findResources('AWS::IAM::Role');
+        const blocksRoleId = Object.keys(roles).find(k => k.includes('BlocksRole'));
+        assert.ok(blocksRoleId, 'expected a role from the BlocksRole construct');
+        const blocksRole = roles[blocksRoleId];
+        assert.deepStrictEqual(blocksRole.Properties.AssumeRolePolicyDocument.Statement[0], {
+            Action: 'sts:AssumeRole',
+            Effect: 'Allow',
+            Principal: { Service: 'lambda.amazonaws.com' },
+        });
+        assert.ok(JSON.stringify(blocksRole.Properties.ManagedPolicyArns ?? []).includes('AWSLambdaBasicExecutionRole'), 'BlocksRole should attach AWSLambdaBasicExecutionRole');
+        // The Blocks handler references the shared role, not an auto-generated one.
+        template.hasResourceProperties('AWS::Lambda::Function', {
+            Role: { 'Fn::GetAtt': [blocksRoleId, 'Arn'] },
+        });
+    });
+    test('a nested block resolves executionRole via the construct-tree walk', async () => {
+        const app = new cdk.App();
+        const parent = new cdk.Stack(app, 'RoleResolveStack');
+        const backend = await BlocksBackend.create(parent, 'Blocks', {
+            backendHandlerPath: handlerPath,
+            backendCDKPath: sideEffectBackendPath,
+        });
+        // Build nested Scopes under the backend (outer → inner), the same shape a
+        // real Building Block tree has, and grant a uniquely-named marker action to
+        // `this.executionRole` from the innermost scope. If the getter's tree-walk
+        // failed, it would resolve the wrong role (or throw), and the marker would
+        // not land on the backend's shared role.
+        // `create()` sets globalThis.CURRENT_BLOCKS_STACK = backend, so a parent-less
+        // Scope attaches under the backend (the same way a real backend module's
+        // top-level blocks do); `inner` is then nested one level deeper.
+        const outer = new Scope('outer');
+        const inner = new Scope('inner', { parent: outer });
+        // Resolves to the backend's shared role from two levels deep.
+        assert.strictEqual(inner.executionRole, backend.executionRole);
+        inner.executionRole.addToPrincipalPolicy(new PolicyStatement({ actions: [EXECUTION_ROLE_MARKER_ACTION], resources: ['*'] }));
+        // The grant lands on the shared role's default inline policy (AWS::IAM::Policy).
+        const template = Template.fromStack(parent);
+        template.hasResourceProperties('AWS::IAM::Policy', {
+            PolicyDocument: {
+                Statement: Match.arrayWith([Match.objectLike({ Action: EXECUTION_ROLE_MARKER_ACTION })]),
+            },
+        });
+    });
+});
 describe('factory function support', () => {
     test('BlocksBackend.create() calls default export function with the backend instance', async () => {
         const app = new cdk.App();

package/dist/cdk/blocks-stack.test.js

@@ -6,7 +6,7 @@ import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'node:path';
 import * as cdk from 'aws-cdk-lib';
 import { BlocksBackend } from './blocks-backend.js';
-import { BlocksStack } from './index.js';
+import { BlocksStack, Scope } from './index.js';
 // Simulate the CDK condition being active (tests import CDK files directly)
 before(() => {
     process.env.NODE_OPTIONS = (process.env.NODE_OPTIONS ?? '') + ' --conditions=cdk';
@@ -54,6 +54,37 @@ describe('legacy side-effect mode (no default export)', () => {
         assert.ok(marker, 'Side-effect-only module should register construct via globalThis.CURRENT_BLOCKS_STACK');
     });
 });
+describe('shared execution role (BlocksStack)', () => {
+    // The role synth shape and the Scope.executionRole tree-walk are shared code
+    // (setupBlocksInfra + the getter), covered in blocks-backend.test.ts. The only
+    // BlocksStack-specific behavior is that its own constructor wires
+    // executionRole — a separate code path from BlocksBackend's constructor.
+    test('BlocksStack wires executionRole via its constructor', async () => {
+        const app = new cdk.App();
+        const stack = await BlocksStack.create(app, 'StackRoleStack', {
+            backendHandlerPath: handlerPath,
+            backendCDKPath: sideEffectBackendPath,
+        });
+        assert.ok(stack.executionRole, 'BlocksStack should expose a populated .executionRole');
+    });
+});
+describe('executionRole globalThis fallback', () => {
+    test('resolves via globalThis.CURRENT_BLOCKS_STACK when no owner is in the tree', async () => {
+        const app = new cdk.App();
+        const stack = await BlocksStack.create(app, 'FallbackStack', {
+            backendHandlerPath: handlerPath,
+            backendCDKPath: sideEffectBackendPath,
+        });
+        // A Scope whose construct-tree ancestry has no BlocksStack/BlocksBackend
+        // (parented under a plain cdk.Stack) exhausts the tree-walk and falls back
+        // to globalThis.CURRENT_BLOCKS_STACK. The `as any` is test plumbing — a
+        // plain Stack isn't a ScopeParent, but it IS a valid Construct parent.
+        const plainStack = new cdk.Stack(app, 'PlainStack');
+        globalThis.CURRENT_BLOCKS_STACK = stack;
+        const orphan = new Scope('orphan', { parent: plainStack });
+        assert.strictEqual(orphan.executionRole, stack.executionRole, 'fallback resolves to the ambient stack role');
+    });
+});
 describe('assertCdkConditionActive', () => {
     test('BlocksStack.create() throws when --conditions=cdk is missing', async () => {
         const origNodeOptions = process.env.NODE_OPTIONS;

package/dist/cdk/index.d.ts

@@ -14,6 +14,8 @@ export declare class BlocksStack extends cdk.Stack implements BaseBlocksStack {
     readonly gateway: cdk.aws_apigateway.RestApi;
     readonly handler: cdk.aws_lambda_nodejs.NodejsFunction;
     readonly backendHandlerPath: string;
+    /** Shared IAM role assumed by all Blocks compute. Building Blocks grant to this role. */
+    readonly executionRole: cdk.aws_iam.IRole;
     private constructor();
     static create(scope: Construct, id: string, props: BlocksStackProps): Promise<BlocksStack>;
 }
@@ -24,6 +26,17 @@ export declare class Scope extends Construct {
     readonly bbVersion?: string;
     constructor(id: string, options?: ScopeOptions);
     get handler(): cdk.aws_lambda_nodejs.NodejsFunction;
+    /**
+     * The shared IAM role assumed by all Blocks compute. Building Blocks grant
+     * their permissions to this role instead of to an individual function's
+     * auto-role. CDK's `grant*()` / `addToPrincipalPolicy()` route those grants
+     * to the role's default (inline) policy — exactly where they landed on the
+     * auto-generated role before.
+     *
+     * Resolves the same way as {@link handler}: walk up to the owning
+     * BlocksStack/BlocksBackend, falling back to the ambient stack.
+     */
+    get executionRole(): cdk.aws_iam.IRole;
     get fullId(): string;
     protected buildUserAgentChain(): [string, string][];
     registerClientMiddleware(_packageSpecifier: string): void;

package/dist/cdk/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cdk/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,IAAI,eAAe,EACnC,KAAK,WAAW,EAChB,KAAK,YAAY,EAElB,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAAE,aAAa,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,gCAAgC,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,YAAY,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAE7F,qBAAa,WAAY,SAAQ,GAAG,CAAC,KAAM,YAAW,eAAe;IACnE,SAAgB,EAAE,EAAE,MAAM,CAAC;IAC3B,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,SAAgB,OAAO,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC;IACpD,SAAgB,OAAO,EAAE,GAAG,CAAC,iBAAiB,CAAC,cAAc,CAAC;IAC9D,SAAgB,kBAAkB,EAAE,MAAM,CAAC;IAE3C,OAAO;WAcM,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB;CA6B1E;AAED,qBAAa,KAAM,SAAQ,SAAS;IAClC,SAAgB,EAAE,EAAE,MAAM,CAAC;IAC3B,SAAgB,MAAM,EAAE,WAAW,CAAC;IAEpC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;gBAEhB,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY;IAO9C,IAAI,OAAO,yCAWV;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,SAAS,CAAC,mBAAmB,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;IAKnD,wBAAwB,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI;IACzD,qBAAqB,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI;IACtD,0BAA0B,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IACrH,IAAI,gBAAgB,IAAI,SAAS,MAAM,EAAE,CAAe;IACxD,IAAI,cAAc,IAAI,SAAS,MAAM,EAAE,CAAe;CACvD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cdk/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,IAAI,eAAe,EACnC,KAAK,WAAW,EAChB,KAAK,YAAY,EAElB,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAAE,aAAa,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,gCAAgC,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,YAAY,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAE7F,qBAAa,WAAY,SAAQ,GAAG,CAAC,KAAM,YAAW,eAAe;IACnE,SAAgB,EAAE,EAAE,MAAM,CAAC;IAC3B,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,SAAgB,OAAO,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC;IACpD,SAAgB,OAAO,EAAE,GAAG,CAAC,iBAAiB,CAAC,cAAc,CAAC;IAC9D,SAAgB,kBAAkB,EAAE,MAAM,CAAC;IAC3C,yFAAyF;IACzF,SAAgB,aAAa,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC;IAEjD,OAAO;WAeM,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB;CA6B1E;AAED,qBAAa,KAAM,SAAQ,SAAS;IAClC,SAAgB,EAAE,EAAE,MAAM,CAAC;IAC3B,SAAgB,MAAM,EAAE,WAAW,CAAC;IAEpC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;gBAEhB,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY;IAO9C,IAAI,OAAO,yCAWV;IAED;;;;;;;;;OASG;IACH,IAAI,aAAa,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,CAUrC;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,SAAS,CAAC,mBAAmB,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;IAKnD,wBAAwB,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI;IACzD,qBAAqB,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI;IACtD,0BAA0B,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IACrH,IAAI,gBAAgB,IAAI,SAAS,MAAM,EAAE,CAAe;IACxD,IAAI,cAAc,IAAI,SAAS,MAAM,EAAE,CAAe;CACvD"}

package/dist/cdk/index.js

@@ -20,6 +20,8 @@ export class BlocksStack extends cdk.Stack {
     gateway;
     handler;
     backendHandlerPath;
+    /** Shared IAM role assumed by all Blocks compute. Building Blocks grant to this role. */
+    executionRole;
     constructor(scope, id, props) {
         super(scope, id, props);
         this.id = id;
@@ -30,6 +32,7 @@ export class BlocksStack extends cdk.Stack {
         this.handler = infra.handler;
         this.gateway = infra.gateway;
         this.apiUrl = infra.apiUrl;
+        this.executionRole = infra.executionRole;
     }
     static async create(scope, id, props) {
         assertCdkConditionActive();
@@ -80,6 +83,27 @@ export class Scope extends Construct {
         // Fallback to globalThis for backward compatibility
         return globalThis.CURRENT_BLOCKS_STACK.handler;
     }
+    /**
+     * The shared IAM role assumed by all Blocks compute. Building Blocks grant
+     * their permissions to this role instead of to an individual function's
+     * auto-role. CDK's `grant*()` / `addToPrincipalPolicy()` route those grants
+     * to the role's default (inline) policy — exactly where they landed on the
+     * auto-generated role before.
+     *
+     * Resolves the same way as {@link handler}: walk up to the owning
+     * BlocksStack/BlocksBackend, falling back to the ambient stack.
+     */
+    get executionRole() {
+        let current = this;
+        while (current.node.scope) {
+            current = current.node.scope;
+            if (current instanceof BlocksStack || current instanceof BlocksBackend) {
+                return current.executionRole;
+            }
+        }
+        // Fallback to globalThis for backward compatibility
+        return globalThis.CURRENT_BLOCKS_STACK.executionRole;
+    }
     get fullId() {
         return computeScopeFullId(this);
     }

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const CORE_VERSION = "0.1.17";
+export declare const CORE_VERSION = "0.1.18";
 //# 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.1.17';
+export const CORE_VERSION = '0.1.18';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-blocks/core",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/aws-devtools-labs/aws-blocks.git",

package/src/cdk/blocks-backend.test.ts

@@ -6,8 +6,10 @@ import assert from 'node:assert';
 import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'node:path';
 import * as cdk from 'aws-cdk-lib';
-import { Template } from 'aws-cdk-lib/assertions';
+import { Template, Match } from 'aws-cdk-lib/assertions';
+import { PolicyStatement } from 'aws-cdk-lib/aws-iam';
 import { BlocksBackend } from './blocks-backend.js';
+import { Scope } from './index.js';
 
 // Simulate the CDK condition being active (tests import CDK files directly)
 before(() => {
@@ -19,6 +21,7 @@ const handlerPath = join(__dirname, '__fixtures__', 'handler.js');
 const sideEffectBackendPath = join(__dirname, '__fixtures__', 'side-effect-backend.js');
 const factoryBackendPath = join(__dirname, '__fixtures__', 'factory-backend.js');
 const fullIdConstructBackendPath = join(__dirname, '__fixtures__', 'fullid-construct-backend.js');
+const EXECUTION_ROLE_MARKER_ACTION = 'blocks-test:MarkerAction';
 
 describe('ESM cache-busting (multi-stage)', () => {
   test('BlocksBackend.create() with same backendCDKPath but different IDs produces constructs in each', async () => {
@@ -89,6 +92,92 @@ describe('synth shape (drop into existing stack)', () => {
   });
 });
 
+describe('shared execution role', () => {
+  test('exposes executionRole on the backend', async () => {
+    const app = new cdk.App();
+    const parent = new cdk.Stack(app, 'RoleSurfaceStack');
+
+    const backend = await BlocksBackend.create(parent, 'Blocks', {
+      backendHandlerPath: handlerPath,
+      backendCDKPath: sideEffectBackendPath,
+    });
+
+    assert.ok(backend.executionRole, 'BlocksBackend should expose .executionRole');
+  });
+
+  test('synth produces a Lambda-assumable role with basic execution, and the handler uses it', async () => {
+    const app = new cdk.App();
+    const parent = new cdk.Stack(app, 'RoleSynthStack');
+
+    await BlocksBackend.create(parent, 'Blocks', {
+      backendHandlerPath: handlerPath,
+      backendCDKPath: sideEffectBackendPath,
+    });
+
+    const template = Template.fromStack(parent);
+
+    // The shared role (logical id derived from the 'BlocksRole' construct id)
+    // is assumable by Lambda and carries AWSLambdaBasicExecutionRole (so
+    // CloudWatch Logs keep working after swapping off the auto-role). Other
+    // roles exist (API Gateway CloudWatch role, config BucketDeployment role),
+    // so we target ours by logical id.
+    const roles = template.findResources('AWS::IAM::Role');
+    const blocksRoleId = Object.keys(roles).find(k => k.includes('BlocksRole'));
+    assert.ok(blocksRoleId, 'expected a role from the BlocksRole construct');
+    const blocksRole = roles[blocksRoleId];
+    assert.deepStrictEqual(blocksRole.Properties.AssumeRolePolicyDocument.Statement[0], {
+      Action: 'sts:AssumeRole',
+      Effect: 'Allow',
+      Principal: { Service: 'lambda.amazonaws.com' },
+    });
+    assert.ok(
+      JSON.stringify(blocksRole.Properties.ManagedPolicyArns ?? []).includes('AWSLambdaBasicExecutionRole'),
+      'BlocksRole should attach AWSLambdaBasicExecutionRole',
+    );
+
+    // The Blocks handler references the shared role, not an auto-generated one.
+    template.hasResourceProperties('AWS::Lambda::Function', {
+      Role: { 'Fn::GetAtt': [blocksRoleId, 'Arn'] },
+    });
+  });
+
+  test('a nested block resolves executionRole via the construct-tree walk', async () => {
+    const app = new cdk.App();
+    const parent = new cdk.Stack(app, 'RoleResolveStack');
+
+    const backend = await BlocksBackend.create(parent, 'Blocks', {
+      backendHandlerPath: handlerPath,
+      backendCDKPath: sideEffectBackendPath,
+    });
+
+    // Build nested Scopes under the backend (outer → inner), the same shape a
+    // real Building Block tree has, and grant a uniquely-named marker action to
+    // `this.executionRole` from the innermost scope. If the getter's tree-walk
+    // failed, it would resolve the wrong role (or throw), and the marker would
+    // not land on the backend's shared role.
+    // `create()` sets globalThis.CURRENT_BLOCKS_STACK = backend, so a parent-less
+    // Scope attaches under the backend (the same way a real backend module's
+    // top-level blocks do); `inner` is then nested one level deeper.
+    const outer = new Scope('outer');
+    const inner = new Scope('inner', { parent: outer });
+
+    // Resolves to the backend's shared role from two levels deep.
+    assert.strictEqual(inner.executionRole, backend.executionRole);
+
+    inner.executionRole.addToPrincipalPolicy(
+      new PolicyStatement({ actions: [EXECUTION_ROLE_MARKER_ACTION], resources: ['*'] }),
+    );
+
+    // The grant lands on the shared role's default inline policy (AWS::IAM::Policy).
+    const template = Template.fromStack(parent);
+    template.hasResourceProperties('AWS::IAM::Policy', {
+      PolicyDocument: {
+        Statement: Match.arrayWith([Match.objectLike({ Action: EXECUTION_ROLE_MARKER_ACTION })]),
+      },
+    });
+  });
+});
+
 describe('factory function support', () => {
   test('BlocksBackend.create() calls default export function with the backend instance', async () => {
     const app = new cdk.App();

package/src/cdk/blocks-backend.ts

@@ -4,6 +4,7 @@
 import * as cdk from 'aws-cdk-lib';
 import * as lambda from 'aws-cdk-lib/aws-lambda-nodejs';
 import * as apigateway from 'aws-cdk-lib/aws-apigateway';
+import * as iam from 'aws-cdk-lib/aws-iam';
 import { CfnGroup } from 'aws-cdk-lib/aws-resourcegroups';
 import { Construct } from 'constructs';
 import { pathToFileURL } from 'node:url';
@@ -48,10 +49,29 @@ export interface BlocksBackendProps {
 
 /** Shared infra setup — creates Lambda + API Gateway on the given scope. */
 export function setupBlocksInfra(scope: Construct, props: BlocksBackendProps, id?: string) {
+  // ── Shared execution role ──────────────────────────────────────────────
+  // A single IAM role that every Building Block grants to. Provisioned here so
+  // it exists before the backend module is imported (Building Blocks reach it
+  // via `scope.executionRole`). Block grants sit on the role's default (inline)
+  // policy, exactly as they did on the auto-generated NodejsFunction role.
+  //
+  // AWSLambdaBasicExecutionRole is attached explicitly because the auto-role
+  // included it by default — omitting it would silently break CloudWatch Logs.
+  const executionRole = new iam.Role(scope, 'BlocksRole', {
+    // CompositePrincipal (rather than a bare ServicePrincipal) so additional
+    // compute types can assume this same shared role as they are introduced
+    // (e.g. ECS tasks via ecs-tasks.amazonaws.com), by adding principals here.
+    assumedBy: new iam.CompositePrincipal(new iam.ServicePrincipal('lambda.amazonaws.com')),
+    managedPolicies: [
+      iam.ManagedPolicy.fromAwsManagedPolicyName('service-role/AWSLambdaBasicExecutionRole'),
+    ],
+  });
+
   const handler = new lambda.NodejsFunction(scope, 'Handler', {
     entry: props.backendHandlerPath,
     runtime: DEFAULT_NODE_RUNTIME,
     handler: 'handler',
+    role: executionRole,
     memorySize: 2048,
     timeout: cdk.Duration.seconds(60 * 15),
     environment: {
@@ -152,7 +172,7 @@ export function setupBlocksInfra(scope: Construct, props: BlocksBackendProps, id
 
   registerBuiltinRoutes();
 
-  return { handler, gateway: api, apiUrl: `${api.url}${BLOCKS_RPC_PREFIX.slice(1)}` };
+  return { handler, gateway: api, apiUrl: `${api.url}${BLOCKS_RPC_PREFIX.slice(1)}`, executionRole };
 }
 
 /**
@@ -177,6 +197,8 @@ export class BlocksBackend extends Construct {
   public readonly gateway: apigateway.RestApi;
   public readonly handler: cdk.aws_lambda_nodejs.NodejsFunction;
   public readonly backendHandlerPath: string;
+  /** Shared IAM role assumed by all Blocks compute. Building Blocks grant to this role. */
+  public readonly executionRole: iam.IRole;
 
   /**
    * The fullId used by child Scopes to compute their env var names,
@@ -221,6 +243,7 @@ export class BlocksBackend extends Construct {
     this.handler = infra.handler;
     this.gateway = infra.gateway;
     this.apiUrl = infra.apiUrl;
+    this.executionRole = infra.executionRole;
 
     // Override BLOCKS_STACK_NAME to include the parent stack name so runtime
     // resource lookups (DynamoDB table names) match the CDK-time fullId

package/src/cdk/blocks-stack.test.ts

@@ -7,7 +7,7 @@ import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'node:path';
 import * as cdk from 'aws-cdk-lib';
 import { BlocksBackend } from './blocks-backend.js';
-import { BlocksStack } from './index.js';
+import { BlocksStack, Scope } from './index.js';
 
 // Simulate the CDK condition being active (tests import CDK files directly)
 before(() => {
@@ -78,6 +78,46 @@ describe('legacy side-effect mode (no default export)', () => {
   });
 });
 
+describe('shared execution role (BlocksStack)', () => {
+  // The role synth shape and the Scope.executionRole tree-walk are shared code
+  // (setupBlocksInfra + the getter), covered in blocks-backend.test.ts. The only
+  // BlocksStack-specific behavior is that its own constructor wires
+  // executionRole — a separate code path from BlocksBackend's constructor.
+  test('BlocksStack wires executionRole via its constructor', async () => {
+    const app = new cdk.App();
+    const stack = await BlocksStack.create(app, 'StackRoleStack', {
+      backendHandlerPath: handlerPath,
+      backendCDKPath: sideEffectBackendPath,
+    });
+
+    assert.ok(stack.executionRole, 'BlocksStack should expose a populated .executionRole');
+  });
+});
+
+describe('executionRole globalThis fallback', () => {
+  test('resolves via globalThis.CURRENT_BLOCKS_STACK when no owner is in the tree', async () => {
+    const app = new cdk.App();
+    const stack = await BlocksStack.create(app, 'FallbackStack', {
+      backendHandlerPath: handlerPath,
+      backendCDKPath: sideEffectBackendPath,
+    });
+
+    // A Scope whose construct-tree ancestry has no BlocksStack/BlocksBackend
+    // (parented under a plain cdk.Stack) exhausts the tree-walk and falls back
+    // to globalThis.CURRENT_BLOCKS_STACK. The `as any` is test plumbing — a
+    // plain Stack isn't a ScopeParent, but it IS a valid Construct parent.
+    const plainStack = new cdk.Stack(app, 'PlainStack');
+    (globalThis as any).CURRENT_BLOCKS_STACK = stack;
+    const orphan = new Scope('orphan', { parent: plainStack as any });
+
+    assert.strictEqual(
+      orphan.executionRole,
+      stack.executionRole,
+      'fallback resolves to the ambient stack role',
+    );
+  });
+});
+
 describe('assertCdkConditionActive', () => {
   test('BlocksStack.create() throws when --conditions=cdk is missing', async () => {
     const origNodeOptions = process.env.NODE_OPTIONS;

package/src/cdk/index.ts

@@ -30,6 +30,8 @@ export class BlocksStack extends cdk.Stack implements BaseBlocksStack {
   public readonly gateway: cdk.aws_apigateway.RestApi;
   public readonly handler: cdk.aws_lambda_nodejs.NodejsFunction;
   public readonly backendHandlerPath: string;
+  /** Shared IAM role assumed by all Blocks compute. Building Blocks grant to this role. */
+  public readonly executionRole: cdk.aws_iam.IRole;
 
   private constructor(scope: Construct, id: string, props: BlocksStackProps) {
     super(scope, id, props);
@@ -43,6 +45,7 @@ export class BlocksStack extends cdk.Stack implements BaseBlocksStack {
     this.handler = infra.handler;
     this.gateway = infra.gateway;
     this.apiUrl = infra.apiUrl;
+    this.executionRole = infra.executionRole;
   }
 
   static async create(scope: Construct, id: string, props: BlocksStackProps) {
@@ -103,6 +106,28 @@ export class Scope extends Construct {
     return ((globalThis as any).CURRENT_BLOCKS_STACK as { handler: cdk.aws_lambda_nodejs.NodejsFunction }).handler;
   }
 
+  /**
+   * The shared IAM role assumed by all Blocks compute. Building Blocks grant
+   * their permissions to this role instead of to an individual function's
+   * auto-role. CDK's `grant*()` / `addToPrincipalPolicy()` route those grants
+   * to the role's default (inline) policy — exactly where they landed on the
+   * auto-generated role before.
+   *
+   * Resolves the same way as {@link handler}: walk up to the owning
+   * BlocksStack/BlocksBackend, falling back to the ambient stack.
+   */
+  get executionRole(): cdk.aws_iam.IRole {
+    let current: Construct = this;
+    while (current.node.scope) {
+        current = current.node.scope as Construct;
+        if (current instanceof BlocksStack || current instanceof BlocksBackend) {
+            return current.executionRole;
+        }
+    }
+    // Fallback to globalThis for backward compatibility
+    return ((globalThis as any).CURRENT_BLOCKS_STACK as { executionRole: cdk.aws_iam.IRole }).executionRole;
+  }
+
   get fullId(): string {
     return computeScopeFullId(this);
   }

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.1.18';