Skip to content

Update CDK Bootstrap Template to Version 29 #975

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

Merged
ashishdhingra merged 1 commit into from
Sep 8, 2025
Merged

Update CDK Bootstrap Template to Version 29 #975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions .autover/changes/fbb29339-2144-451d-af2a-65656b4bf748.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"Projects": [
{
"Name": "AWS.Deploy.CLI",
"Type": "Patch",
"ChangelogMessages": [
"Update CDK Bootstrap template to version 29"
]
}
]
}
143 changes: 129 additions & 14 deletions src/AWS.Deploy.Orchestration/CDK/CDKBootstrapTemplate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@ Parameters:
Type: String
Default: "AWS CDK: Default Resources"
Description: Describe the provenance of the resources in this bootstrap stack. Change this when you customize the template. To prevent accidents, the CDK CLI will not overwrite bootstrap stacks with a different variant.
DenyExternalId:
Type: String
Default: "true"
AllowedValues:
- "true"
- "false"
Description: Whether to deny AssumeRole calls with an ExternalId. This prevents calls that are intended to be deputized from accidentally assuming CDK Roles.
Conditions:
HasTrustedAccounts:
Fn::Not:
Expand Down Expand Up @@ -104,6 +111,10 @@ Conditions:
Fn::Equals:
- "true"
- Ref: PublicAccessBlockConfiguration
ShouldDenyExternalId:
Fn::Equals:
- "true"
- Ref: DenyExternalId
Resources:
FileAssetsBucketEncryptionKey:
Type: AWS::KMS::Key
Expand Down Expand Up @@ -288,19 +299,41 @@ Resources:
Properties:
AssumeRolePolicyDocument:
Statement:
- Action: sts:TagSession
- Action: sts:AssumeRole
Effect: Allow
Principal:
AWS:
Ref: AWS::AccountId
- Action: sts:AssumeRole
Condition:
Fn::If:
- ShouldDenyExternalId
- "Null":
sts:ExternalId: "true"
- Ref: AWS::NoValue
- Action: sts:TagSession
Effect: Allow
Principal:
AWS:
Ref: AWS::AccountId
- Fn::If:
- HasTrustedAccounts
- Action: sts:AssumeRole
- Action:
- sts:AssumeRole
Effect: Allow
Principal:
AWS:
Ref: TrustedAccounts
Condition:
Fn::If:
- ShouldDenyExternalId
- "Null":
sts:ExternalId: "true"
- Ref: AWS::NoValue
- Ref: AWS::NoValue
- Fn::If:
- HasTrustedAccounts
- Action:
- sts:TagSession
Effect: Allow
Principal:
AWS:
Expand All @@ -316,19 +349,41 @@ Resources:
Properties:
AssumeRolePolicyDocument:
Statement:
- Action: sts:TagSession
- Action: sts:AssumeRole
Effect: Allow
Principal:
AWS:
Ref: AWS::AccountId
- Action: sts:AssumeRole
Condition:
Fn::If:
- ShouldDenyExternalId
- "Null":
sts:ExternalId: "true"
- Ref: AWS::NoValue
- Action: sts:TagSession
Effect: Allow
Principal:
AWS:
Ref: AWS::AccountId
- Fn::If:
- HasTrustedAccounts
- Action: sts:AssumeRole
- Action:
- sts:AssumeRole
Effect: Allow
Principal:
AWS:
Ref: TrustedAccounts
Condition:
Fn::If:
- ShouldDenyExternalId
- "Null":
sts:ExternalId: "true"
- Ref: AWS::NoValue
- Ref: AWS::NoValue
- Fn::If:
- HasTrustedAccounts
- Action:
- sts:TagSession
Effect: Allow
Principal:
AWS:
Expand All @@ -344,27 +399,65 @@ Resources:
Properties:
AssumeRolePolicyDocument:
Statement:
- Action: sts:TagSession
- Action: sts:AssumeRole
Effect: Allow
Principal:
AWS:
Ref: AWS::AccountId
- Action: sts:AssumeRole
Condition:
Fn::If:
- ShouldDenyExternalId
- "Null":
sts:ExternalId: "true"
- Ref: AWS::NoValue
- Action: sts:TagSession
Effect: Allow
Principal:
AWS:
Ref: AWS::AccountId
- Fn::If:
- HasTrustedAccountsForLookup
- Action: sts:AssumeRole
- Action:
- sts:AssumeRole
Effect: Allow
Principal:
AWS:
Ref: TrustedAccountsForLookup
Condition:
Fn::If:
- ShouldDenyExternalId
- "Null":
sts:ExternalId: "true"
- Ref: AWS::NoValue
- Ref: AWS::NoValue
- Fn::If:
- HasTrustedAccountsForLookup
- Action:
- sts:TagSession
Effect: Allow
Principal:
AWS:
Ref: TrustedAccountsForLookup
- Ref: AWS::NoValue
- Fn::If:
- HasTrustedAccounts
- Action: sts:AssumeRole
- Action:
- sts:AssumeRole
Effect: Allow
Principal:
AWS:
Ref: TrustedAccounts
Condition:
Fn::If:
- ShouldDenyExternalId
- "Null":
sts:ExternalId: "true"
- Ref: AWS::NoValue
- Ref: AWS::NoValue
- Fn::If:
- HasTrustedAccounts
- Action:
- sts:TagSession
Effect: Allow
Principal:
AWS:
Expand Down Expand Up @@ -457,19 +550,41 @@ Resources:
Properties:
AssumeRolePolicyDocument:
Statement:
- Action: sts:TagSession
- Action: sts:AssumeRole
Effect: Allow
Principal:
AWS:
Ref: AWS::AccountId
- Action: sts:AssumeRole
Condition:
Fn::If:
- ShouldDenyExternalId
- "Null":
sts:ExternalId: "true"
- Ref: AWS::NoValue
- Action: sts:TagSession
Effect: Allow
Principal:
AWS:
Ref: AWS::AccountId
- Fn::If:
- HasTrustedAccounts
- Action: sts:AssumeRole
- Action:
- sts:AssumeRole
Effect: Allow
Principal:
AWS:
Ref: TrustedAccounts
Condition:
Fn::If:
- ShouldDenyExternalId
- "Null":
sts:ExternalId: "true"
- Ref: AWS::NoValue
- Ref: AWS::NoValue
- Fn::If:
- HasTrustedAccounts
- Action:
- sts:TagSession
Effect: Allow
Principal:
AWS:
Expand Down Expand Up @@ -639,7 +754,7 @@ Resources:
Type: String
Name:
Fn::Sub: /cdk-bootstrap/${Qualifier}/version
Value: "28"
Value: "29"
Outputs:
BucketName:
Description: The name of the S3 bucket owned by the CDK toolkit stack
Expand Down
Loading