Skip to content
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

Jump to bottom

fix(s3): RETAIN removal policy does not apply to an auto created bucket policy #27140

Closed
wants to merge 36 commits into from
Closed

fix(s3): RETAIN removal policy does not apply to an auto created bucket policy #27140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
b73212d
fix(s3): removal policy does not apply to bucket policy
go-to-k Sep 14, 2023
2236cb2
change addToResourcePolicy
go-to-k Sep 14, 2023
52ec882
change integ tests
go-to-k Sep 14, 2023
a4f664c
change integ tests in app-staging-synthesizer-alpha
go-to-k Sep 14, 2023
85ab096
change integ tests in aws-kinesisfirehose-destinations-alpha
go-to-k Sep 14, 2023
7f533fc
change integ tests in aws-appconfig-alpha for RETAIN
go-to-k Sep 14, 2023
6cc8cf0
Revert "change integ tests in app-staging-synthesizer-alpha"
go-to-k Sep 14, 2023
b67b109
Revert "change integ tests in aws-kinesisfirehose-destinations-alpha"
go-to-k Sep 14, 2023
24c50d9
change bucket.ts
go-to-k Sep 14, 2023
36c7e11
framework-integ/test/aws-codepipeline-actions
go-to-k Sep 14, 2023
4f306ce
aws-cdk-codepipeline-cloudformation
go-to-k Sep 14, 2023
88a73a6
pipeline-alexa-deploy
go-to-k Sep 14, 2023
7178923
integ.lambda-pipeline
go-to-k Sep 14, 2023
4eabd0d
integ.pipeline-cfn
go-to-k Sep 14, 2023
e48b62c
integ.pipeline-code-commit-build
go-to-k Sep 14, 2023
62f4276
integ.pipeline-code-commit
go-to-k Sep 14, 2023
3bb2bc5
integ.source-bucket-events-cross-stack-same-env
go-to-k Sep 14, 2023
a3bdaba
integ.pipeline-stepfunctions and integ.pipeline-events
go-to-k Sep 14, 2023
534e022
integ.vpc-flow-logs-interval
go-to-k Sep 14, 2023
88dca80
integ.pipeline-event-target
go-to-k Sep 14, 2023
15e9e6d
integ.vpc-flow-logs
go-to-k Sep 14, 2023
548aec3
some integ pipelines
go-to-k Sep 14, 2023
a641e38
integ.pipeline
go-to-k Sep 14, 2023
b043c8a
integ.pipeline-with-stack-outputs-in-custom-step
go-to-k Sep 14, 2023
cbe02e6
integ.pipeline-security
go-to-k Sep 14, 2023
134f988
integ.pipeline-with-assets
go-to-k Sep 14, 2023
1289872
integ.pipeline-with-assets-single-upload
go-to-k Sep 14, 2023
8038f02
integ.vpc-flow-logs.js
go-to-k Sep 14, 2023
50b2c42
some integs
go-to-k Sep 14, 2023
4b191d0
some integs others
go-to-k Sep 14, 2023
c814143
integ.pipeline-without-prepare and integ.pipeline-with-assets-single-…
go-to-k Sep 14, 2023
b46e49d
integ.pipeline-with-assets
go-to-k Sep 14, 2023
2430808
integ.newpipeline-with-file-system-locations.js
go-to-k Sep 14, 2023
76a9de0
assets and variables integs
go-to-k Sep 14, 2023
4046555
integ.pipeline-with-replicatio
go-to-k Sep 17, 2023
b14e3d4
manual change for templates
go-to-k Sep 17, 2023
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
6 changes: 3 additions & 3 deletions ...eg.cfn-template-from-repo.lit.js.snapshot/aws-cdk-codepipeline-cloudformation.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "20.0.0",
"version": "34.0.0",
"files": {
"20da66e133f179332e83c9a4cb06c53d29a826f0c46e697026309729b765cef8": {
"3be27690f56b890ccd22232bc3365a7a14fe6ab0adc9576aeda9c7eb1e917739": {
"source": {
"path": "aws-cdk-codepipeline-cloudformation.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "20da66e133f179332e83c9a4cb06c53d29a826f0c46e697026309729b765cef8.json",
"objectKey": "3be27690f56b890ccd22232bc3365a7a14fe6ab0adc9576aeda9c7eb1e917739.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
36 changes: 19 additions & 17 deletions ....cfn-template-from-repo.lit.js.snapshot/aws-cdk-codepipeline-cloudformation.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@
],
"Version": "2012-10-17"
}
}
},
"UpdateReplacePolicy": "Retain",
"DeletionPolicy": "Retain"
},
"PipelineRoleD68726F7": {
"Type": "AWS::IAM::Role",
Expand Down Expand Up @@ -249,6 +251,21 @@
"PipelineC660917D": {
"Type": "AWS::CodePipeline::Pipeline",
"Properties": {
"ArtifactStore": {
"EncryptionKey": {
"Id": {
"Fn::GetAtt": [
"PipelineArtifactsBucketEncryptionKey01D58D69",
"Arn"
]
},
"Type": "KMS"
},
"Location": {
"Ref": "PipelineArtifactsBucket22248F97"
},
"Type": "S3"
},
"RoleArn": {
"Fn::GetAtt": [
"PipelineRoleD68726F7",
Expand Down Expand Up @@ -368,22 +385,7 @@
],
"Name": "Deploy"
}
],
"ArtifactStore": {
"EncryptionKey": {
"Id": {
"Fn::GetAtt": [
"PipelineArtifactsBucketEncryptionKey01D58D69",
"Arn"
]
},
"Type": "KMS"
},
"Location": {
"Ref": "PipelineArtifactsBucket22248F97"
},
"Type": "S3"
}
]
},
"DependsOn": [
"PipelineRoleDefaultPolicyC7A05455",
Expand Down
2 changes: 1 addition & 1 deletion ...g/test/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.js.snapshot/cdk.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"20.0.0"}
{"version":"34.0.0"}
2 changes: 1 addition & 1 deletion ...est/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.js.snapshot/integ.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "20.0.0",
"version": "34.0.0",
"testCases": {
"integ.cfn-template-from-repo.lit": {
"stacks": [
Expand Down
16 changes: 8 additions & 8 deletions .../aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.js.snapshot/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
{
"version": "20.0.0",
"version": "34.0.0",
"artifacts": {
"Tree": {
"type": "cdk:tree",
"properties": {
"file": "tree.json"
}
},
"aws-cdk-codepipeline-cloudformation.assets": {
"type": "cdk:asset-manifest",
"properties": {
Expand All @@ -23,7 +17,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/20da66e133f179332e83c9a4cb06c53d29a826f0c46e697026309729b765cef8.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/3be27690f56b890ccd22232bc3365a7a14fe6ab0adc9576aeda9c7eb1e917739.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down Expand Up @@ -155,6 +149,12 @@
]
},
"displayName": "aws-cdk-codepipeline-cloudformation"
},
"Tree": {
"type": "cdk:tree",
"properties": {
"file": "tree.json"
}
}
}
}
Loading
Loading