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.

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(scheduler-targets-alpha): add dlq policy to execution role instead of queue policy #32032

Merged
merged 4 commits into from
Nov 7, 2024

Conversation

gracelu0
Copy link
Contributor

@gracelu0 gracelu0 commented Nov 5, 2024

Issue # (if applicable)

Tracking #31785.

Reason for this change

Currently if a dead letter queue (DLQ) is specified then a queue policy is created for the DLQ which allows the schedule to send messages. This is incorrect and the permissions should be added to the schedule's execution role instead.

Description of changes

Add sqs:SendMessage permission to execution role's policy statement if dead letter queue is specified. This follows the service docs for configuring a schedule DLQ.

Also removed cross-region validation as the deployment will fail fast for this case so the validation is unnecessary.

Description of how you validated changes

Updated unit tests and added a new integration test with dead letter queue setup on the schedule

Checklist


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

@aws-cdk-automation aws-cdk-automation requested a review from a team November 5, 2024 23:42
@github-actions github-actions bot added the p2 label Nov 5, 2024
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Nov 5, 2024
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The pull request linter has failed. See the aws-cdk-automation comment below for failure reasons. If you believe this pull request should receive an exemption, please comment and provide a justification.

A comment requesting an exemption should contain the text Exemption Request. Additionally, if clarification is needed add Clarification Request to a comment.

@gracelu0 gracelu0 changed the title fix(scheduler-targets-alpha) add dlq policy to execution role instead of queue policy fix(scheduler-targets-alpha): add dlq policy to execution role instead of queue policy Nov 6, 2024
@gracelu0 gracelu0 added the pr-linter/exempt-integ-test The PR linter will not require integ test changes label Nov 6, 2024
@aws-cdk-automation aws-cdk-automation dismissed their stale review November 6, 2024 01:20

✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.

@aws-cdk-automation aws-cdk-automation added the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Nov 6, 2024
@gracelu0 gracelu0 force-pushed the scheduler-dlq-policy-fix branch from fe85775 to 5eebbf8 Compare November 6, 2024 01:23
@samson-keung
Copy link
Contributor

For integ test, you can write one similar to integ.schedule.ts but intentionally have missing target invocation permission in the execution role. A rate-based schedule without time window is invoked right away when created. Then use assert to check the queue has the expected message.

@aws-cdk-automation aws-cdk-automation removed the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Nov 6, 2024
Copy link
Contributor

@xazhao xazhao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@gracelu0 gracelu0 dismissed samson-keung’s stale review November 7, 2024 21:35

Addressed comments and he is on vacation so I am not going to bother him more

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: fe451ba
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

Copy link
Contributor

mergify bot commented Nov 7, 2024

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit b953b2a into aws:main Nov 7, 2024
13 checks passed
Copy link

github-actions bot commented Nov 7, 2024

Comments on closed issues and PRs are hard for our team to see.
If you need help, please open a new issue that references this one.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 7, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
contribution/core This is a PR that came from AWS. p2 pr-linter/exempt-integ-test The PR linter will not require integ test changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants