Merge branch 'main' into 24326-addInteractiveProperties

aws · Jan 2, 2024 · 12cccc1 · 12cccc1
2 parents baa9e09 + 166967f
commit 12cccc1
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 36 deletions.
diff --git a/...eg.eventbus.js.snapshot/IntegTestEventBusStackDefaultTestDeployAssertE6DF8EA9.assets.json b/...eg.eventbus.js.snapshot/IntegTestEventBusStackDefaultTestDeployAssertE6DF8EA9.assets.json
diff --git a/...testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.assets.json b/...testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.assets.json
diff --git a/...sting/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.template.json b/...sting/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/Stack.template.json
@@ -6,7 +6,7 @@
     "Name": "StackBusAA0A1E4B"
    }
   },
-  "BusStatement1B4D0336C": {
+  "BuscdkStatement1D7D87B9D": {
    "Type": "AWS::Events::EventBusPolicy",
    "Properties": {
     "EventBusName": {
@@ -39,12 +39,12 @@
        "Arn"
       ]
      },
-     "Sid": "Statement1"
+     "Sid": "cdk-Statement1"
     },
-    "StatementId": "Statement1"
+    "StatementId": "cdk-Statement1"
    }
   },
-  "BusStatement2B5FB314B": {
+  "BuscdkStatement2341A5B58": {
    "Type": "AWS::Events::EventBusPolicy",
    "Properties": {
     "EventBusName": {
@@ -77,9 +77,9 @@
        "Arn"
       ]
      },
-     "Sid": "Statement2"
+     "Sid": "cdk-Statement2"
     },
-    "StatementId": "Statement2"
+    "StatementId": "cdk-Statement2"
    }
   }
  },

diff --git a/.../@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/cdk.out b/.../@aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/cdk.out
diff --git a/...ws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/integ.json b/...ws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/integ.json
diff --git a/...cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/manifest.json b/...cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/manifest.json
diff --git a/...aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/tree.json b/...aws-cdk-testing/framework-integ/test/aws-events/test/integ.eventbus.js.snapshot/tree.json
diff --git a/packages/aws-cdk-lib/aws-events/lib/event-bus.ts b/packages/aws-cdk-lib/aws-events/lib/event-bus.ts
@@ -341,10 +341,13 @@ export class EventBus extends EventBusBase {
       throw new Error('Event Bus policy statements must have a sid');
     }
 
-    const policy = new EventBusPolicy(this, statement.sid, {
+    // In order to generate new statementIDs for the change in https://github.com/aws/aws-cdk/pull/27340
+    const statementId = `cdk-${statement.sid}`.slice(0, 64);
+    statement.sid = statementId;
+    const policy = new EventBusPolicy(this, statementId, {
       eventBus: this,
       statement: statement.toJSON(),
-      statementId: statement.sid,
+      statementId,
     });
 
     return { statementAdded: true, policyDependable: policy };

diff --git a/packages/aws-cdk-lib/aws-events/test/event-bus.test.ts b/packages/aws-cdk-lib/aws-events/test/event-bus.test.ts
@@ -548,7 +548,7 @@ describe('event bus', () => {
 
     // THEN
     Template.fromStack(stack).hasResourceProperties('AWS::Events::EventBusPolicy', {
-      StatementId: '123',
+      StatementId: 'cdk-123',
       EventBusName: {
         Ref: 'BusEA82B648',
       },
@@ -569,7 +569,7 @@ describe('event bus', () => {
             ],
           },
         },
-        Sid: '123',
+        Sid: 'cdk-123',
         Resource: {
           'Fn::GetAtt': [
             'BusEA82B648',