Skip to content

Commit f2b4eff

Browse files
rix0rrrrix0rrr
authored
fix(secretsmanager): SecretRotation app does not set DeletionPolicy (#20901)
Internal Amazon campaigns are validating that all `AWS::Serverless::Application` resources have `DeletionPolicy` set. Since `AWS::Serverless::Application` is not classified as a stateful resource by our metadata (nor could/should it be, because who knows?) we don't benefit from the automatic support for these policies from our model. Instead, manually add the required `Delete` policies on the `CfnApplication`. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 4e52091 commit f2b4eff

File tree

26 files changed

+156
-632
lines changed

26 files changed

+156
-632
lines changed

‎packages/@aws-cdk/aws-docdb/test/cluster-rotation.lit.integ.snapshot/aws-cdk-docdb-cluster-rotation.template.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,9 @@
672672
},
673673
"excludeCharacters": "\"@/"
674674
}
675-
}
675+
},
676+
"UpdateReplacePolicy": "Delete",
677+
"DeletionPolicy": "Delete"
676678
}
677679
},
678680
"Mappings": {

‎packages/@aws-cdk/aws-docdb/test/cluster-rotation.lit.integ.snapshot/cdk.out

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"17.0.0"}
1+
{"version":"20.0.0"}

‎packages/@aws-cdk/aws-docdb/test/cluster-rotation.lit.integ.snapshot/integ.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"version": "18.0.0",
2+
"version": "20.0.0",
33
"testCases": {
4-
"aws-docdb/test/integ.cluster-rotation.lit": {
4+
"integ.cluster-rotation.lit": {
55
"stacks": [
66
"aws-cdk-docdb-cluster-rotation"
77
],

‎packages/@aws-cdk/aws-docdb/test/cluster-rotation.lit.integ.snapshot/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "17.0.0",
2+
"version": "20.0.0",
33
"artifacts": {
44
"Tree": {
55
"type": "cdk:tree",

‎packages/@aws-cdk/aws-docdb/test/cluster-rotation.lit.integ.snapshot/tree.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"id": "Tree",
99
"path": "Tree",
1010
"constructInfo": {
11-
"fqn": "@aws-cdk/core.Construct",
12-
"version": "0.0.0"
11+
"fqn": "constructs.Construct",
12+
"version": "10.1.33"
1313
}
1414
},
1515
"aws-cdk-docdb-cluster-rotation": {

‎packages/@aws-cdk/aws-rds/test/cluster-rotation.lit.integ.snapshot/aws-cdk-rds-cluster-rotation.template.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,9 @@
694694
},
695695
"excludeCharacters": " %+~`#$&*()|[]{}:;<>?!'/@\"\\"
696696
}
697-
}
697+
},
698+
"UpdateReplacePolicy": "Delete",
699+
"DeletionPolicy": "Delete"
698700
}
699701
},
700702
"Mappings": {

‎packages/@aws-cdk/aws-rds/test/cluster-rotation.lit.integ.snapshot/cdk.out

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"17.0.0"}
1+
{"version":"20.0.0"}

‎packages/@aws-cdk/aws-rds/test/cluster-rotation.lit.integ.snapshot/integ.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"version": "18.0.0",
2+
"version": "20.0.0",
33
"testCases": {
4-
"aws-rds/test/integ.cluster-rotation.lit": {
4+
"integ.cluster-rotation.lit": {
55
"stacks": [
66
"aws-cdk-rds-cluster-rotation"
77
],

‎packages/@aws-cdk/aws-rds/test/cluster-rotation.lit.integ.snapshot/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "17.0.0",
2+
"version": "20.0.0",
33
"artifacts": {
44
"Tree": {
55
"type": "cdk:tree",

‎packages/@aws-cdk/aws-rds/test/cluster-rotation.lit.integ.snapshot/tree.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"id": "Tree",
99
"path": "Tree",
1010
"constructInfo": {
11-
"fqn": "@aws-cdk/core.Construct",
12-
"version": "0.0.0"
11+
"fqn": "constructs.Construct",
12+
"version": "10.1.33"
1313
}
1414
},
1515
"aws-cdk-rds-cluster-rotation": {

‎packages/@aws-cdk/aws-rds/test/cluster-snapshot.integ.snapshot/asset.1e025324752b3133dc230c4b8b8752f666b63c09cd4aa605ec2b322cc40def2e/index.d.ts

-3
This file was deleted.

‎packages/@aws-cdk/aws-rds/test/cluster-snapshot.integ.snapshot/asset.1e025324752b3133dc230c4b8b8752f666b63c09cd4aa605ec2b322cc40def2e/index.js

-60
This file was deleted.

‎packages/@aws-cdk/aws-rds/test/cluster-snapshot.integ.snapshot/asset.1e025324752b3133dc230c4b8b8752f666b63c09cd4aa605ec2b322cc40def2e/index.ts

-63
This file was deleted.

‎packages/@aws-cdk/aws-rds/test/cluster-snapshot.integ.snapshot/cdk-integ-cluster-snapshot.assets.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"version": "20.0.0",
33
"files": {
4-
"1e025324752b3133dc230c4b8b8752f666b63c09cd4aa605ec2b322cc40def2e": {
4+
"2e7ee01d9005281c0784e709cad69500591734343d1cb95da2fb4a3f5076aadd": {
55
"source": {
6-
"path": "asset.1e025324752b3133dc230c4b8b8752f666b63c09cd4aa605ec2b322cc40def2e",
6+
"path": "asset.2e7ee01d9005281c0784e709cad69500591734343d1cb95da2fb4a3f5076aadd",
77
"packaging": "zip"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "1e025324752b3133dc230c4b8b8752f666b63c09cd4aa605ec2b322cc40def2e.zip",
12+
"objectKey": "2e7ee01d9005281c0784e709cad69500591734343d1cb95da2fb4a3f5076aadd.zip",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}
@@ -27,15 +27,15 @@
2727
}
2828
}
2929
},
30-
"7ae22b0346a792d7afbb4c291d9c2c253dd988bb7b8060120b9dea312ca4126a": {
30+
"d420f64d8c29ddedb314409aadfd9c62f7e400e88517663af54720ace8c3fc84": {
3131
"source": {
3232
"path": "cdk-integ-cluster-snapshot.template.json",
3333
"packaging": "file"
3434
},
3535
"destinations": {
3636
"current_account-current_region": {
3737
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
38-
"objectKey": "7ae22b0346a792d7afbb4c291d9c2c253dd988bb7b8060120b9dea312ca4126a.json",
38+
"objectKey": "d420f64d8c29ddedb314409aadfd9c62f7e400e88517663af54720ace8c3fc84.json",
3939
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
4040
}
4141
}

‎packages/@aws-cdk/aws-rds/test/cluster-snapshot.integ.snapshot/cdk-integ-cluster-snapshot.template.json

+15-13
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@
608608
"Properties": {
609609
"Code": {
610610
"S3Bucket": {
611-
"Ref": "AssetParameters1e025324752b3133dc230c4b8b8752f666b63c09cd4aa605ec2b322cc40def2eS3BucketB5E782AC"
611+
"Ref": "AssetParameters2e7ee01d9005281c0784e709cad69500591734343d1cb95da2fb4a3f5076aaddS3BucketDCD8B62D"
612612
},
613613
"S3Key": {
614614
"Fn::Join": [
@@ -621,7 +621,7 @@
621621
"Fn::Split": [
622622
"||",
623623
{
624-
"Ref": "AssetParameters1e025324752b3133dc230c4b8b8752f666b63c09cd4aa605ec2b322cc40def2eS3VersionKey5DD1F95D"
624+
"Ref": "AssetParameters2e7ee01d9005281c0784e709cad69500591734343d1cb95da2fb4a3f5076aaddS3VersionKey96F91EAE"
625625
}
626626
]
627627
}
@@ -634,7 +634,7 @@
634634
"Fn::Split": [
635635
"||",
636636
{
637-
"Ref": "AssetParameters1e025324752b3133dc230c4b8b8752f666b63c09cd4aa605ec2b322cc40def2eS3VersionKey5DD1F95D"
637+
"Ref": "AssetParameters2e7ee01d9005281c0784e709cad69500591734343d1cb95da2fb4a3f5076aaddS3VersionKey96F91EAE"
638638
}
639639
]
640640
}
@@ -759,7 +759,7 @@
759759
"Properties": {
760760
"Code": {
761761
"S3Bucket": {
762-
"Ref": "AssetParameters1e025324752b3133dc230c4b8b8752f666b63c09cd4aa605ec2b322cc40def2eS3BucketB5E782AC"
762+
"Ref": "AssetParameters2e7ee01d9005281c0784e709cad69500591734343d1cb95da2fb4a3f5076aaddS3BucketDCD8B62D"
763763
},
764764
"S3Key": {
765765
"Fn::Join": [
@@ -772,7 +772,7 @@
772772
"Fn::Split": [
773773
"||",
774774
{
775-
"Ref": "AssetParameters1e025324752b3133dc230c4b8b8752f666b63c09cd4aa605ec2b322cc40def2eS3VersionKey5DD1F95D"
775+
"Ref": "AssetParameters2e7ee01d9005281c0784e709cad69500591734343d1cb95da2fb4a3f5076aaddS3VersionKey96F91EAE"
776776
}
777777
]
778778
}
@@ -785,7 +785,7 @@
785785
"Fn::Split": [
786786
"||",
787787
{
788-
"Ref": "AssetParameters1e025324752b3133dc230c4b8b8752f666b63c09cd4aa605ec2b322cc40def2eS3VersionKey5DD1F95D"
788+
"Ref": "AssetParameters2e7ee01d9005281c0784e709cad69500591734343d1cb95da2fb4a3f5076aaddS3VersionKey96F91EAE"
789789
}
790790
]
791791
}
@@ -1802,21 +1802,23 @@
18021802
},
18031803
"excludeCharacters": " %+~`#$&*()|[]{}:;<>?!'/@\"\\"
18041804
}
1805-
}
1805+
},
1806+
"UpdateReplacePolicy": "Delete",
1807+
"DeletionPolicy": "Delete"
18061808
}
18071809
},
18081810
"Parameters": {
1809-
"AssetParameters1e025324752b3133dc230c4b8b8752f666b63c09cd4aa605ec2b322cc40def2eS3BucketB5E782AC": {
1811+
"AssetParameters2e7ee01d9005281c0784e709cad69500591734343d1cb95da2fb4a3f5076aaddS3BucketDCD8B62D": {
18101812
"Type": "String",
1811-
"Description": "S3 bucket for asset \"1e025324752b3133dc230c4b8b8752f666b63c09cd4aa605ec2b322cc40def2e\""
1813+
"Description": "S3 bucket for asset \"2e7ee01d9005281c0784e709cad69500591734343d1cb95da2fb4a3f5076aadd\""
18121814
},
1813-
"AssetParameters1e025324752b3133dc230c4b8b8752f666b63c09cd4aa605ec2b322cc40def2eS3VersionKey5DD1F95D": {
1815+
"AssetParameters2e7ee01d9005281c0784e709cad69500591734343d1cb95da2fb4a3f5076aaddS3VersionKey96F91EAE": {
18141816
"Type": "String",
1815-
"Description": "S3 key for asset version \"1e025324752b3133dc230c4b8b8752f666b63c09cd4aa605ec2b322cc40def2e\""
1817+
"Description": "S3 key for asset version \"2e7ee01d9005281c0784e709cad69500591734343d1cb95da2fb4a3f5076aadd\""
18161818
},
1817-
"AssetParameters1e025324752b3133dc230c4b8b8752f666b63c09cd4aa605ec2b322cc40def2eArtifactHash725480C4": {
1819+
"AssetParameters2e7ee01d9005281c0784e709cad69500591734343d1cb95da2fb4a3f5076aaddArtifactHashB3DFB88A": {
18181820
"Type": "String",
1819-
"Description": "Artifact hash for asset \"1e025324752b3133dc230c4b8b8752f666b63c09cd4aa605ec2b322cc40def2e\""
1821+
"Description": "Artifact hash for asset \"2e7ee01d9005281c0784e709cad69500591734343d1cb95da2fb4a3f5076aadd\""
18201822
},
18211823
"AssetParameters8dd02cc4ac473ca5b08800e92edaa31a1a7db4005928021d029c5363584f11b9S3Bucket40DFAF90": {
18221824
"Type": "String",

0 commit comments

Comments
 (0)