Skip to content

Commit be1499d

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into huijbers/servicecatalog-assets
2 parents 3c22cd7 + 803cfe3 commit be1499d

61 files changed

Lines changed: 1477 additions & 829 deletions

File tree

Some content is hidden

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"version": "30.1.0",
2+
"version": "34.0.0",
33
"files": {
4-
"ffa0280c20139b5a0ec753fdb4365af29fb08ea9703b9139810054417bc99c10": {
4+
"8a58fa97a651075da97dae0f25e1a6d749868a97b0aaa5cad68bc5b40a6ad731": {
55
"source": {
66
"path": "aws-cdk-docdb-cluster-rotation.template.json",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "ffa0280c20139b5a0ec753fdb4365af29fb08ea9703b9139810054417bc99c10.json",
12+
"objectKey": "8a58fa97a651075da97dae0f25e1a6d749868a97b0aaa5cad68bc5b40a6ad731.json",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}

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

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
"VPCPublicSubnet1SubnetB4246D30": {
2020
"Type": "AWS::EC2::Subnet",
2121
"Properties": {
22-
"VpcId": {
23-
"Ref": "VPCB9E5F0B4"
24-
},
2522
"AvailabilityZone": {
2623
"Fn::Select": [
2724
0,
@@ -45,21 +42,24 @@
4542
"Key": "Name",
4643
"Value": "aws-cdk-docdb-cluster-rotation/VPC/PublicSubnet1"
4744
}
48-
]
45+
],
46+
"VpcId": {
47+
"Ref": "VPCB9E5F0B4"
48+
}
4949
}
5050
},
5151
"VPCPublicSubnet1RouteTableFEE4B781": {
5252
"Type": "AWS::EC2::RouteTable",
5353
"Properties": {
54-
"VpcId": {
55-
"Ref": "VPCB9E5F0B4"
56-
},
5754
"Tags": [
5855
{
5956
"Key": "Name",
6057
"Value": "aws-cdk-docdb-cluster-rotation/VPC/PublicSubnet1"
6158
}
62-
]
59+
],
60+
"VpcId": {
61+
"Ref": "VPCB9E5F0B4"
62+
}
6363
}
6464
},
6565
"VPCPublicSubnet1RouteTableAssociation0B0896DC": {
@@ -76,12 +76,12 @@
7676
"VPCPublicSubnet1DefaultRoute91CEF279": {
7777
"Type": "AWS::EC2::Route",
7878
"Properties": {
79-
"RouteTableId": {
80-
"Ref": "VPCPublicSubnet1RouteTableFEE4B781"
81-
},
8279
"DestinationCidrBlock": "0.0.0.0/0",
8380
"GatewayId": {
8481
"Ref": "VPCIGWB7E252D3"
82+
},
83+
"RouteTableId": {
84+
"Ref": "VPCPublicSubnet1RouteTableFEE4B781"
8585
}
8686
},
8787
"DependsOn": [
@@ -103,15 +103,15 @@
103103
"VPCPublicSubnet1NATGatewayE0556630": {
104104
"Type": "AWS::EC2::NatGateway",
105105
"Properties": {
106-
"SubnetId": {
107-
"Ref": "VPCPublicSubnet1SubnetB4246D30"
108-
},
109106
"AllocationId": {
110107
"Fn::GetAtt": [
111108
"VPCPublicSubnet1EIP6AD938E8",
112109
"AllocationId"
113110
]
114111
},
112+
"SubnetId": {
113+
"Ref": "VPCPublicSubnet1SubnetB4246D30"
114+
},
115115
"Tags": [
116116
{
117117
"Key": "Name",
@@ -127,9 +127,6 @@
127127
"VPCPublicSubnet2Subnet74179F39": {
128128
"Type": "AWS::EC2::Subnet",
129129
"Properties": {
130-
"VpcId": {
131-
"Ref": "VPCB9E5F0B4"
132-
},
133130
"AvailabilityZone": {
134131
"Fn::Select": [
135132
1,
@@ -153,21 +150,24 @@
153150
"Key": "Name",
154151
"Value": "aws-cdk-docdb-cluster-rotation/VPC/PublicSubnet2"
155152
}
156-
]
153+
],
154+
"VpcId": {
155+
"Ref": "VPCB9E5F0B4"
156+
}
157157
}
158158
},
159159
"VPCPublicSubnet2RouteTable6F1A15F1": {
160160
"Type": "AWS::EC2::RouteTable",
161161
"Properties": {
162-
"VpcId": {
163-
"Ref": "VPCB9E5F0B4"
164-
},
165162
"Tags": [
166163
{
167164
"Key": "Name",
168165
"Value": "aws-cdk-docdb-cluster-rotation/VPC/PublicSubnet2"
169166
}
170-
]
167+
],
168+
"VpcId": {
169+
"Ref": "VPCB9E5F0B4"
170+
}
171171
}
172172
},
173173
"VPCPublicSubnet2RouteTableAssociation5A808732": {
@@ -184,12 +184,12 @@
184184
"VPCPublicSubnet2DefaultRouteB7481BBA": {
185185
"Type": "AWS::EC2::Route",
186186
"Properties": {
187-
"RouteTableId": {
188-
"Ref": "VPCPublicSubnet2RouteTable6F1A15F1"
189-
},
190187
"DestinationCidrBlock": "0.0.0.0/0",
191188
"GatewayId": {
192189
"Ref": "VPCIGWB7E252D3"
190+
},
191+
"RouteTableId": {
192+
"Ref": "VPCPublicSubnet2RouteTable6F1A15F1"
193193
}
194194
},
195195
"DependsOn": [
@@ -211,15 +211,15 @@
211211
"VPCPublicSubnet2NATGateway3C070193": {
212212
"Type": "AWS::EC2::NatGateway",
213213
"Properties": {
214-
"SubnetId": {
215-
"Ref": "VPCPublicSubnet2Subnet74179F39"
216-
},
217214
"AllocationId": {
218215
"Fn::GetAtt": [
219216
"VPCPublicSubnet2EIP4947BC00",
220217
"AllocationId"
221218
]
222219
},
220+
"SubnetId": {
221+
"Ref": "VPCPublicSubnet2Subnet74179F39"
222+
},
223223
"Tags": [
224224
{
225225
"Key": "Name",
@@ -235,9 +235,6 @@
235235
"VPCPrivateSubnet1Subnet8BCA10E0": {
236236
"Type": "AWS::EC2::Subnet",
237237
"Properties": {
238-
"VpcId": {
239-
"Ref": "VPCB9E5F0B4"
240-
},
241238
"AvailabilityZone": {
242239
"Fn::Select": [
243240
0,
@@ -261,21 +258,24 @@
261258
"Key": "Name",
262259
"Value": "aws-cdk-docdb-cluster-rotation/VPC/PrivateSubnet1"
263260
}
264-
]
261+
],
262+
"VpcId": {
263+
"Ref": "VPCB9E5F0B4"
264+
}
265265
}
266266
},
267267
"VPCPrivateSubnet1RouteTableBE8A6027": {
268268
"Type": "AWS::EC2::RouteTable",
269269
"Properties": {
270-
"VpcId": {
271-
"Ref": "VPCB9E5F0B4"
272-
},
273270
"Tags": [
274271
{
275272
"Key": "Name",
276273
"Value": "aws-cdk-docdb-cluster-rotation/VPC/PrivateSubnet1"
277274
}
278-
]
275+
],
276+
"VpcId": {
277+
"Ref": "VPCB9E5F0B4"
278+
}
279279
}
280280
},
281281
"VPCPrivateSubnet1RouteTableAssociation347902D1": {
@@ -292,21 +292,18 @@
292292
"VPCPrivateSubnet1DefaultRouteAE1D6490": {
293293
"Type": "AWS::EC2::Route",
294294
"Properties": {
295-
"RouteTableId": {
296-
"Ref": "VPCPrivateSubnet1RouteTableBE8A6027"
297-
},
298295
"DestinationCidrBlock": "0.0.0.0/0",
299296
"NatGatewayId": {
300297
"Ref": "VPCPublicSubnet1NATGatewayE0556630"
298+
},
299+
"RouteTableId": {
300+
"Ref": "VPCPrivateSubnet1RouteTableBE8A6027"
301301
}
302302
}
303303
},
304304
"VPCPrivateSubnet2SubnetCFCDAA7A": {
305305
"Type": "AWS::EC2::Subnet",
306306
"Properties": {
307-
"VpcId": {
308-
"Ref": "VPCB9E5F0B4"
309-
},
310307
"AvailabilityZone": {
311308
"Fn::Select": [
312309
1,
@@ -330,21 +327,24 @@
330327
"Key": "Name",
331328
"Value": "aws-cdk-docdb-cluster-rotation/VPC/PrivateSubnet2"
332329
}
333-
]
330+
],
331+
"VpcId": {
332+
"Ref": "VPCB9E5F0B4"
333+
}
334334
}
335335
},
336336
"VPCPrivateSubnet2RouteTable0A19E10E": {
337337
"Type": "AWS::EC2::RouteTable",
338338
"Properties": {
339-
"VpcId": {
340-
"Ref": "VPCB9E5F0B4"
341-
},
342339
"Tags": [
343340
{
344341
"Key": "Name",
345342
"Value": "aws-cdk-docdb-cluster-rotation/VPC/PrivateSubnet2"
346343
}
347-
]
344+
],
345+
"VpcId": {
346+
"Ref": "VPCB9E5F0B4"
347+
}
348348
}
349349
},
350350
"VPCPrivateSubnet2RouteTableAssociation0C73D413": {
@@ -361,12 +361,12 @@
361361
"VPCPrivateSubnet2DefaultRouteF4F5CFD2": {
362362
"Type": "AWS::EC2::Route",
363363
"Properties": {
364-
"RouteTableId": {
365-
"Ref": "VPCPrivateSubnet2RouteTable0A19E10E"
366-
},
367364
"DestinationCidrBlock": "0.0.0.0/0",
368365
"NatGatewayId": {
369366
"Ref": "VPCPublicSubnet2NATGateway3C070193"
367+
},
368+
"RouteTableId": {
369+
"Ref": "VPCPrivateSubnet2RouteTable0A19E10E"
370370
}
371371
}
372372
},
@@ -384,11 +384,11 @@
384384
"VPCVPCGW99B986DC": {
385385
"Type": "AWS::EC2::VPCGatewayAttachment",
386386
"Properties": {
387-
"VpcId": {
388-
"Ref": "VPCB9E5F0B4"
389-
},
390387
"InternetGatewayId": {
391388
"Ref": "VPCIGWB7E252D3"
389+
},
390+
"VpcId": {
391+
"Ref": "VPCB9E5F0B4"
392392
}
393393
}
394394
},
@@ -427,7 +427,6 @@
427427
"DatabaseSecurityGroupfromawscdkdocdbclusterrotationDatabaseRotationSingleUserSecurityGroupBF39D224IndirectPortE14845D7": {
428428
"Type": "AWS::EC2::SecurityGroupIngress",
429429
"Properties": {
430-
"IpProtocol": "tcp",
431430
"Description": "from awscdkdocdbclusterrotationDatabaseRotationSingleUserSecurityGroupBF39D224:{IndirectPort}",
432431
"FromPort": {
433432
"Fn::GetAtt": [
@@ -441,6 +440,7 @@
441440
"GroupId"
442441
]
443442
},
443+
"IpProtocol": "tcp",
444444
"SourceSecurityGroupId": {
445445
"Fn::GetAtt": [
446446
"DatabaseRotationSingleUserSecurityGroupAC6E0E73",
@@ -494,9 +494,6 @@
494494
"DatabaseSecretAttachmentRotationScheduleA4E9F034": {
495495
"Type": "AWS::SecretsManager::RotationSchedule",
496496
"Properties": {
497-
"SecretId": {
498-
"Ref": "DatabaseSecretAttachmentE5D1B020"
499-
},
500497
"RotationLambdaARN": {
501498
"Fn::GetAtt": [
502499
"DatabaseRotationSingleUser65F55654",
@@ -505,6 +502,9 @@
505502
},
506503
"RotationRules": {
507504
"AutomaticallyAfterDays": 30
505+
},
506+
"SecretId": {
507+
"Ref": "DatabaseSecretAttachmentE5D1B020"
508508
}
509509
}
510510
},
@@ -550,27 +550,27 @@
550550
"DBSubnetGroupName": {
551551
"Ref": "DatabaseSubnets56F17B9A"
552552
},
553-
"MasterUsername": {
553+
"MasterUserPassword": {
554554
"Fn::Join": [
555555
"",
556556
[
557557
"{{resolve:secretsmanager:",
558558
{
559559
"Ref": "DatabaseSecret3B817195"
560560
},
561-
":SecretString:username::}}"
561+
":SecretString:password::}}"
562562
]
563563
]
564564
},
565-
"MasterUserPassword": {
565+
"MasterUsername": {
566566
"Fn::Join": [
567567
"",
568568
[
569569
"{{resolve:secretsmanager:",
570570
{
571571
"Ref": "DatabaseSecret3B817195"
572572
},
573-
":SecretString:password::}}"
573+
":SecretString:username::}}"
574574
]
575575
]
576576
},
@@ -691,7 +691,7 @@
691691
"DatabaseRotationSingleUserSARMapping9AEB3E55": {
692692
"aws": {
693693
"applicationId": "arn:aws:serverlessrepo:us-east-1:297356227824:applications/SecretsManagerMongoDBRotationSingleUser",
694-
"semanticVersion": "1.1.225"
694+
"semanticVersion": "1.1.367"
695695
},
696696
"aws-cn": {
697697
"applicationId": "arn:aws-cn:serverlessrepo:cn-north-1:193023089310:applications/SecretsManagerMongoDBRotationSingleUser",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"30.1.0"}
1+
{"version":"34.0.0"}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "30.1.0",
2+
"version": "34.0.0",
33
"testCases": {
44
"integ.cluster-rotation.lit": {
55
"stacks": [

0 commit comments

Comments
 (0)