Improve companion stack sweeper function#3931
Merged
Merged
Conversation
Delete orphaned REST APIs matching sam-integ- pattern before stack deletion to avoid rate limit issues. Uses 35s sleep between API deletions per API Gateway control plane limits. Also unifies pattern matching to a single TEST_PATTERN and reduces cutoff to 6 hours.
Prevents the API deletion loop (35s sleep per API) from consuming the entire Lambda budget, ensuring stacks and log groups still get cleaned up in the remaining 7 minutes.
Ensures the 35s sleep runs even when delete_rest_api throws (e.g. TooManyRequestsException), preventing back-to-back failing calls that would worsen throttling.
licjun
reviewed
May 28, 2026
Vandita2020
reviewed
May 28, 2026
licjun
approved these changes
May 28, 2026
More frequent sweeps reduce orphaned resource accumulation and align better with the 6-hour age cutoff for cleanup eligibility.
Ensures _sweep_stacks and _sweep_logs still run even if _sweep_apis encounters an unexpected error like pagination failure.
Vandita2020
approved these changes
May 28, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Issue #, if available
N/A
Description of changes
sam-integ-pattern before stack deletion to avoid rate limit issues onDeleteRestApi(1 per 30s control plane limit, using 35s sleep).TEST_PATTERN = 'sam-integ-'(removes dualSTACK_PATTERN/IAM_PATTERN).print(f"Deleting: {name}")logging.apigateway:DELETEIAM permission to the sweeper role.Description of how you validated changes
Deployed companion stack to personal account (us-west-2).
Checklist
Examples?
Please reach out in the comments if you want to add an example. Examples will be
added to
sam initthrough aws/aws-sam-cli-app-templates.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.