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

fix(sns): race condition exists between sqs queue policy and sns subscription #21797

Merged
merged 12 commits into from
Oct 2, 2022
Merged

fix(sns): race condition exists between sqs queue policy and sns subscription #21797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a8ac13b
fix(sns): add dependency to sqs policy for sns subscription
jonnekaunisto Jul 20, 2022
dde620f
Fix linting error
jonnekaunisto Jul 20, 2022
87a1b3d
Update CloudFormation package snapshot
jonnekaunisto Jul 21, 2022
5dad5a8
Change dependencies to a single dependency
jonnekaunisto Aug 29, 2022
20b7826
Updated aws-events snapshot
jonnekaunisto Aug 29, 2022
15cf7b4
Updaet step functions snapshot
jonnekaunisto Aug 29, 2022
e7f0336
Update ecs-service-externsion snapshot
jonnekaunisto Aug 29, 2022
90dddc8
Merged from upstream
jonnekaunisto Sep 7, 2022
30c48d8
Merge branch 'main' into sns-topic-fix
jonnekaunisto Sep 9, 2022
069f47f
Merge branch 'main' into sns-topic-fix
mergify[bot] Sep 20, 2022
8963e67
Fix snapshot
jonnekaunisto Sep 27, 2022
a51f66a
Merge branch 'main' into sns-topic-fix
mergify[bot] Oct 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,343 changes: 1,343 additions & 0 deletions .../ecs-service-extensions/test/publish-subscribe.integ.snapshot/aws-ecs-integ.template.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions ...-cdk/aws-cloudformation/test/nested-stack.integ.snapshot/nested-stacks-test.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
},
"SubscriberQueuenestedstackstestNestedStack1topic089C5EB1396F65087": {
"Type": "AWS::SNS::Subscription",
"DependsOn": "SubscriberQueuePolicy25A0799E",
"Properties": {
"Protocol": "sqs",
"TopicArn": {
Expand All @@ -109,6 +110,7 @@
},
"SubscriberQueuenestedstackstestNestedStack1topic1150E1A929A2C267E": {
"Type": "AWS::SNS::Subscription",
"DependsOn": "SubscriberQueuePolicy25A0799E",
"Properties": {
"Protocol": "sqs",
"TopicArn": {
Expand All @@ -127,6 +129,7 @@
},
"SubscriberQueuenestedstackstestNestedStack1topic209B8719858511914": {
"Type": "AWS::SNS::Subscription",
"DependsOn": "SubscriberQueuePolicy25A0799E",
"Properties": {
"Protocol": "sqs",
"TopicArn": {
Expand Down
1 change: 1 addition & 0 deletions ...rgets/test/codebuild/project-events.integ.snapshot/aws-cdk-codebuild-events.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@
},
"MyQueueawscdkcodebuildeventsMyTopic550011DCF72DE3ED": {
"Type": "AWS::SNS::Subscription",
"DependsOn": "MyQueuePolicy6BBEDDAC",
"Properties": {
"Protocol": "sqs",
"TopicArn": {
Expand Down
1 change: 1 addition & 0 deletions ...gets/test/sns/sns-event-rule-target.integ.snapshot/aws-cdk-sns-event-target.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
},
"MyQueueawscdksnseventtargetMyTopicB7575CD87304D383": {
"Type": "AWS::SNS::Subscription",
"DependsOn": "MyQueuePolicy6BBEDDAC",
"Properties": {
"Protocol": "sqs",
"TopicArn": {
Expand Down
5 changes: 3 additions & 2 deletions packages/@aws-cdk/aws-sns-subscriptions/lib/sqs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ export class SqsSubscription implements sns.ITopicSubscription {

// add a statement to the queue resource policy which allows this topic
// to send messages to the queue.
this.queue.addToResourcePolicy(new iam.PolicyStatement({
const queuePolicyDependable = this.queue.addToResourcePolicy(new iam.PolicyStatement({
resources: [this.queue.queueArn],
actions: ['sqs:SendMessage'],
principals: [snsServicePrincipal],
conditions: {
ArnEquals: { 'aws:SourceArn': topic.topicArn },
},
}));
})).policyDependable;

// if the queue is encrypted, add a statement to the key resource policy
// which allows this topic to decrypt KMS keys
Expand Down Expand Up @@ -77,6 +77,7 @@ export class SqsSubscription implements sns.ITopicSubscription {
filterPolicy: this.props.filterPolicy,
region: this.regionFromArn(topic),
deadLetterQueue: this.props.deadLetterQueue,
subscriptionDependency: queuePolicyDependable,
};
}

Expand Down
Loading