-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: set LogGroup removal policy of all CDK-vended custom resources…
… with CustomResourceConfig (#31149) ### Reason for this change CDK vended custom resources LogGroup are left to retain. Modify all CDK-vended custom resources with `CustomResourceConfig` and to modify LogGroup removal policy with `addRemovalPolicy` method. `CustomResourceConfig.of(app).addRemovalPolicy(cdk.RemovalPolicy.DESTROY);` ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
- Loading branch information
1 parent
b11ca4a
commit bbb8885
Showing
15 changed files
with
1,591 additions
and
3 deletions.
There are no files selected for viewing
58 changes: 58 additions & 0 deletions
58
...esource-config/integ.custom-resource-config-removalPolicy.js.snapshot/MyStack.assets.json
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
263 changes: 263 additions & 0 deletions
263
...ource-config/integ.custom-resource-config-removalPolicy.js.snapshot/MyStack.template.json
This file contains 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 |
---|---|---|
@@ -0,0 +1,263 @@ | ||
{ | ||
"Resources": { | ||
"WebsiteBucket75C24D94": { | ||
"Type": "AWS::S3::Bucket", | ||
"Properties": { | ||
"Tags": [ | ||
{ | ||
"Key": "aws-cdk:cr-owned:32d93071", | ||
"Value": "true" | ||
} | ||
] | ||
}, | ||
"UpdateReplacePolicy": "Retain", | ||
"DeletionPolicy": "Retain" | ||
}, | ||
"LogGroupF5B46931": { | ||
"Type": "AWS::Logs::LogGroup", | ||
"Properties": { | ||
"RetentionInDays": 7 | ||
}, | ||
"UpdateReplacePolicy": "Delete", | ||
"DeletionPolicy": "Delete" | ||
}, | ||
"BucketDeploymentAwsCliLayerB018DCE1": { | ||
"Type": "AWS::Lambda::LayerVersion", | ||
"Properties": { | ||
"Content": { | ||
"S3Bucket": { | ||
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" | ||
}, | ||
"S3Key": "3322b7049fb0ed2b7cbb644a2ada8d1116ff80c32dca89e6ada846b5de26f961.zip" | ||
}, | ||
"Description": "/opt/awscli/aws" | ||
} | ||
}, | ||
"BucketDeploymentCustomResourceCB7E2133": { | ||
"Type": "Custom::CDKBucketDeployment", | ||
"Properties": { | ||
"ServiceToken": { | ||
"Fn::GetAtt": [ | ||
"CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C81C01536", | ||
"Arn" | ||
] | ||
}, | ||
"SourceBucketNames": [ | ||
{ | ||
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" | ||
} | ||
], | ||
"SourceObjectKeys": [ | ||
"561a8b95d6d62d87513e3607a2de271376251555ee83cf7b93534b0e85c500c8.zip" | ||
], | ||
"SourceMarkers": [ | ||
{} | ||
], | ||
"DestinationBucketName": { | ||
"Ref": "WebsiteBucket75C24D94" | ||
}, | ||
"Prune": true | ||
}, | ||
"UpdateReplacePolicy": "Delete", | ||
"DeletionPolicy": "Delete" | ||
}, | ||
"CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265": { | ||
"Type": "AWS::IAM::Role", | ||
"Properties": { | ||
"AssumeRolePolicyDocument": { | ||
"Statement": [ | ||
{ | ||
"Action": "sts:AssumeRole", | ||
"Effect": "Allow", | ||
"Principal": { | ||
"Service": "lambda.amazonaws.com" | ||
} | ||
} | ||
], | ||
"Version": "2012-10-17" | ||
}, | ||
"ManagedPolicyArns": [ | ||
{ | ||
"Fn::Join": [ | ||
"", | ||
[ | ||
"arn:", | ||
{ | ||
"Ref": "AWS::Partition" | ||
}, | ||
":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" | ||
] | ||
] | ||
} | ||
] | ||
} | ||
}, | ||
"CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRoleDefaultPolicy88902FDF": { | ||
"Type": "AWS::IAM::Policy", | ||
"Properties": { | ||
"PolicyDocument": { | ||
"Statement": [ | ||
{ | ||
"Action": [ | ||
"s3:GetBucket*", | ||
"s3:GetObject*", | ||
"s3:List*" | ||
], | ||
"Effect": "Allow", | ||
"Resource": [ | ||
{ | ||
"Fn::Join": [ | ||
"", | ||
[ | ||
"arn:", | ||
{ | ||
"Ref": "AWS::Partition" | ||
}, | ||
":s3:::", | ||
{ | ||
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" | ||
}, | ||
"/*" | ||
] | ||
] | ||
}, | ||
{ | ||
"Fn::Join": [ | ||
"", | ||
[ | ||
"arn:", | ||
{ | ||
"Ref": "AWS::Partition" | ||
}, | ||
":s3:::", | ||
{ | ||
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" | ||
} | ||
] | ||
] | ||
} | ||
] | ||
}, | ||
{ | ||
"Action": [ | ||
"s3:Abort*", | ||
"s3:DeleteObject*", | ||
"s3:GetBucket*", | ||
"s3:GetObject*", | ||
"s3:List*", | ||
"s3:PutObject", | ||
"s3:PutObjectLegalHold", | ||
"s3:PutObjectRetention", | ||
"s3:PutObjectTagging", | ||
"s3:PutObjectVersionTagging" | ||
], | ||
"Effect": "Allow", | ||
"Resource": [ | ||
{ | ||
"Fn::GetAtt": [ | ||
"WebsiteBucket75C24D94", | ||
"Arn" | ||
] | ||
}, | ||
{ | ||
"Fn::Join": [ | ||
"", | ||
[ | ||
{ | ||
"Fn::GetAtt": [ | ||
"WebsiteBucket75C24D94", | ||
"Arn" | ||
] | ||
}, | ||
"/*" | ||
] | ||
] | ||
} | ||
] | ||
} | ||
], | ||
"Version": "2012-10-17" | ||
}, | ||
"PolicyName": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRoleDefaultPolicy88902FDF", | ||
"Roles": [ | ||
{ | ||
"Ref": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265" | ||
} | ||
] | ||
} | ||
}, | ||
"CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C81C01536": { | ||
"Type": "AWS::Lambda::Function", | ||
"Properties": { | ||
"Code": { | ||
"S3Bucket": { | ||
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" | ||
}, | ||
"S3Key": "0158f40002a8c211635388a87874fd4dcc3d68f525fe08a0fe0f014069ae539c.zip" | ||
}, | ||
"Environment": { | ||
"Variables": { | ||
"AWS_CA_BUNDLE": "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" | ||
} | ||
}, | ||
"Handler": "index.handler", | ||
"Layers": [ | ||
{ | ||
"Ref": "BucketDeploymentAwsCliLayerB018DCE1" | ||
} | ||
], | ||
"LoggingConfig": { | ||
"LogGroup": { | ||
"Ref": "LogGroupF5B46931" | ||
} | ||
}, | ||
"Role": { | ||
"Fn::GetAtt": [ | ||
"CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265", | ||
"Arn" | ||
] | ||
}, | ||
"Runtime": "python3.9", | ||
"Timeout": 900 | ||
}, | ||
"DependsOn": [ | ||
"CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRoleDefaultPolicy88902FDF", | ||
"CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265" | ||
] | ||
} | ||
}, | ||
"Parameters": { | ||
"BootstrapVersion": { | ||
"Type": "AWS::SSM::Parameter::Value<String>", | ||
"Default": "/cdk-bootstrap/hnb659fds/version", | ||
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" | ||
} | ||
}, | ||
"Rules": { | ||
"CheckBootstrapVersion": { | ||
"Assertions": [ | ||
{ | ||
"Assert": { | ||
"Fn::Not": [ | ||
{ | ||
"Fn::Contains": [ | ||
[ | ||
"1", | ||
"2", | ||
"3", | ||
"4", | ||
"5" | ||
], | ||
{ | ||
"Ref": "BootstrapVersion" | ||
} | ||
] | ||
} | ||
] | ||
}, | ||
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." | ||
} | ||
] | ||
} | ||
} | ||
} |
Oops, something went wrong.