From bbd8899c2b74d216522c0b0187b42b93b021c4ca Mon Sep 17 00:00:00 2001
From: Chris Garvis <cgarvis@gmail.com>
Date: Thu, 17 Mar 2022 09:37:18 -0400
Subject: [PATCH 1/2] Fixes #12479, Resolves #12538

---
 packages/@aws-cdk/aws-events/lib/rule.ts       | 2 +-
 packages/@aws-cdk/aws-events/test/rule.test.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@aws-cdk/aws-events/lib/rule.ts b/packages/@aws-cdk/aws-events/lib/rule.ts
index ee9a5b60f8052..1420a87627f8b 100644
--- a/packages/@aws-cdk/aws-events/lib/rule.ts
+++ b/packages/@aws-cdk/aws-events/lib/rule.ts
@@ -397,7 +397,7 @@ export class Rule extends Resource implements IRule {
         });
         new CfnEventBusPolicy(eventBusPolicyStack, 'GivePermToOtherAccount', {
           action: 'events:PutEvents',
-          statementId: `Allow-account-${sourceAccount}`,
+          statementId: `Allow-account-${sourceAccount}-${this.node.addr}`,
           principal: sourceAccount,
         });
       }
diff --git a/packages/@aws-cdk/aws-events/test/rule.test.ts b/packages/@aws-cdk/aws-events/test/rule.test.ts
index 10bf6f3839518..7d75a5d286f32 100644
--- a/packages/@aws-cdk/aws-events/test/rule.test.ts
+++ b/packages/@aws-cdk/aws-events/test/rule.test.ts
@@ -982,7 +982,7 @@ describe('rule', () => {
       const eventBusPolicyStack = app.node.findChild(`EventBusPolicy-${sourceAccount}-us-west-2-${targetAccount}`) as cdk.Stack;
       Template.fromStack(eventBusPolicyStack).hasResourceProperties('AWS::Events::EventBusPolicy', {
         'Action': 'events:PutEvents',
-        'StatementId': `Allow-account-${sourceAccount}`,
+        'StatementId': `Allow-account-${sourceAccount}-${this.node.addr}`,
         'Principal': sourceAccount,
       });
     });

From 7905b1f73ad8e82c44b2b180d44fa4891fc9366f Mon Sep 17 00:00:00 2001
From: Chris Garvis <cgarvis@gmail.com>
Date: Thu, 17 Mar 2022 11:27:09 -0400
Subject: [PATCH 2/2] Fix test by hardcoding node.addr

---
 packages/@aws-cdk/aws-events/test/rule.test.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/@aws-cdk/aws-events/test/rule.test.ts b/packages/@aws-cdk/aws-events/test/rule.test.ts
index 7d75a5d286f32..84f7c03f81d11 100644
--- a/packages/@aws-cdk/aws-events/test/rule.test.ts
+++ b/packages/@aws-cdk/aws-events/test/rule.test.ts
@@ -901,6 +901,7 @@ describe('rule', () => {
       const app = new cdk.App();
 
       const sourceAccount = '123456789012';
+      const nodeAddr = 'c810f4680339b01edf1f157c4fd07da73469742773';
       const sourceStack = new cdk.Stack(app, 'SourceStack', {
         env: {
           account: sourceAccount,
@@ -982,7 +983,7 @@ describe('rule', () => {
       const eventBusPolicyStack = app.node.findChild(`EventBusPolicy-${sourceAccount}-us-west-2-${targetAccount}`) as cdk.Stack;
       Template.fromStack(eventBusPolicyStack).hasResourceProperties('AWS::Events::EventBusPolicy', {
         'Action': 'events:PutEvents',
-        'StatementId': `Allow-account-${sourceAccount}-${this.node.addr}`,
+        'StatementId': `Allow-account-${sourceAccount}-${nodeAddr}`,
         'Principal': sourceAccount,
       });
     });