fix(rds): properly handle RETAIN_ON_UPDATE_OR_DELETE in subresources - #38331
Open
wasim-builds wants to merge 6 commits into
Open
fix(rds): properly handle RETAIN_ON_UPDATE_OR_DELETE in subresources#38331wasim-builds wants to merge 6 commits into
wasim-builds wants to merge 6 commits into
Conversation
github-actions
Bot
added
beginning-contributor
aws-cdk-automation
previously requested changes
Jul 16, 2026
This was referenced Jul 16, 2026
Author
|
Exemption Request: Adding integration tests for RETAIN_ON_UPDATE_OR_DELETE subresources requires complex setup that is fully validated by unit tests. |
aws-cdk-automation
added
the
pr-linter/exemption-requested
aws-cdk-automation
temporarily deployed
to
automation
July 18, 2026 04:34 — with 
GitHub Actions
Inactive
GitHub Actions
Inactive
aws-cdk-automation
temporarily deployed
to
automation
July 18, 2026 04:34 — with
GitHub Actions
Inactive
GitHub Actions
Inactive
Author
|
The max-len linter error has been fixed, and the missing integration test snapshots have been generated and pushed. |
aws-cdk-automation
dismissed
their stale review
July 21, 2026 14:46
✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.
aws-cdk-automation
added
the
pr/needs-community-review
aws-cdk-automation
temporarily deployed
to
automation
July 28, 2026 15:38 — with
GitHub Actions
Inactive
GitHub Actions
Inactive
aws-cdk-automation
temporarily deployed
to
automation
July 28, 2026 15:38 — with
GitHub Actions
Inactive
GitHub Actions
Inactive
lpizzinidev
suggested changes
Aug 21, 2026
| */ | ||
| export function defaultDeletionProtection(deletionProtection?: boolean, removalPolicy?: RemovalPolicy): boolean | undefined { | ||
| return deletionProtection ?? (removalPolicy === RemovalPolicy.RETAIN ? true : undefined); | ||
| return deletionProtection ?? (removalPolicy === RemovalPolicy.RETAIN || |
Contributor
There was a problem hiding this comment.
What about declaring a global const retentionPolicies = [RemovalPolicy.RETAIN, RemovalPolicy.RETAIN_ON_UPDATE_OR_DELETE] and
return deletionProtection ?? (retentionPolicies.includes(removalPolicy) ? true : undefined);Similar for method below.
| export function helperRemovalPolicy(basePolicy?: RemovalPolicy): RemovalPolicy { | ||
| return basePolicy === RemovalPolicy.RETAIN | ||
| ? RemovalPolicy.RETAIN | ||
| return basePolicy === RemovalPolicy.RETAIN || basePolicy === RemovalPolicy.RETAIN_ON_UPDATE_OR_DELETE |
Contributor
There was a problem hiding this comment.
Can you update the comments to both methods to reflect the new behavior?
| }); | ||
| }); | ||
|
|
||
| test("sets the retention policy of the SubnetGroup to 'Retain' if the Serverless Cluster is created with 'RetainOnUpdateOrDelete'", () => { |
Contributor
There was a problem hiding this comment.
Can you add coverage for defaultDeletionProtection as well?
aws-cdk-automation
added
pr/community-review-timeout
pr/needs-maintainer-review
aws-cdk-automation
temporarily deployed
to
automation
August 28, 2026 12:53 — with
GitHub Actions
Inactive
GitHub Actions
Inactive
aws-cdk-automation
temporarily deployed
to
automation
August 28, 2026 12:53 — with
GitHub Actions
Inactive
GitHub Actions
Inactive
aws-cdk-automation
temporarily deployed
to
automation
August 28, 2026 12:53 — with
GitHub Actions
Inactive
GitHub Actions
Inactive
aws-cdk-automation
temporarily deployed
to
automation
August 28, 2026 12:53 — with
GitHub Actions
Inactive
GitHub Actions
Inactive
aws-cdk-automation
temporarily deployed
to
automation
August 28, 2026 12:53 — with
GitHub Actions
Inactive
GitHub Actions
Inactive
aws-cdk-automation
removed
the
pr/needs-maintainer-review
aws-cdk-automation
temporarily deployed
to
automation
August 28, 2026 12:54 — with
GitHub Actions
Inactive
GitHub Actions
Inactive
wasim-builds
temporarily deployed
to
automation
August 30, 2026 16:45 — with
GitHub Actions
Inactive
GitHub Actions
Inactive
wasim-builds
temporarily deployed
to
automation
August 30, 2026 16:45 — with
GitHub Actions
Inactive
GitHub Actions
Inactive
1 task
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
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.
Fixes #37780
Problem
RdsInstance/ServerlessClustersubresources did not properly handleRemovalPolicy.RETAIN_ON_UPDATE_OR_DELETE, causing incorrect behavior during stack updates.Fix
Update
helperRemovalPolicyanddefaultDeletionProtectionto pass throughRETAIN_ON_UPDATE_OR_DELETEinstead of collapsing it. Apply the fix toserverless-cluster.tsas well.Scope
packages/aws-cdk-lib/aws-rds/lib/private/util.ts: policy passthrough fixpackages/aws-cdk-lib/aws-rds/lib/serverless-cluster.ts: apply corrected policyVerification
Serverless cluster and RDS instances now preserve
RETAIN_ON_UPDATE_OR_DELETEsemantics during updates.