From 6c80bab0bbfa29bc9e292bc132947567346dfb41 Mon Sep 17 00:00:00 2001 From: Marilynn Zayan Date: Fri, 15 Jan 2021 11:15:16 -0500 Subject: [PATCH 1/2] append construct name and unique id to event policy statement id --- packages/@aws-cdk/aws-events/lib/rule.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@aws-cdk/aws-events/lib/rule.ts b/packages/@aws-cdk/aws-events/lib/rule.ts index 0079954e73558..afd1304d01846 100644 --- a/packages/@aws-cdk/aws-events/lib/rule.ts +++ b/packages/@aws-cdk/aws-events/lib/rule.ts @@ -245,7 +245,7 @@ export class Rule extends Resource implements IRule { }); new CfnEventBusPolicy(eventBusPolicyStack, 'GivePermToOtherAccount', { action: 'events:PutEvents', - statementId: `Allow-account-${sourceAccount}`, + statementId: `Allow-account-${sourceAccount}-${Names.uniqueId(this)}`, principal: sourceAccount, }); } From 38578de90ececab5a32ef5d3b0f5fe5ea11150f5 Mon Sep 17 00:00:00 2001 From: Marilynn Zayan Date: Fri, 15 Jan 2021 14:20:25 -0500 Subject: [PATCH 2/2] update test rule for event bus policy --- packages/@aws-cdk/aws-events/test/test.rule.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@aws-cdk/aws-events/test/test.rule.ts b/packages/@aws-cdk/aws-events/test/test.rule.ts index 80cf91948f5fa..91c99586ed577 100644 --- a/packages/@aws-cdk/aws-events/test/test.rule.ts +++ b/packages/@aws-cdk/aws-events/test/test.rule.ts @@ -713,7 +713,7 @@ export = { const eventBusPolicyStack = app.node.findChild(`EventBusPolicy-${sourceAccount}-us-west-2-${targetAccount}`) as cdk.Stack; expect(eventBusPolicyStack).to(haveResourceLike('AWS::Events::EventBusPolicy', { 'Action': 'events:PutEvents', - 'StatementId': `Allow-account-${sourceAccount}`, + 'StatementId': `Allow-account-${sourceAccount}-${cdk.Names.uniqueId(app)}`, 'Principal': sourceAccount, }));