Skip to content

Commit d9f7b58

Browse files
aws-cdk-automationAWS CDK Teammadeline-kiliapolo
authored
feat(cfnspec): cloudformation spec v46.0.0 (#17223)
* feat: cloudformation spec v46.0.0 * fix generated code for new libraries: aws-panorama, aws-rekognition, aws-wisdom * fix ec2 * Revert "fix ec2" This reverts commit d961dde. * add awslint excludes to ec2 module * fix secretsmanager - add default RemovalPolicy * update snapshot tests in aws-docdb because of secretsmanager removal policy change * amplify * elasticsearch and opensearch * esc snapshots * rds snapshots Co-authored-by: AWS CDK Team <[email protected]> Co-authored-by: Madeline Kusters <[email protected]> Co-authored-by: Eli Polonsky <[email protected]>
1 parent c8cd515 commit d9f7b58

File tree

74 files changed

+4361
-338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+4361
-338
lines changed

‎packages/@aws-cdk/aws-amplify/test/integ.app.expected.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
"GenerateStringKey": "password",
2525
"SecretStringTemplate": "{\"username\":\"aws\"}"
2626
}
27-
}
27+
},
28+
"UpdateReplacePolicy": "Delete",
29+
"DeletionPolicy": "Delete"
2830
},
2931
"AppF1B96344": {
3032
"Type": "AWS::Amplify::App",

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,9 @@
601601
"PasswordLength": 41,
602602
"SecretStringTemplate": "{\"username\":\"docdb\"}"
603603
}
604-
}
604+
},
605+
"UpdateReplacePolicy": "Delete",
606+
"DeletionPolicy": "Delete"
605607
},
606608
"DatabaseSecretAttachmentE5D1B020": {
607609
"Type": "AWS::SecretsManager::SecretTargetAttachment",

‎packages/@aws-cdk/aws-docdb/test/integ.cluster.expected.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@
9595
"VPCPublicSubnet1NATGatewayE0556630": {
9696
"Type": "AWS::EC2::NatGateway",
9797
"Properties": {
98+
"SubnetId": {
99+
"Ref": "VPCPublicSubnet1SubnetB4246D30"
100+
},
98101
"AllocationId": {
99102
"Fn::GetAtt": [
100103
"VPCPublicSubnet1EIP6AD938E8",
101104
"AllocationId"
102105
]
103106
},
104-
"SubnetId": {
105-
"Ref": "VPCPublicSubnet1SubnetB4246D30"
106-
},
107107
"Tags": [
108108
{
109109
"Key": "Name",
@@ -192,15 +192,15 @@
192192
"VPCPublicSubnet2NATGateway3C070193": {
193193
"Type": "AWS::EC2::NatGateway",
194194
"Properties": {
195+
"SubnetId": {
196+
"Ref": "VPCPublicSubnet2Subnet74179F39"
197+
},
195198
"AllocationId": {
196199
"Fn::GetAtt": [
197200
"VPCPublicSubnet2EIP4947BC00",
198201
"AllocationId"
199202
]
200203
},
201-
"SubnetId": {
202-
"Ref": "VPCPublicSubnet2Subnet74179F39"
203-
},
204204
"Tags": [
205205
{
206206
"Key": "Name",
@@ -506,4 +506,4 @@
506506
"DeletionPolicy": "Delete"
507507
}
508508
}
509-
}
509+
}

‎packages/@aws-cdk/aws-ec2/package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@
117117
},
118118
"awslint": {
119119
"exclude": [
120+
"resource-attribute:@aws-cdk/aws-ec2.NetworkAclEntry.networkAclEntryId",
120121
"resource-attribute:@aws-cdk/aws-ec2.ISecurityGroup.securityGroupVpcId",
121122
"no-unused-type:@aws-cdk/aws-ec2.ConnectionRule",
122123
"no-unused-type:@aws-cdk/aws-ec2.Protocol",
@@ -131,6 +132,7 @@
131132
"props-physical-name:@aws-cdk/aws-ec2.InterfaceVpcEndpointProps",
132133
"props-physical-name:@aws-cdk/aws-ec2.VpcEndpointServiceProps",
133134
"from-method:@aws-cdk/aws-ec2.Instance",
135+
"from-method:@aws-cdk/aws-ec2.NetworkAclEntry",
134136
"from-method:@aws-cdk/aws-ec2.VpcEndpointService",
135137
"attribute-tag:@aws-cdk/aws-ec2.BastionHostLinux.instance",
136138
"attribute-tag:@aws-cdk/aws-ec2.Instance.instance",

‎packages/@aws-cdk/aws-ecs/test/ec2/integ.secret-json-field.expected.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
"GenerateStringKey": "password",
88
"SecretStringTemplate": "{\"username\":\"user\"}"
99
}
10-
}
10+
},
11+
"UpdateReplacePolicy": "Delete",
12+
"DeletionPolicy": "Delete"
1113
},
1214
"TaskDefTaskRole1EDB4A67": {
1315
"Type": "AWS::IAM::Role",

‎packages/@aws-cdk/aws-ecs/test/fargate/integ.secret.expected.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
"GenerateStringKey": "password",
88
"SecretStringTemplate": "{\"username\":\"user\"}"
99
}
10-
}
10+
},
11+
"UpdateReplacePolicy": "Delete",
12+
"DeletionPolicy": "Delete"
1113
},
1214
"TaskDefTaskRole1EDB4A67": {
1315
"Type": "AWS::IAM::Role",

‎packages/@aws-cdk/aws-elasticsearch/test/integ.elasticsearch-vpc.expected.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@
9595
"VpcPublicSubnet1NATGateway4D7517AA": {
9696
"Type": "AWS::EC2::NatGateway",
9797
"Properties": {
98+
"SubnetId": {
99+
"Ref": "VpcPublicSubnet1Subnet5C2D37C4"
100+
},
98101
"AllocationId": {
99102
"Fn::GetAtt": [
100103
"VpcPublicSubnet1EIPD7E02669",
101104
"AllocationId"
102105
]
103106
},
104-
"SubnetId": {
105-
"Ref": "VpcPublicSubnet1Subnet5C2D37C4"
106-
},
107107
"Tags": [
108108
{
109109
"Key": "Name",
@@ -192,15 +192,15 @@
192192
"VpcPublicSubnet2NATGateway9182C01D": {
193193
"Type": "AWS::EC2::NatGateway",
194194
"Properties": {
195+
"SubnetId": {
196+
"Ref": "VpcPublicSubnet2Subnet691E08A3"
197+
},
195198
"AllocationId": {
196199
"Fn::GetAtt": [
197200
"VpcPublicSubnet2EIP3C605A87",
198201
"AllocationId"
199202
]
200203
},
201-
"SubnetId": {
202-
"Ref": "VpcPublicSubnet2Subnet691E08A3"
203-
},
204204
"Tags": [
205205
{
206206
"Key": "Name",
@@ -289,15 +289,15 @@
289289
"VpcPublicSubnet3NATGateway7640CD1D": {
290290
"Type": "AWS::EC2::NatGateway",
291291
"Properties": {
292+
"SubnetId": {
293+
"Ref": "VpcPublicSubnet3SubnetBE12F0B6"
294+
},
292295
"AllocationId": {
293296
"Fn::GetAtt": [
294297
"VpcPublicSubnet3EIP3A666A23",
295298
"AllocationId"
296299
]
297300
},
298-
"SubnetId": {
299-
"Ref": "VpcPublicSubnet3SubnetBE12F0B6"
300-
},
301301
"Tags": [
302302
{
303303
"Key": "Name",

‎packages/@aws-cdk/aws-elasticsearch/test/integ.elasticsearch.custom-kms-key.expected.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@
359359
"Properties": {
360360
"Code": {
361361
"S3Bucket": {
362-
"Ref": "AssetParametersf4b39c228007db80daf4497318957f3b455415dce70fdbb7aeb6151a0b6da924S3BucketA716C641"
362+
"Ref": "AssetParameters6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2S3BucketF482197E"
363363
},
364364
"S3Key": {
365365
"Fn::Join": [
@@ -372,7 +372,7 @@
372372
"Fn::Split": [
373373
"||",
374374
{
375-
"Ref": "AssetParametersf4b39c228007db80daf4497318957f3b455415dce70fdbb7aeb6151a0b6da924S3VersionKey2B40A946"
375+
"Ref": "AssetParameters6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2S3VersionKey38B69632"
376376
}
377377
]
378378
}
@@ -385,7 +385,7 @@
385385
"Fn::Split": [
386386
"||",
387387
{
388-
"Ref": "AssetParametersf4b39c228007db80daf4497318957f3b455415dce70fdbb7aeb6151a0b6da924S3VersionKey2B40A946"
388+
"Ref": "AssetParameters6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2S3VersionKey38B69632"
389389
}
390390
]
391391
}
@@ -412,17 +412,17 @@
412412
}
413413
},
414414
"Parameters": {
415-
"AssetParametersf4b39c228007db80daf4497318957f3b455415dce70fdbb7aeb6151a0b6da924S3BucketA716C641": {
415+
"AssetParameters6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2S3BucketF482197E": {
416416
"Type": "String",
417-
"Description": "S3 bucket for asset \"f4b39c228007db80daf4497318957f3b455415dce70fdbb7aeb6151a0b6da924\""
417+
"Description": "S3 bucket for asset \"6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2\""
418418
},
419-
"AssetParametersf4b39c228007db80daf4497318957f3b455415dce70fdbb7aeb6151a0b6da924S3VersionKey2B40A946": {
419+
"AssetParameters6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2S3VersionKey38B69632": {
420420
"Type": "String",
421-
"Description": "S3 key for asset version \"f4b39c228007db80daf4497318957f3b455415dce70fdbb7aeb6151a0b6da924\""
421+
"Description": "S3 key for asset version \"6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2\""
422422
},
423-
"AssetParametersf4b39c228007db80daf4497318957f3b455415dce70fdbb7aeb6151a0b6da924ArtifactHash2B031F57": {
423+
"AssetParameters6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2ArtifactHash4BE92B79": {
424424
"Type": "String",
425-
"Description": "Artifact hash for asset \"f4b39c228007db80daf4497318957f3b455415dce70fdbb7aeb6151a0b6da924\""
425+
"Description": "Artifact hash for asset \"6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2\""
426426
}
427427
}
428428
}

‎packages/@aws-cdk/aws-elasticsearch/test/integ.elasticsearch.expected.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@
296296
"Properties": {
297297
"Code": {
298298
"S3Bucket": {
299-
"Ref": "AssetParametersf2b7671fc0b80f63e3c94441727cbff799bb0f4991339d990d7b4c419e1ab3ddS3Bucket292EB571"
299+
"Ref": "AssetParameters6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2S3BucketF482197E"
300300
},
301301
"S3Key": {
302302
"Fn::Join": [
@@ -309,7 +309,7 @@
309309
"Fn::Split": [
310310
"||",
311311
{
312-
"Ref": "AssetParametersf2b7671fc0b80f63e3c94441727cbff799bb0f4991339d990d7b4c419e1ab3ddS3VersionKeyCE9A5F79"
312+
"Ref": "AssetParameters6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2S3VersionKey38B69632"
313313
}
314314
]
315315
}
@@ -322,7 +322,7 @@
322322
"Fn::Split": [
323323
"||",
324324
{
325-
"Ref": "AssetParametersf2b7671fc0b80f63e3c94441727cbff799bb0f4991339d990d7b4c419e1ab3ddS3VersionKeyCE9A5F79"
325+
"Ref": "AssetParameters6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2S3VersionKey38B69632"
326326
}
327327
]
328328
}
@@ -608,17 +608,17 @@
608608
}
609609
},
610610
"Parameters": {
611-
"AssetParametersf2b7671fc0b80f63e3c94441727cbff799bb0f4991339d990d7b4c419e1ab3ddS3Bucket292EB571": {
611+
"AssetParameters6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2S3BucketF482197E": {
612612
"Type": "String",
613-
"Description": "S3 bucket for asset \"f2b7671fc0b80f63e3c94441727cbff799bb0f4991339d990d7b4c419e1ab3dd\""
613+
"Description": "S3 bucket for asset \"6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2\""
614614
},
615-
"AssetParametersf2b7671fc0b80f63e3c94441727cbff799bb0f4991339d990d7b4c419e1ab3ddS3VersionKeyCE9A5F79": {
615+
"AssetParameters6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2S3VersionKey38B69632": {
616616
"Type": "String",
617-
"Description": "S3 key for asset version \"f2b7671fc0b80f63e3c94441727cbff799bb0f4991339d990d7b4c419e1ab3dd\""
617+
"Description": "S3 key for asset version \"6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2\""
618618
},
619-
"AssetParametersf2b7671fc0b80f63e3c94441727cbff799bb0f4991339d990d7b4c419e1ab3ddArtifactHash86854188": {
619+
"AssetParameters6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2ArtifactHash4BE92B79": {
620620
"Type": "String",
621-
"Description": "Artifact hash for asset \"f2b7671fc0b80f63e3c94441727cbff799bb0f4991339d990d7b4c419e1ab3dd\""
621+
"Description": "Artifact hash for asset \"6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2\""
622622
}
623623
}
624624
}

‎packages/@aws-cdk/aws-elasticsearch/test/integ.elasticsearch.unsignedbasicauth.expected.json‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"GenerateStringKey": "password",
99
"SecretStringTemplate": "{\"username\":\"admin\"}"
1010
}
11-
}
11+
},
12+
"UpdateReplacePolicy": "Delete",
13+
"DeletionPolicy": "Delete"
1214
},
1315
"Domain66AC69E0": {
1416
"Type": "AWS::Elasticsearch::Domain",
@@ -191,7 +193,7 @@
191193
"Properties": {
192194
"Code": {
193195
"S3Bucket": {
194-
"Ref": "AssetParameters4600faecd25ab407ff0a9d16f935c93062aaea5d415e97046bb8befe6c8ec02cS3BucketD609D0D9"
196+
"Ref": "AssetParameters6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2S3BucketF482197E"
195197
},
196198
"S3Key": {
197199
"Fn::Join": [
@@ -204,7 +206,7 @@
204206
"Fn::Split": [
205207
"||",
206208
{
207-
"Ref": "AssetParameters4600faecd25ab407ff0a9d16f935c93062aaea5d415e97046bb8befe6c8ec02cS3VersionKey77CF589B"
209+
"Ref": "AssetParameters6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2S3VersionKey38B69632"
208210
}
209211
]
210212
}
@@ -217,7 +219,7 @@
217219
"Fn::Split": [
218220
"||",
219221
{
220-
"Ref": "AssetParameters4600faecd25ab407ff0a9d16f935c93062aaea5d415e97046bb8befe6c8ec02cS3VersionKey77CF589B"
222+
"Ref": "AssetParameters6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2S3VersionKey38B69632"
221223
}
222224
]
223225
}
@@ -243,17 +245,17 @@
243245
}
244246
},
245247
"Parameters": {
246-
"AssetParameters4600faecd25ab407ff0a9d16f935c93062aaea5d415e97046bb8befe6c8ec02cS3BucketD609D0D9": {
248+
"AssetParameters6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2S3BucketF482197E": {
247249
"Type": "String",
248-
"Description": "S3 bucket for asset \"4600faecd25ab407ff0a9d16f935c93062aaea5d415e97046bb8befe6c8ec02c\""
250+
"Description": "S3 bucket for asset \"6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2\""
249251
},
250-
"AssetParameters4600faecd25ab407ff0a9d16f935c93062aaea5d415e97046bb8befe6c8ec02cS3VersionKey77CF589B": {
252+
"AssetParameters6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2S3VersionKey38B69632": {
251253
"Type": "String",
252-
"Description": "S3 key for asset version \"4600faecd25ab407ff0a9d16f935c93062aaea5d415e97046bb8befe6c8ec02c\""
254+
"Description": "S3 key for asset version \"6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2\""
253255
},
254-
"AssetParameters4600faecd25ab407ff0a9d16f935c93062aaea5d415e97046bb8befe6c8ec02cArtifactHash86CFA15D": {
256+
"AssetParameters6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2ArtifactHash4BE92B79": {
255257
"Type": "String",
256-
"Description": "Artifact hash for asset \"4600faecd25ab407ff0a9d16f935c93062aaea5d415e97046bb8befe6c8ec02c\""
258+
"Description": "Artifact hash for asset \"6ee0a36dd10d630708c265bcf7616c64030040c1bbc383b34150db74b744cad2\""
257259
}
258260
}
259261
}

0 commit comments

Comments
 (0)