-
Notifications
You must be signed in to change notification settings - Fork 387
🐛 Fix resource policy limit with many scheduled events #1439
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
Open
monkut
wants to merge
3
commits into
master
Choose a base branch
from
bug/1415-resource-policy-limit-scheduled-events
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+29
−3
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3307,6 +3307,28 @@ def create_event_permission(self, lambda_name, principal, source_arn): | |
|
|
||
| return permission_response | ||
|
|
||
| def _add_eventbridge_wildcard_permission(self, lambda_name): | ||
| """ | ||
| Add a single wildcard permission for EventBridge to invoke the Lambda function. | ||
| Uses a wildcard SourceArn pattern to cover all rules, preventing the resource | ||
| policy from exceeding AWS's 20KB limit when many scheduled events are configured. | ||
| """ | ||
| account_id: str = self.sts_client.get_caller_identity().get("Account") # type: ignore | ||
| region = self.boto_session.region_name | ||
|
|
||
| try: | ||
| self.lambda_client.add_permission( | ||
| FunctionName=lambda_name, | ||
| StatementId="ZappaEventBridgeWildcard", | ||
| Action="lambda:InvokeFunction", | ||
| Principal="events.amazonaws.com", | ||
| SourceArn=f"arn:aws:events:{region}:{account_id}:rule/*", | ||
| SourceAccount=account_id, | ||
| ) | ||
| except self.lambda_client.exceptions.ResourceConflictException: | ||
| # Permission already exists | ||
| pass | ||
|
|
||
| def schedule_events(self, lambda_arn, lambda_name, events, default=True): | ||
| """ | ||
| Given a Lambda ARN, name and a list of events, schedule this as CloudWatch Events. | ||
|
|
@@ -3332,6 +3354,13 @@ def schedule_events(self, lambda_arn, lambda_name, events, default=True): | |
| events=events, | ||
| excluded_source_services=pull_services, | ||
| ) | ||
|
|
||
| # Add a single wildcard permission for all EventBridge rules instead of | ||
| # one per rule, to stay within the 20KB resource policy limit (#1415). | ||
| has_scheduled_events = any(e.get("expression") or e.get("expressions") for e in events) | ||
| if has_scheduled_events: | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. if has_scheduled_events is false, is it necessary to then loop through |
||
| self._add_eventbridge_wildcard_permission(lambda_name) | ||
|
|
||
| for event in events: | ||
| function = event["function"] | ||
| expression = event.get("expression", None) # single expression | ||
|
|
@@ -3371,9 +3400,6 @@ def schedule_events(self, lambda_arn, lambda_name, events, default=True): | |
| if "RuleArn" in rule_response: | ||
| logger.debug("Rule created. ARN {}".format(rule_response["RuleArn"])) | ||
|
|
||
| # Specific permissions are necessary for any trigger to work. | ||
| self.create_event_permission(lambda_name, "events.amazonaws.com", rule_response["RuleArn"]) | ||
|
|
||
| # Overwriting the input, supply the original values and add kwargs | ||
| input_template = ( | ||
| '{"time": <time>, ' | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add logging that: 'permission already exists'