Skip to content

Commit 84d71a4

Browse files
go-to-kgo-to-k
authored
chore(rds): deprecate aurora mysql version 1 for mysql 5.6 (#31551)
### Reason for this change Aurora MySQL version 1 for MySQL 5.6 is deprecated now. https://docs.aws.amazon.com/AmazonRDS/latest/AuroraMySQLReleaseNotes/AuroraMySQL.Updates.11Updates.html ### Description of changes Deprecated the version and no longer use the version in integ tests. ### Description of how you validated changes ### 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*
1 parent 40f07ae commit 84d71a4

34 files changed

+1337
-976
lines changed

‎packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/aws-cdk-rds-cluster-dual-integ.assets.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/aws-cdk-rds-cluster-dual-integ.template.json

+49-49
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
"VPCPublicSubnet1SubnetB4246D30": {
1919
"Type": "AWS::EC2::Subnet",
2020
"Properties": {
21-
"VpcId": {
22-
"Ref": "VPCB9E5F0B4"
23-
},
2421
"AvailabilityZone": {
2522
"Fn::Select": [
2623
0,
@@ -44,21 +41,24 @@
4441
"Key": "Name",
4542
"Value": "aws-cdk-rds-cluster-dual-integ/VPC/PublicSubnet1"
4643
}
47-
]
44+
],
45+
"VpcId": {
46+
"Ref": "VPCB9E5F0B4"
47+
}
4848
}
4949
},
5050
"VPCPublicSubnet1RouteTableFEE4B781": {
5151
"Type": "AWS::EC2::RouteTable",
5252
"Properties": {
53-
"VpcId": {
54-
"Ref": "VPCB9E5F0B4"
55-
},
5653
"Tags": [
5754
{
5855
"Key": "Name",
5956
"Value": "aws-cdk-rds-cluster-dual-integ/VPC/PublicSubnet1"
6057
}
61-
]
58+
],
59+
"VpcId": {
60+
"Ref": "VPCB9E5F0B4"
61+
}
6262
}
6363
},
6464
"VPCPublicSubnet1RouteTableAssociation0B0896DC": {
@@ -75,12 +75,12 @@
7575
"VPCPublicSubnet1DefaultRoute91CEF279": {
7676
"Type": "AWS::EC2::Route",
7777
"Properties": {
78-
"RouteTableId": {
79-
"Ref": "VPCPublicSubnet1RouteTableFEE4B781"
80-
},
8178
"DestinationCidrBlock": "0.0.0.0/0",
8279
"GatewayId": {
8380
"Ref": "VPCIGWB7E252D3"
81+
},
82+
"RouteTableId": {
83+
"Ref": "VPCPublicSubnet1RouteTableFEE4B781"
8484
}
8585
},
8686
"DependsOn": [
@@ -90,9 +90,6 @@
9090
"VPCPublicSubnet2Subnet74179F39": {
9191
"Type": "AWS::EC2::Subnet",
9292
"Properties": {
93-
"VpcId": {
94-
"Ref": "VPCB9E5F0B4"
95-
},
9693
"AvailabilityZone": {
9794
"Fn::Select": [
9895
1,
@@ -116,21 +113,24 @@
116113
"Key": "Name",
117114
"Value": "aws-cdk-rds-cluster-dual-integ/VPC/PublicSubnet2"
118115
}
119-
]
116+
],
117+
"VpcId": {
118+
"Ref": "VPCB9E5F0B4"
119+
}
120120
}
121121
},
122122
"VPCPublicSubnet2RouteTable6F1A15F1": {
123123
"Type": "AWS::EC2::RouteTable",
124124
"Properties": {
125-
"VpcId": {
126-
"Ref": "VPCB9E5F0B4"
127-
},
128125
"Tags": [
129126
{
130127
"Key": "Name",
131128
"Value": "aws-cdk-rds-cluster-dual-integ/VPC/PublicSubnet2"
132129
}
133-
]
130+
],
131+
"VpcId": {
132+
"Ref": "VPCB9E5F0B4"
133+
}
134134
}
135135
},
136136
"VPCPublicSubnet2RouteTableAssociation5A808732": {
@@ -147,12 +147,12 @@
147147
"VPCPublicSubnet2DefaultRouteB7481BBA": {
148148
"Type": "AWS::EC2::Route",
149149
"Properties": {
150-
"RouteTableId": {
151-
"Ref": "VPCPublicSubnet2RouteTable6F1A15F1"
152-
},
153150
"DestinationCidrBlock": "0.0.0.0/0",
154151
"GatewayId": {
155152
"Ref": "VPCIGWB7E252D3"
153+
},
154+
"RouteTableId": {
155+
"Ref": "VPCPublicSubnet2RouteTable6F1A15F1"
156156
}
157157
},
158158
"DependsOn": [
@@ -162,9 +162,6 @@
162162
"VPCIsolatedSubnet1SubnetEBD00FC6": {
163163
"Type": "AWS::EC2::Subnet",
164164
"Properties": {
165-
"VpcId": {
166-
"Ref": "VPCB9E5F0B4"
167-
},
168165
"AvailabilityZone": {
169166
"Fn::Select": [
170167
0,
@@ -210,7 +207,10 @@
210207
"Key": "Name",
211208
"Value": "aws-cdk-rds-cluster-dual-integ/VPC/IsolatedSubnet1"
212209
}
213-
]
210+
],
211+
"VpcId": {
212+
"Ref": "VPCB9E5F0B4"
213+
}
214214
},
215215
"DependsOn": [
216216
"Ipv6CidrBlock"
@@ -219,15 +219,15 @@
219219
"VPCIsolatedSubnet1RouteTableEB156210": {
220220
"Type": "AWS::EC2::RouteTable",
221221
"Properties": {
222-
"VpcId": {
223-
"Ref": "VPCB9E5F0B4"
224-
},
225222
"Tags": [
226223
{
227224
"Key": "Name",
228225
"Value": "aws-cdk-rds-cluster-dual-integ/VPC/IsolatedSubnet1"
229226
}
230-
]
227+
],
228+
"VpcId": {
229+
"Ref": "VPCB9E5F0B4"
230+
}
231231
}
232232
},
233233
"VPCIsolatedSubnet1RouteTableAssociationA2D18F7C": {
@@ -244,9 +244,6 @@
244244
"VPCIsolatedSubnet2Subnet4B1C8CAA": {
245245
"Type": "AWS::EC2::Subnet",
246246
"Properties": {
247-
"VpcId": {
248-
"Ref": "VPCB9E5F0B4"
249-
},
250247
"AvailabilityZone": {
251248
"Fn::Select": [
252249
1,
@@ -292,7 +289,10 @@
292289
"Key": "Name",
293290
"Value": "aws-cdk-rds-cluster-dual-integ/VPC/IsolatedSubnet2"
294291
}
295-
]
292+
],
293+
"VpcId": {
294+
"Ref": "VPCB9E5F0B4"
295+
}
296296
},
297297
"DependsOn": [
298298
"Ipv6CidrBlock"
@@ -301,15 +301,15 @@
301301
"VPCIsolatedSubnet2RouteTable9B4F78DC": {
302302
"Type": "AWS::EC2::RouteTable",
303303
"Properties": {
304-
"VpcId": {
305-
"Ref": "VPCB9E5F0B4"
306-
},
307304
"Tags": [
308305
{
309306
"Key": "Name",
310307
"Value": "aws-cdk-rds-cluster-dual-integ/VPC/IsolatedSubnet2"
311308
}
312-
]
309+
],
310+
"VpcId": {
311+
"Ref": "VPCB9E5F0B4"
312+
}
313313
}
314314
},
315315
"VPCIsolatedSubnet2RouteTableAssociation7BF8E0EB": {
@@ -337,21 +337,21 @@
337337
"VPCVPCGW99B986DC": {
338338
"Type": "AWS::EC2::VPCGatewayAttachment",
339339
"Properties": {
340-
"VpcId": {
341-
"Ref": "VPCB9E5F0B4"
342-
},
343340
"InternetGatewayId": {
344341
"Ref": "VPCIGWB7E252D3"
342+
},
343+
"VpcId": {
344+
"Ref": "VPCB9E5F0B4"
345345
}
346346
}
347347
},
348348
"Ipv6CidrBlock": {
349349
"Type": "AWS::EC2::VPCCidrBlock",
350350
"Properties": {
351+
"AmazonProvidedIpv6CidrBlock": true,
351352
"VpcId": {
352353
"Ref": "VPCB9E5F0B4"
353-
},
354-
"AmazonProvidedIpv6CidrBlock": true
354+
}
355355
}
356356
},
357357
"DualstackClusterSubnets00EA466E": {
@@ -387,15 +387,15 @@
387387
"DualstackCluster84A5FE37": {
388388
"Type": "AWS::RDS::DBCluster",
389389
"Properties": {
390-
"Engine": "aurora-mysql",
391390
"CopyTagsToSnapshot": true,
392391
"DBClusterParameterGroupName": "default.aurora-mysql8.0",
393392
"DBSubnetGroupName": {
394393
"Ref": "DualstackClusterSubnets00EA466E"
395394
},
396-
"EngineVersion": "8.0.mysql_aurora.3.02.0",
397-
"MasterUsername": "admin",
395+
"Engine": "aurora-mysql",
396+
"EngineVersion": "8.0.mysql_aurora.3.07.1",
398397
"MasterUserPassword": "7959866cacc02c2d243ecfe177464fe6",
398+
"MasterUsername": "admin",
399399
"NetworkType": "DUAL",
400400
"VpcSecurityGroupIds": [
401401
{
@@ -482,15 +482,15 @@
482482
"Ipv4Cluster5F67A28A": {
483483
"Type": "AWS::RDS::DBCluster",
484484
"Properties": {
485-
"Engine": "aurora-mysql",
486485
"CopyTagsToSnapshot": true,
487486
"DBClusterParameterGroupName": "default.aurora-mysql8.0",
488487
"DBSubnetGroupName": {
489488
"Ref": "Ipv4ClusterSubnets5BD573AA"
490489
},
491-
"EngineVersion": "8.0.mysql_aurora.3.02.0",
492-
"MasterUsername": "admin",
490+
"Engine": "aurora-mysql",
491+
"EngineVersion": "8.0.mysql_aurora.3.07.1",
493492
"MasterUserPassword": "7959866cacc02c2d243ecfe177464fe6",
493+
"MasterUsername": "admin",
494494
"NetworkType": "IPV4",
495495
"VpcSecurityGroupIds": [
496496
{

‎packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/cdk.out

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/clusterdualtestDefaultTestDeployAssert0AE5E6E0.assets.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/integ.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/manifest.json

+12-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)