Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(aws-events): restrict eventbus statementId to 64 characters #22296

Merged
merged 8 commits into from Oct 29, 2022
Merged

fix(aws-events): restrict eventbus statementId to 64 characters #22296

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
94dd3d9
update rule to use concat
sennyeya Sep 29, 2022
930b981
use trimmed node address
sennyeya Oct 4, 2022
336d5ed
Merge branch 'main' into UpdateEventBusStatementId
mergify[bot] Oct 5, 2022
381248d
add integ test
sennyeya Oct 19, 2022
d87faaf
add updates to integ test
sennyeya Oct 19, 2022
8e9f416
update integ test to use default cross account.
sennyeya Oct 26, 2022
85795e5
Merge branch 'main' into UpdateEventBusStatementId
TheRealAmazonKendra Oct 28, 2022
f4c56e2
Merge branch 'main' into UpdateEventBusStatementId
mergify[bot] Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-events/lib/rule.ts
View file
Open in desktop
Expand Up @@ -370,7 +370,7 @@ export class Rule extends Resource implements IRule {
});
new CfnEventBusPolicy(eventBusPolicyStack, 'GivePermToOtherAccount', {
action: 'events:PutEvents',
statementId: `Allow-account-${sourceAccount}-${this.node.addr}`,
statementId: `Allow-account-${sourceAccount}-${this.node.addr}`.substring(0, 64),
sennyeya marked this conversation as resolved.
Show resolved Hide resolved
principal: sourceAccount,
});
}
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-events/test/rule.test.ts
View file
Open in desktop
Expand Up @@ -933,7 +933,7 @@ describe('rule', () => {
const app = new cdk.App();

const sourceAccount = '123456789012';
const nodeAddr = 'c810f4680339b01edf1f157c4fd07da73469742773';
const trimmedNodeAddr = 'c810f4680339b01edf1f157c4fd07da734697';
const sourceStack = new cdk.Stack(app, 'SourceStack', {
env: {
account: sourceAccount,
Expand Down Expand Up @@ -1015,7 +1015,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}-${nodeAddr}`,
'StatementId': `Allow-account-${sourceAccount}-${trimmedNodeAddr}`,
'Principal': sourceAccount,
});
});
Expand Down