diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/aws-cdk-rds-cluster-dual-integ.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/aws-cdk-rds-cluster-dual-integ.assets.json index 87fa48f1eb396..426ce130e199d 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/aws-cdk-rds-cluster-dual-integ.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/aws-cdk-rds-cluster-dual-integ.assets.json @@ -1,7 +1,7 @@ { - "version": "21.0.0", + "version": "38.0.1", "files": { - "b5ff1147ce210b6a8be6120310d71e1a1bcb6c64b802b268e0b994bb80eb9ced": { + "dbd5d6a0f3582d84865769f5d7617584fba74273fd78e719bc712c7b49f4a8e6": { "source": { "path": "aws-cdk-rds-cluster-dual-integ.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "b5ff1147ce210b6a8be6120310d71e1a1bcb6c64b802b268e0b994bb80eb9ced.json", + "objectKey": "dbd5d6a0f3582d84865769f5d7617584fba74273fd78e719bc712c7b49f4a8e6.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/aws-cdk-rds-cluster-dual-integ.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/aws-cdk-rds-cluster-dual-integ.template.json index cfde25cc3bfff..985e68dee1a82 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/aws-cdk-rds-cluster-dual-integ.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/aws-cdk-rds-cluster-dual-integ.template.json @@ -18,9 +18,6 @@ "VPCPublicSubnet1SubnetB4246D30": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "VPCB9E5F0B4" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -44,21 +41,24 @@ "Key": "Name", "Value": "aws-cdk-rds-cluster-dual-integ/VPC/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "VPCPublicSubnet1RouteTableFEE4B781": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "VPCB9E5F0B4" - }, "Tags": [ { "Key": "Name", "Value": "aws-cdk-rds-cluster-dual-integ/VPC/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "VPCPublicSubnet1RouteTableAssociation0B0896DC": { @@ -75,12 +75,12 @@ "VPCPublicSubnet1DefaultRoute91CEF279": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VPCPublicSubnet1RouteTableFEE4B781" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VPCIGWB7E252D3" + }, + "RouteTableId": { + "Ref": "VPCPublicSubnet1RouteTableFEE4B781" } }, "DependsOn": [ @@ -90,9 +90,6 @@ "VPCPublicSubnet2Subnet74179F39": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "VPCB9E5F0B4" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -116,21 +113,24 @@ "Key": "Name", "Value": "aws-cdk-rds-cluster-dual-integ/VPC/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "VPCPublicSubnet2RouteTable6F1A15F1": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "VPCB9E5F0B4" - }, "Tags": [ { "Key": "Name", "Value": "aws-cdk-rds-cluster-dual-integ/VPC/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "VPCPublicSubnet2RouteTableAssociation5A808732": { @@ -147,12 +147,12 @@ "VPCPublicSubnet2DefaultRouteB7481BBA": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VPCIGWB7E252D3" + }, + "RouteTableId": { + "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" } }, "DependsOn": [ @@ -162,9 +162,6 @@ "VPCIsolatedSubnet1SubnetEBD00FC6": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "VPCB9E5F0B4" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -210,7 +207,10 @@ "Key": "Name", "Value": "aws-cdk-rds-cluster-dual-integ/VPC/IsolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } }, "DependsOn": [ "Ipv6CidrBlock" @@ -219,15 +219,15 @@ "VPCIsolatedSubnet1RouteTableEB156210": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "VPCB9E5F0B4" - }, "Tags": [ { "Key": "Name", "Value": "aws-cdk-rds-cluster-dual-integ/VPC/IsolatedSubnet1" } - ] + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "VPCIsolatedSubnet1RouteTableAssociationA2D18F7C": { @@ -244,9 +244,6 @@ "VPCIsolatedSubnet2Subnet4B1C8CAA": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "VPCB9E5F0B4" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -292,7 +289,10 @@ "Key": "Name", "Value": "aws-cdk-rds-cluster-dual-integ/VPC/IsolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } }, "DependsOn": [ "Ipv6CidrBlock" @@ -301,15 +301,15 @@ "VPCIsolatedSubnet2RouteTable9B4F78DC": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "VPCB9E5F0B4" - }, "Tags": [ { "Key": "Name", "Value": "aws-cdk-rds-cluster-dual-integ/VPC/IsolatedSubnet2" } - ] + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "VPCIsolatedSubnet2RouteTableAssociation7BF8E0EB": { @@ -337,21 +337,21 @@ "VPCVPCGW99B986DC": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "VPCB9E5F0B4" - }, "InternetGatewayId": { "Ref": "VPCIGWB7E252D3" + }, + "VpcId": { + "Ref": "VPCB9E5F0B4" } } }, "Ipv6CidrBlock": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { + "AmazonProvidedIpv6CidrBlock": true, "VpcId": { "Ref": "VPCB9E5F0B4" - }, - "AmazonProvidedIpv6CidrBlock": true + } } }, "DualstackClusterSubnets00EA466E": { @@ -387,15 +387,15 @@ "DualstackCluster84A5FE37": { "Type": "AWS::RDS::DBCluster", "Properties": { - "Engine": "aurora-mysql", "CopyTagsToSnapshot": true, "DBClusterParameterGroupName": "default.aurora-mysql8.0", "DBSubnetGroupName": { "Ref": "DualstackClusterSubnets00EA466E" }, - "EngineVersion": "8.0.mysql_aurora.3.02.0", - "MasterUsername": "admin", + "Engine": "aurora-mysql", + "EngineVersion": "8.0.mysql_aurora.3.07.1", "MasterUserPassword": "7959866cacc02c2d243ecfe177464fe6", + "MasterUsername": "admin", "NetworkType": "DUAL", "VpcSecurityGroupIds": [ { @@ -482,15 +482,15 @@ "Ipv4Cluster5F67A28A": { "Type": "AWS::RDS::DBCluster", "Properties": { - "Engine": "aurora-mysql", "CopyTagsToSnapshot": true, "DBClusterParameterGroupName": "default.aurora-mysql8.0", "DBSubnetGroupName": { "Ref": "Ipv4ClusterSubnets5BD573AA" }, - "EngineVersion": "8.0.mysql_aurora.3.02.0", - "MasterUsername": "admin", + "Engine": "aurora-mysql", + "EngineVersion": "8.0.mysql_aurora.3.07.1", "MasterUserPassword": "7959866cacc02c2d243ecfe177464fe6", + "MasterUsername": "admin", "NetworkType": "IPV4", "VpcSecurityGroupIds": [ { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/cdk.out index 8ecc185e9dbee..c6e612584e352 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"21.0.0"} \ No newline at end of file +{"version":"38.0.1"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/clusterdualtestDefaultTestDeployAssert0AE5E6E0.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/clusterdualtestDefaultTestDeployAssert0AE5E6E0.assets.json index 60240c020964e..22335fd7e84ad 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/clusterdualtestDefaultTestDeployAssert0AE5E6E0.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/clusterdualtestDefaultTestDeployAssert0AE5E6E0.assets.json @@ -1,5 +1,5 @@ { - "version": "21.0.0", + "version": "38.0.1", "files": { "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { "source": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/integ.json index a391b0563d807..430b55aa8c644 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/integ.json @@ -1,5 +1,5 @@ { - "version": "21.0.0", + "version": "38.0.1", "testCases": { "cluster-dual-test/DefaultTest": { "stacks": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/manifest.json index 9202aaaf9bb29..a5cb27a95bd66 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/manifest.json @@ -1,12 +1,6 @@ { - "version": "21.0.0", + "version": "38.0.1", "artifacts": { - "Tree": { - "type": "cdk:tree", - "properties": { - "file": "tree.json" - } - }, "aws-cdk-rds-cluster-dual-integ.assets": { "type": "cdk:asset-manifest", "properties": { @@ -20,10 +14,12 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "aws-cdk-rds-cluster-dual-integ.template.json", + "terminationProtection": false, "validateOnSynth": false, + "notificationArns": [], "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}/b5ff1147ce210b6a8be6120310d71e1a1bcb6c64b802b268e0b994bb80eb9ced.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/dbd5d6a0f3582d84865769f5d7617584fba74273fd78e719bc712c7b49f4a8e6.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -235,7 +231,9 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "clusterdualtestDefaultTestDeployAssert0AE5E6E0.template.json", + "terminationProtection": false, "validateOnSynth": false, + "notificationArns": [], "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}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", @@ -268,6 +266,12 @@ ] }, "displayName": "cluster-dual-test/DefaultTest/DeployAssert" + }, + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } } } } \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/tree.json index abf7114feab7f..42eb77cce9ef8 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.js.snapshot/tree.json @@ -4,14 +4,6 @@ "id": "App", "path": "", "children": { - "Tree": { - "id": "Tree", - "path": "Tree", - "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.1.133" - } - }, "aws-cdk-rds-cluster-dual-integ": { "id": "aws-cdk-rds-cluster-dual-integ", "path": "aws-cdk-rds-cluster-dual-integ", @@ -39,7 +31,7 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnVPC", + "fqn": "aws-cdk-lib.aws_ec2.CfnVPC", "version": "0.0.0" } }, @@ -53,9 +45,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -79,11 +68,14 @@ "key": "Name", "value": "aws-cdk-rds-cluster-dual-integ/VPC/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", "version": "0.0.0" } }, @@ -91,7 +83,7 @@ "id": "Acl", "path": "aws-cdk-rds-cluster-dual-integ/VPC/PublicSubnet1/Acl", "constructInfo": { - "fqn": "@aws-cdk/core.Resource", + "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" } }, @@ -101,19 +93,19 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, "tags": [ { "key": "Name", "value": "aws-cdk-rds-cluster-dual-integ/VPC/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", "version": "0.0.0" } }, @@ -132,7 +124,7 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnetRouteTableAssociation", + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", "version": "0.0.0" } }, @@ -142,23 +134,23 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VPCPublicSubnet1RouteTableFEE4B781" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VPCIGWB7E252D3" + }, + "routeTableId": { + "Ref": "VPCPublicSubnet1RouteTableFEE4B781" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRoute", + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PublicSubnet", + "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", "version": "0.0.0" } }, @@ -172,9 +164,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -198,11 +187,14 @@ "key": "Name", "value": "aws-cdk-rds-cluster-dual-integ/VPC/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", "version": "0.0.0" } }, @@ -210,7 +202,7 @@ "id": "Acl", "path": "aws-cdk-rds-cluster-dual-integ/VPC/PublicSubnet2/Acl", "constructInfo": { - "fqn": "@aws-cdk/core.Resource", + "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" } }, @@ -220,19 +212,19 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, "tags": [ { "key": "Name", "value": "aws-cdk-rds-cluster-dual-integ/VPC/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", "version": "0.0.0" } }, @@ -251,7 +243,7 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnetRouteTableAssociation", + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", "version": "0.0.0" } }, @@ -261,23 +253,23 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VPCIGWB7E252D3" + }, + "routeTableId": { + "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRoute", + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PublicSubnet", + "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", "version": "0.0.0" } }, @@ -291,9 +283,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -339,11 +328,14 @@ "key": "Name", "value": "aws-cdk-rds-cluster-dual-integ/VPC/IsolatedSubnet1" } - ] + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", "version": "0.0.0" } }, @@ -351,7 +343,7 @@ "id": "Acl", "path": "aws-cdk-rds-cluster-dual-integ/VPC/IsolatedSubnet1/Acl", "constructInfo": { - "fqn": "@aws-cdk/core.Resource", + "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" } }, @@ -361,19 +353,19 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, "tags": [ { "key": "Name", "value": "aws-cdk-rds-cluster-dual-integ/VPC/IsolatedSubnet1" } - ] + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", "version": "0.0.0" } }, @@ -392,13 +384,13 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnetRouteTableAssociation", + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PrivateSubnet", + "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", "version": "0.0.0" } }, @@ -412,9 +404,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -460,11 +449,14 @@ "key": "Name", "value": "aws-cdk-rds-cluster-dual-integ/VPC/IsolatedSubnet2" } - ] + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", "version": "0.0.0" } }, @@ -472,7 +464,7 @@ "id": "Acl", "path": "aws-cdk-rds-cluster-dual-integ/VPC/IsolatedSubnet2/Acl", "constructInfo": { - "fqn": "@aws-cdk/core.Resource", + "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" } }, @@ -482,19 +474,19 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, "tags": [ { "key": "Name", "value": "aws-cdk-rds-cluster-dual-integ/VPC/IsolatedSubnet2" } - ] + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", "version": "0.0.0" } }, @@ -513,13 +505,13 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnetRouteTableAssociation", + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PrivateSubnet", + "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", "version": "0.0.0" } }, @@ -538,7 +530,7 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnInternetGateway", + "fqn": "aws-cdk-lib.aws_ec2.CfnInternetGateway", "version": "0.0.0" } }, @@ -548,22 +540,22 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, "internetGatewayId": { "Ref": "VPCIGWB7E252D3" + }, + "vpcId": { + "Ref": "VPCB9E5F0B4" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnVPCGatewayAttachment", + "fqn": "aws-cdk-lib.aws_ec2.CfnVPCGatewayAttachment", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.Vpc", + "fqn": "aws-cdk-lib.aws_ec2.Vpc", "version": "0.0.0" } }, @@ -573,14 +565,14 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCCidrBlock", "aws:cdk:cloudformation:props": { + "amazonProvidedIpv6CidrBlock": true, "vpcId": { "Ref": "VPCB9E5F0B4" - }, - "amazonProvidedIpv6CidrBlock": true + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnVPCCidrBlock", + "fqn": "aws-cdk-lib.aws_ec2.CfnVPCCidrBlock", "version": "0.0.0" } }, @@ -610,13 +602,13 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBSubnetGroup", + "fqn": "aws-cdk-lib.aws_rds.CfnDBSubnetGroup", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.SubnetGroup", + "fqn": "aws-cdk-lib.aws_rds.SubnetGroup", "version": "0.0.0" } }, @@ -644,13 +636,13 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSecurityGroup", + "fqn": "aws-cdk-lib.aws_ec2.CfnSecurityGroup", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.SecurityGroup", + "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", "version": "0.0.0" } }, @@ -658,7 +650,7 @@ "id": "AuroraMySqlDatabaseClusterEngineDefaultParameterGroup", "path": "aws-cdk-rds-cluster-dual-integ/DualstackCluster/AuroraMySqlDatabaseClusterEngineDefaultParameterGroup", "constructInfo": { - "fqn": "@aws-cdk/core.Resource", + "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" } }, @@ -668,13 +660,13 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::RDS::DBCluster", "aws:cdk:cloudformation:props": { - "engine": "aurora-mysql", "copyTagsToSnapshot": true, "dbClusterParameterGroupName": "default.aurora-mysql8.0", "dbSubnetGroupName": { "Ref": "DualstackClusterSubnets00EA466E" }, - "engineVersion": "8.0.mysql_aurora.3.02.0", + "engine": "aurora-mysql", + "engineVersion": "8.0.mysql_aurora.3.07.1", "masterUsername": "admin", "masterUserPassword": "7959866cacc02c2d243ecfe177464fe6", "networkType": "DUAL", @@ -689,7 +681,15 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBCluster", + "fqn": "aws-cdk-lib.aws_rds.CfnDBCluster", + "version": "0.0.0" + } + }, + "Instance1Wrapper": { + "id": "Instance1Wrapper", + "path": "aws-cdk-rds-cluster-dual-integ/DualstackCluster/Instance1Wrapper", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" } }, @@ -711,7 +711,15 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBInstance", + "fqn": "aws-cdk-lib.aws_rds.CfnDBInstance", + "version": "0.0.0" + } + }, + "Instance2Wrapper": { + "id": "Instance2Wrapper", + "path": "aws-cdk-rds-cluster-dual-integ/DualstackCluster/Instance2Wrapper", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" } }, @@ -733,13 +741,13 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBInstance", + "fqn": "aws-cdk-lib.aws_rds.CfnDBInstance", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.DatabaseCluster", + "fqn": "aws-cdk-lib.aws_rds.DatabaseCluster", "version": "0.0.0" } }, @@ -769,13 +777,13 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBSubnetGroup", + "fqn": "aws-cdk-lib.aws_rds.CfnDBSubnetGroup", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.SubnetGroup", + "fqn": "aws-cdk-lib.aws_rds.SubnetGroup", "version": "0.0.0" } }, @@ -803,13 +811,13 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSecurityGroup", + "fqn": "aws-cdk-lib.aws_ec2.CfnSecurityGroup", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.SecurityGroup", + "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", "version": "0.0.0" } }, @@ -817,7 +825,7 @@ "id": "AuroraMySqlDatabaseClusterEngineDefaultParameterGroup", "path": "aws-cdk-rds-cluster-dual-integ/Ipv4Cluster/AuroraMySqlDatabaseClusterEngineDefaultParameterGroup", "constructInfo": { - "fqn": "@aws-cdk/core.Resource", + "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" } }, @@ -827,13 +835,13 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::RDS::DBCluster", "aws:cdk:cloudformation:props": { - "engine": "aurora-mysql", "copyTagsToSnapshot": true, "dbClusterParameterGroupName": "default.aurora-mysql8.0", "dbSubnetGroupName": { "Ref": "Ipv4ClusterSubnets5BD573AA" }, - "engineVersion": "8.0.mysql_aurora.3.02.0", + "engine": "aurora-mysql", + "engineVersion": "8.0.mysql_aurora.3.07.1", "masterUsername": "admin", "masterUserPassword": "7959866cacc02c2d243ecfe177464fe6", "networkType": "IPV4", @@ -848,7 +856,15 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBCluster", + "fqn": "aws-cdk-lib.aws_rds.CfnDBCluster", + "version": "0.0.0" + } + }, + "Instance1Wrapper": { + "id": "Instance1Wrapper", + "path": "aws-cdk-rds-cluster-dual-integ/Ipv4Cluster/Instance1Wrapper", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" } }, @@ -870,7 +886,15 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBInstance", + "fqn": "aws-cdk-lib.aws_rds.CfnDBInstance", + "version": "0.0.0" + } + }, + "Instance2Wrapper": { + "id": "Instance2Wrapper", + "path": "aws-cdk-rds-cluster-dual-integ/Ipv4Cluster/Instance2Wrapper", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" } }, @@ -892,19 +916,35 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBInstance", + "fqn": "aws-cdk-lib.aws_rds.CfnDBInstance", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.DatabaseCluster", + "fqn": "aws-cdk-lib.aws_rds.DatabaseCluster", + "version": "0.0.0" + } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "aws-cdk-rds-cluster-dual-integ/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "aws-cdk-rds-cluster-dual-integ/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/core.Stack", + "fqn": "aws-cdk-lib.Stack", "version": "0.0.0" } }, @@ -921,32 +961,58 @@ "path": "cluster-dual-test/DefaultTest/Default", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.133" + "version": "10.3.0" } }, "DeployAssert": { "id": "DeployAssert", "path": "cluster-dual-test/DefaultTest/DeployAssert", + "children": { + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "cluster-dual-test/DefaultTest/DeployAssert/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "cluster-dual-test/DefaultTest/DeployAssert/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" + } + } + }, "constructInfo": { - "fqn": "@aws-cdk/core.Stack", + "fqn": "aws-cdk-lib.Stack", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/integ-tests.IntegTestCase", + "fqn": "@aws-cdk/integ-tests-alpha.IntegTestCase", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/integ-tests.IntegTest", + "fqn": "@aws-cdk/integ-tests-alpha.IntegTest", "version": "0.0.0" } + }, + "Tree": { + "id": "Tree", + "path": "Tree", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" + } } }, "constructInfo": { - "fqn": "@aws-cdk/core.App", + "fqn": "aws-cdk-lib.App", "version": "0.0.0" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.ts index 43284a1aa796e..d513cc1de69aa 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.ts +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-dual.ts @@ -19,7 +19,7 @@ const instanceProps = { isFromLegacyInstanceProps: true, }; new rds.DatabaseCluster(stack, 'DualstackCluster', { - engine: rds.DatabaseClusterEngine.auroraMysql({ version: rds.AuroraMysqlEngineVersion.VER_3_02_0 }), + engine: rds.DatabaseClusterEngine.auroraMysql({ version: rds.AuroraMysqlEngineVersion.VER_3_07_1 }), credentials: rds.Credentials.fromUsername('admin', { password: cdk.SecretValue.unsafePlainText('7959866cacc02c2d243ecfe177464fe6') }), writer: rds.ClusterInstance.provisioned('Instance1', { ...instanceProps, @@ -36,7 +36,7 @@ new rds.DatabaseCluster(stack, 'DualstackCluster', { }); new rds.DatabaseCluster(stack, 'Ipv4Cluster', { - engine: rds.DatabaseClusterEngine.auroraMysql({ version: rds.AuroraMysqlEngineVersion.VER_3_02_0 }), + engine: rds.DatabaseClusterEngine.auroraMysql({ version: rds.AuroraMysqlEngineVersion.VER_3_07_1 }), credentials: rds.Credentials.fromUsername('admin', { password: cdk.SecretValue.unsafePlainText('7959866cacc02c2d243ecfe177464fe6') }), vpcSubnets: { subnetType: ec2.SubnetType.PRIVATE_ISOLATED }, vpc, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/aws-cdk-rds-s3-mysql-8-integ.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/aws-cdk-rds-s3-mysql-8-integ.assets.json index 430b13a84ce1f..78cc7754677e1 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/aws-cdk-rds-s3-mysql-8-integ.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/aws-cdk-rds-s3-mysql-8-integ.assets.json @@ -1,7 +1,7 @@ { - "version": "21.0.0", + "version": "38.0.1", "files": { - "25234cf4a3c5d1399adfab4811db12cbab88f9459af99963277edcbbd40e815a": { + "676d23dff56b422a575548cc174c8f1a3e03eaa433e1b6e924a96c6aa9677c7a": { "source": { "path": "aws-cdk-rds-s3-mysql-8-integ.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "25234cf4a3c5d1399adfab4811db12cbab88f9459af99963277edcbbd40e815a.json", + "objectKey": "676d23dff56b422a575548cc174c8f1a3e03eaa433e1b6e924a96c6aa9677c7a.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/aws-cdk-rds-s3-mysql-8-integ.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/aws-cdk-rds-s3-mysql-8-integ.template.json index 2ac33a1ea212d..18779e37f171c 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/aws-cdk-rds-s3-mysql-8-integ.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/aws-cdk-rds-s3-mysql-8-integ.template.json @@ -18,9 +18,6 @@ "VPCPublicSubnet1SubnetB4246D30": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "VPCB9E5F0B4" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -44,21 +41,24 @@ "Key": "Name", "Value": "aws-cdk-rds-s3-mysql-8-integ/VPC/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "VPCPublicSubnet1RouteTableFEE4B781": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "VPCB9E5F0B4" - }, "Tags": [ { "Key": "Name", "Value": "aws-cdk-rds-s3-mysql-8-integ/VPC/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "VPCPublicSubnet1RouteTableAssociation0B0896DC": { @@ -75,12 +75,12 @@ "VPCPublicSubnet1DefaultRoute91CEF279": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VPCPublicSubnet1RouteTableFEE4B781" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VPCIGWB7E252D3" + }, + "RouteTableId": { + "Ref": "VPCPublicSubnet1RouteTableFEE4B781" } }, "DependsOn": [ @@ -102,15 +102,15 @@ "VPCPublicSubnet1NATGatewayE0556630": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VPCPublicSubnet1SubnetB4246D30" - }, "AllocationId": { "Fn::GetAtt": [ "VPCPublicSubnet1EIP6AD938E8", "AllocationId" ] }, + "SubnetId": { + "Ref": "VPCPublicSubnet1SubnetB4246D30" + }, "Tags": [ { "Key": "Name", @@ -126,9 +126,6 @@ "VPCPublicSubnet2Subnet74179F39": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "VPCB9E5F0B4" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -152,21 +149,24 @@ "Key": "Name", "Value": "aws-cdk-rds-s3-mysql-8-integ/VPC/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "VPCPublicSubnet2RouteTable6F1A15F1": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "VPCB9E5F0B4" - }, "Tags": [ { "Key": "Name", "Value": "aws-cdk-rds-s3-mysql-8-integ/VPC/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "VPCPublicSubnet2RouteTableAssociation5A808732": { @@ -183,12 +183,12 @@ "VPCPublicSubnet2DefaultRouteB7481BBA": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VPCIGWB7E252D3" + }, + "RouteTableId": { + "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" } }, "DependsOn": [ @@ -210,15 +210,15 @@ "VPCPublicSubnet2NATGateway3C070193": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VPCPublicSubnet2Subnet74179F39" - }, "AllocationId": { "Fn::GetAtt": [ "VPCPublicSubnet2EIP4947BC00", "AllocationId" ] }, + "SubnetId": { + "Ref": "VPCPublicSubnet2Subnet74179F39" + }, "Tags": [ { "Key": "Name", @@ -234,9 +234,6 @@ "VPCPrivateSubnet1Subnet8BCA10E0": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "VPCB9E5F0B4" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -260,21 +257,24 @@ "Key": "Name", "Value": "aws-cdk-rds-s3-mysql-8-integ/VPC/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "VPCPrivateSubnet1RouteTableBE8A6027": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "VPCB9E5F0B4" - }, "Tags": [ { "Key": "Name", "Value": "aws-cdk-rds-s3-mysql-8-integ/VPC/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "VPCPrivateSubnet1RouteTableAssociation347902D1": { @@ -291,21 +291,18 @@ "VPCPrivateSubnet1DefaultRouteAE1D6490": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VPCPrivateSubnet1RouteTableBE8A6027" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VPCPublicSubnet1NATGatewayE0556630" + }, + "RouteTableId": { + "Ref": "VPCPrivateSubnet1RouteTableBE8A6027" } } }, "VPCPrivateSubnet2SubnetCFCDAA7A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "VPCB9E5F0B4" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -329,21 +326,24 @@ "Key": "Name", "Value": "aws-cdk-rds-s3-mysql-8-integ/VPC/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "VPCPrivateSubnet2RouteTable0A19E10E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "VPCB9E5F0B4" - }, "Tags": [ { "Key": "Name", "Value": "aws-cdk-rds-s3-mysql-8-integ/VPC/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "VPCPrivateSubnet2RouteTableAssociation0C73D413": { @@ -360,12 +360,12 @@ "VPCPrivateSubnet2DefaultRouteF4F5CFD2": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VPCPrivateSubnet2RouteTable0A19E10E" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VPCPublicSubnet2NATGateway3C070193" + }, + "RouteTableId": { + "Ref": "VPCPrivateSubnet2RouteTable0A19E10E" } } }, @@ -383,11 +383,11 @@ "VPCVPCGW99B986DC": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "VPCB9E5F0B4" - }, "InternetGatewayId": { "Ref": "VPCIGWB7E252D3" + }, + "VpcId": { + "Ref": "VPCB9E5F0B4" } } }, @@ -514,7 +514,6 @@ "DatabaseB269D8BB": { "Type": "AWS::RDS::DBCluster", "Properties": { - "Engine": "aurora-mysql", "AssociatedRoles": [ { "RoleArn": { @@ -532,9 +531,10 @@ "DBSubnetGroupName": { "Ref": "DatabaseSubnets56F17B9A" }, - "EngineVersion": "8.0.mysql_aurora.3.01.0", - "MasterUsername": "admin", + "Engine": "aurora-mysql", + "EngineVersion": "8.0.mysql_aurora.3.07.1", "MasterUserPassword": "7959866cacc02c2d243ecfe177464fe6", + "MasterUsername": "admin", "VpcSecurityGroupIds": [ { "Fn::GetAtt": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/awscdkrdss3mysql8integtestDefaultTestDeployAssertB8B2E4D8.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/awscdkrdss3mysql8integtestDefaultTestDeployAssertB8B2E4D8.assets.json new file mode 100644 index 0000000000000..a5da449f8ef60 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/awscdkrdss3mysql8integtestDefaultTestDeployAssertB8B2E4D8.assets.json @@ -0,0 +1,19 @@ +{ + "version": "38.0.1", + "files": { + "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { + "source": { + "path": "awscdkrdss3mysql8integtestDefaultTestDeployAssertB8B2E4D8.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/awscdkrdss3mysql8integtestDefaultTestDeployAssertB8B2E4D8.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/awscdkrdss3mysql8integtestDefaultTestDeployAssertB8B2E4D8.template.json new file mode 100644 index 0000000000000..ad9d0fb73d1dd --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/awscdkrdss3mysql8integtestDefaultTestDeployAssertB8B2E4D8.template.json @@ -0,0 +1,36 @@ +{ + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/cdk.out index 8ecc185e9dbee..c6e612584e352 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"21.0.0"} \ No newline at end of file +{"version":"38.0.1"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/integ.json index 8ffe8f32ed74b..fbd7324787324 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/integ.json @@ -1,14 +1,12 @@ { - "version": "21.0.0", + "version": "38.0.1", "testCases": { - "integ.cluster-s3.mysql-8": { + "aws-cdk-rds-s3-mysql-8-integ-test/DefaultTest": { "stacks": [ "aws-cdk-rds-s3-mysql-8-integ" ], - "diffAssets": false, - "stackUpdateWorkflow": true + "assertionStack": "aws-cdk-rds-s3-mysql-8-integ-test/DefaultTest/DeployAssert", + "assertionStackName": "awscdkrdss3mysql8integtestDefaultTestDeployAssertB8B2E4D8" } - }, - "synthContext": {}, - "enableLookups": false + } } \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/manifest.json index 434c9f37b0cc9..198229f36367b 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/manifest.json @@ -1,12 +1,6 @@ { - "version": "21.0.0", + "version": "38.0.1", "artifacts": { - "Tree": { - "type": "cdk:tree", - "properties": { - "file": "tree.json" - } - }, "aws-cdk-rds-s3-mysql-8-integ.assets": { "type": "cdk:asset-manifest", "properties": { @@ -20,10 +14,12 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "aws-cdk-rds-s3-mysql-8-integ.template.json", + "terminationProtection": false, "validateOnSynth": false, + "notificationArns": [], "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}/25234cf4a3c5d1399adfab4811db12cbab88f9459af99963277edcbbd40e815a.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/676d23dff56b422a575548cc174c8f1a3e03eaa433e1b6e924a96c6aa9677c7a.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -239,6 +235,61 @@ ] }, "displayName": "aws-cdk-rds-s3-mysql-8-integ" + }, + "awscdkrdss3mysql8integtestDefaultTestDeployAssertB8B2E4D8.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "awscdkrdss3mysql8integtestDefaultTestDeployAssertB8B2E4D8.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "awscdkrdss3mysql8integtestDefaultTestDeployAssertB8B2E4D8": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "awscdkrdss3mysql8integtestDefaultTestDeployAssertB8B2E4D8.template.json", + "terminationProtection": false, + "validateOnSynth": false, + "notificationArns": [], + "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}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "awscdkrdss3mysql8integtestDefaultTestDeployAssertB8B2E4D8.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "awscdkrdss3mysql8integtestDefaultTestDeployAssertB8B2E4D8.assets" + ], + "metadata": { + "/aws-cdk-rds-s3-mysql-8-integ-test/DefaultTest/DeployAssert/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/aws-cdk-rds-s3-mysql-8-integ-test/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "aws-cdk-rds-s3-mysql-8-integ-test/DefaultTest/DeployAssert" + }, + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } } } } \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/tree.json index 1b78db0ffdca6..57f0c9bb2d884 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/tree.json @@ -4,14 +4,6 @@ "id": "App", "path": "", "children": { - "Tree": { - "id": "Tree", - "path": "Tree", - "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.1.102" - } - }, "aws-cdk-rds-s3-mysql-8-integ": { "id": "aws-cdk-rds-s3-mysql-8-integ", "path": "aws-cdk-rds-s3-mysql-8-integ", @@ -39,7 +31,7 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnVPC", + "fqn": "aws-cdk-lib.aws_ec2.CfnVPC", "version": "0.0.0" } }, @@ -53,9 +45,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -79,11 +68,14 @@ "key": "Name", "value": "aws-cdk-rds-s3-mysql-8-integ/VPC/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", "version": "0.0.0" } }, @@ -91,7 +83,7 @@ "id": "Acl", "path": "aws-cdk-rds-s3-mysql-8-integ/VPC/PublicSubnet1/Acl", "constructInfo": { - "fqn": "@aws-cdk/core.Resource", + "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" } }, @@ -101,19 +93,19 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, "tags": [ { "key": "Name", "value": "aws-cdk-rds-s3-mysql-8-integ/VPC/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", "version": "0.0.0" } }, @@ -132,7 +124,7 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnetRouteTableAssociation", + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", "version": "0.0.0" } }, @@ -142,17 +134,17 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VPCPublicSubnet1RouteTableFEE4B781" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VPCIGWB7E252D3" + }, + "routeTableId": { + "Ref": "VPCPublicSubnet1RouteTableFEE4B781" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRoute", + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", "version": "0.0.0" } }, @@ -172,7 +164,7 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnEIP", + "fqn": "aws-cdk-lib.aws_ec2.CfnEIP", "version": "0.0.0" } }, @@ -182,15 +174,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "VPCPublicSubnet1SubnetB4246D30" - }, "allocationId": { "Fn::GetAtt": [ "VPCPublicSubnet1EIP6AD938E8", "AllocationId" ] }, + "subnetId": { + "Ref": "VPCPublicSubnet1SubnetB4246D30" + }, "tags": [ { "key": "Name", @@ -200,13 +192,13 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnNatGateway", + "fqn": "aws-cdk-lib.aws_ec2.CfnNatGateway", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PublicSubnet", + "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", "version": "0.0.0" } }, @@ -220,9 +212,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -246,11 +235,14 @@ "key": "Name", "value": "aws-cdk-rds-s3-mysql-8-integ/VPC/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", "version": "0.0.0" } }, @@ -258,7 +250,7 @@ "id": "Acl", "path": "aws-cdk-rds-s3-mysql-8-integ/VPC/PublicSubnet2/Acl", "constructInfo": { - "fqn": "@aws-cdk/core.Resource", + "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" } }, @@ -268,19 +260,19 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, "tags": [ { "key": "Name", "value": "aws-cdk-rds-s3-mysql-8-integ/VPC/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", "version": "0.0.0" } }, @@ -299,7 +291,7 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnetRouteTableAssociation", + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", "version": "0.0.0" } }, @@ -309,17 +301,17 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VPCIGWB7E252D3" + }, + "routeTableId": { + "Ref": "VPCPublicSubnet2RouteTable6F1A15F1" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRoute", + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", "version": "0.0.0" } }, @@ -339,7 +331,7 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnEIP", + "fqn": "aws-cdk-lib.aws_ec2.CfnEIP", "version": "0.0.0" } }, @@ -349,15 +341,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "VPCPublicSubnet2Subnet74179F39" - }, "allocationId": { "Fn::GetAtt": [ "VPCPublicSubnet2EIP4947BC00", "AllocationId" ] }, + "subnetId": { + "Ref": "VPCPublicSubnet2Subnet74179F39" + }, "tags": [ { "key": "Name", @@ -367,13 +359,13 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnNatGateway", + "fqn": "aws-cdk-lib.aws_ec2.CfnNatGateway", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PublicSubnet", + "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", "version": "0.0.0" } }, @@ -387,9 +379,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -413,11 +402,14 @@ "key": "Name", "value": "aws-cdk-rds-s3-mysql-8-integ/VPC/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", "version": "0.0.0" } }, @@ -425,7 +417,7 @@ "id": "Acl", "path": "aws-cdk-rds-s3-mysql-8-integ/VPC/PrivateSubnet1/Acl", "constructInfo": { - "fqn": "@aws-cdk/core.Resource", + "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" } }, @@ -435,19 +427,19 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, "tags": [ { "key": "Name", "value": "aws-cdk-rds-s3-mysql-8-integ/VPC/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", "version": "0.0.0" } }, @@ -466,7 +458,7 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnetRouteTableAssociation", + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", "version": "0.0.0" } }, @@ -476,23 +468,23 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VPCPrivateSubnet1RouteTableBE8A6027" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VPCPublicSubnet1NATGatewayE0556630" + }, + "routeTableId": { + "Ref": "VPCPrivateSubnet1RouteTableBE8A6027" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRoute", + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PrivateSubnet", + "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", "version": "0.0.0" } }, @@ -506,9 +498,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -532,11 +521,14 @@ "key": "Name", "value": "aws-cdk-rds-s3-mysql-8-integ/VPC/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", "version": "0.0.0" } }, @@ -544,7 +536,7 @@ "id": "Acl", "path": "aws-cdk-rds-s3-mysql-8-integ/VPC/PrivateSubnet2/Acl", "constructInfo": { - "fqn": "@aws-cdk/core.Resource", + "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" } }, @@ -554,19 +546,19 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, "tags": [ { "key": "Name", "value": "aws-cdk-rds-s3-mysql-8-integ/VPC/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "VPCB9E5F0B4" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", "version": "0.0.0" } }, @@ -585,7 +577,7 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnetRouteTableAssociation", + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", "version": "0.0.0" } }, @@ -595,23 +587,23 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VPCPrivateSubnet2RouteTable0A19E10E" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VPCPublicSubnet2NATGateway3C070193" + }, + "routeTableId": { + "Ref": "VPCPrivateSubnet2RouteTable0A19E10E" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRoute", + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PrivateSubnet", + "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", "version": "0.0.0" } }, @@ -630,7 +622,7 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnInternetGateway", + "fqn": "aws-cdk-lib.aws_ec2.CfnInternetGateway", "version": "0.0.0" } }, @@ -640,22 +632,22 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "VPCB9E5F0B4" - }, "internetGatewayId": { "Ref": "VPCIGWB7E252D3" + }, + "vpcId": { + "Ref": "VPCB9E5F0B4" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnVPCGatewayAttachment", + "fqn": "aws-cdk-lib.aws_ec2.CfnVPCGatewayAttachment", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.Vpc", + "fqn": "aws-cdk-lib.aws_ec2.Vpc", "version": "0.0.0" } }, @@ -671,13 +663,13 @@ "aws:cdk:cloudformation:props": {} }, "constructInfo": { - "fqn": "@aws-cdk/aws-s3.CfnBucket", + "fqn": "aws-cdk-lib.aws_s3.CfnBucket", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-s3.Bucket", + "fqn": "aws-cdk-lib.aws_s3.Bucket", "version": "0.0.0" } }, @@ -707,13 +699,13 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBSubnetGroup", + "fqn": "aws-cdk-lib.aws_rds.CfnDBSubnetGroup", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.SubnetGroup", + "fqn": "aws-cdk-lib.aws_rds.SubnetGroup", "version": "0.0.0" } }, @@ -741,13 +733,13 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSecurityGroup", + "fqn": "aws-cdk-lib.aws_ec2.CfnSecurityGroup", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.SecurityGroup", + "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", "version": "0.0.0" } }, @@ -755,6 +747,14 @@ "id": "S3ImportRole", "path": "aws-cdk-rds-s3-mysql-8-integ/Database/S3ImportRole", "children": { + "ImportS3ImportRole": { + "id": "ImportS3ImportRole", + "path": "aws-cdk-rds-s3-mysql-8-integ/Database/S3ImportRole/ImportS3ImportRole", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, "Resource": { "id": "Resource", "path": "aws-cdk-rds-s3-mysql-8-integ/Database/S3ImportRole/Resource", @@ -776,7 +776,7 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnRole", + "fqn": "aws-cdk-lib.aws_iam.CfnRole", "version": "0.0.0" } }, @@ -841,19 +841,19 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnPolicy", + "fqn": "aws-cdk-lib.aws_iam.CfnPolicy", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Policy", + "fqn": "aws-cdk-lib.aws_iam.Policy", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Role", + "fqn": "aws-cdk-lib.aws_iam.Role", "version": "0.0.0" } }, @@ -861,7 +861,7 @@ "id": "AuroraMySqlDatabaseClusterEngineDefaultParameterGroup", "path": "aws-cdk-rds-s3-mysql-8-integ/Database/AuroraMySqlDatabaseClusterEngineDefaultParameterGroup", "constructInfo": { - "fqn": "@aws-cdk/core.Resource", + "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" } }, @@ -888,13 +888,13 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBClusterParameterGroup", + "fqn": "aws-cdk-lib.aws_rds.CfnDBClusterParameterGroup", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.ParameterGroup", + "fqn": "aws-cdk-lib.aws_rds.ParameterGroup", "version": "0.0.0" } }, @@ -904,7 +904,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::RDS::DBCluster", "aws:cdk:cloudformation:props": { - "engine": "aurora-mysql", "associatedRoles": [ { "roleArn": { @@ -922,7 +921,8 @@ "dbSubnetGroupName": { "Ref": "DatabaseSubnets56F17B9A" }, - "engineVersion": "8.0.mysql_aurora.3.01.0", + "engine": "aurora-mysql", + "engineVersion": "8.0.mysql_aurora.3.07.1", "masterUsername": "admin", "masterUserPassword": "7959866cacc02c2d243ecfe177464fe6", "vpcSecurityGroupIds": [ @@ -936,7 +936,15 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBCluster", + "fqn": "aws-cdk-lib.aws_rds.CfnDBCluster", + "version": "0.0.0" + } + }, + "Instance1Wrapper": { + "id": "Instance1Wrapper", + "path": "aws-cdk-rds-s3-mysql-8-integ/Database/Instance1Wrapper", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" } }, @@ -957,25 +965,103 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBInstance", + "fqn": "aws-cdk-lib.aws_rds.CfnDBInstance", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.DatabaseCluster", + "fqn": "aws-cdk-lib.aws_rds.DatabaseCluster", + "version": "0.0.0" + } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "aws-cdk-rds-s3-mysql-8-integ/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "aws-cdk-rds-s3-mysql-8-integ/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/core.Stack", + "fqn": "aws-cdk-lib.Stack", "version": "0.0.0" } + }, + "aws-cdk-rds-s3-mysql-8-integ-test": { + "id": "aws-cdk-rds-s3-mysql-8-integ-test", + "path": "aws-cdk-rds-s3-mysql-8-integ-test", + "children": { + "DefaultTest": { + "id": "DefaultTest", + "path": "aws-cdk-rds-s3-mysql-8-integ-test/DefaultTest", + "children": { + "Default": { + "id": "Default", + "path": "aws-cdk-rds-s3-mysql-8-integ-test/DefaultTest/Default", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" + } + }, + "DeployAssert": { + "id": "DeployAssert", + "path": "aws-cdk-rds-s3-mysql-8-integ-test/DefaultTest/DeployAssert", + "children": { + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "aws-cdk-rds-s3-mysql-8-integ-test/DefaultTest/DeployAssert/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "aws-cdk-rds-s3-mysql-8-integ-test/DefaultTest/DeployAssert/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.IntegTestCase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.IntegTest", + "version": "0.0.0" + } + }, + "Tree": { + "id": "Tree", + "path": "Tree", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" + } } }, "constructInfo": { - "fqn": "@aws-cdk/core.App", + "fqn": "aws-cdk-lib.App", "version": "0.0.0" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.ts index bb5b55aba0d19..4a4c1e0036aaa 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.ts +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.ts @@ -2,6 +2,7 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'; import * as s3 from 'aws-cdk-lib/aws-s3'; import * as cdk from 'aws-cdk-lib'; import * as rds from 'aws-cdk-lib/aws-rds'; +import { IntegTest } from '@aws-cdk/integ-tests-alpha'; const app = new cdk.App(); const stack = new cdk.Stack(app, 'aws-cdk-rds-s3-mysql-8-integ'); @@ -13,7 +14,7 @@ const importExportBucket = new s3.Bucket(stack, 'ImportExportBucket', { new rds.DatabaseCluster(stack, 'Database', { engine: rds.DatabaseClusterEngine.auroraMysql({ - version: rds.AuroraMysqlEngineVersion.VER_3_01_0, + version: rds.AuroraMysqlEngineVersion.VER_3_07_1, }), credentials: rds.Credentials.fromUsername('admin', { password: cdk.SecretValue.plainText('7959866cacc02c2d243ecfe177464fe6'), @@ -24,4 +25,7 @@ new rds.DatabaseCluster(stack, 'Database', { s3ExportBuckets: [importExportBucket], }); -app.synth(); +new IntegTest(app, 'aws-cdk-rds-s3-mysql-8-integ-test', { + testCases: [stack], +}); + diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/BulkUpdate.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/BulkUpdate.assets.json index 4a85910d3ca70..d51947995c3bf 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/BulkUpdate.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/BulkUpdate.assets.json @@ -1,7 +1,7 @@ { - "version": "20.0.0", + "version": "38.0.1", "files": { - "42666c8cb0240034f3396e58c987952835af422e7644673bd50941e11c6e1d6e": { + "86789aa603c935d2419fcd3cb52ac6fd49778a57bddb556d387bfd1d6bbdc71a": { "source": { "path": "BulkUpdate.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "42666c8cb0240034f3396e58c987952835af422e7644673bd50941e11c6e1d6e.json", + "objectKey": "86789aa603c935d2419fcd3cb52ac6fd49778a57bddb556d387bfd1d6bbdc71a.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/BulkUpdate.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/BulkUpdate.template.json index dff122bfd4577..a8385a8f4e31c 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/BulkUpdate.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/BulkUpdate.template.json @@ -18,9 +18,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -44,21 +41,24 @@ "Key": "Name", "Value": "BulkUpdate/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "BulkUpdate/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -75,12 +75,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -102,15 +102,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -126,9 +126,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -152,21 +149,24 @@ "Key": "Name", "Value": "BulkUpdate/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "BulkUpdate/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -183,12 +183,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -210,15 +210,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -234,9 +234,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -260,21 +257,24 @@ "Key": "Name", "Value": "BulkUpdate/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "BulkUpdate/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -291,21 +291,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -329,21 +326,24 @@ "Key": "Name", "Value": "BulkUpdate/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "BulkUpdate/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -360,12 +360,12 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -383,11 +383,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -460,12 +460,14 @@ "DatabaseCluster68FC2945": { "Type": "AWS::RDS::DBCluster", "Properties": { - "Engine": "aurora", "CopyTagsToSnapshot": true, + "DBClusterParameterGroupName": "default.aurora-mysql8.0", "DBSubnetGroupName": { "Ref": "DatabaseClusterSubnets7FAE1846" }, - "MasterUsername": { + "Engine": "aurora-mysql", + "EngineVersion": "8.0.mysql_aurora.3.07.1", + "MasterUserPassword": { "Fn::Join": [ "", [ @@ -473,11 +475,11 @@ { "Ref": "DatabaseClusterSecret3F333A5B" }, - ":SecretString:username::}}" + ":SecretString:password::}}" ] ] }, - "MasterUserPassword": { + "MasterUsername": { "Fn::Join": [ "", [ @@ -485,7 +487,7 @@ { "Ref": "DatabaseClusterSecret3F333A5B" }, - ":SecretString:password::}}" + ":SecretString:username::}}" ] ] }, @@ -507,11 +509,11 @@ "DBClusterIdentifier": { "Ref": "DatabaseCluster68FC2945" }, - "DBInstanceClass": "db.t3.small", + "DBInstanceClass": "db.t3.medium", "DBSubnetGroupName": { "Ref": "DatabaseClusterSubnets7FAE1846" }, - "Engine": "aurora" + "Engine": "aurora-mysql" }, "DependsOn": [ "VpcPrivateSubnet1DefaultRouteBE02A9ED", @@ -528,11 +530,11 @@ "DBClusterIdentifier": { "Ref": "DatabaseCluster68FC2945" }, - "DBInstanceClass": "db.t3.small", + "DBInstanceClass": "db.t3.medium", "DBSubnetGroupName": { "Ref": "DatabaseClusterSubnets7FAE1846" }, - "Engine": "aurora" + "Engine": "aurora-mysql" }, "DependsOn": [ "VpcPrivateSubnet1DefaultRouteBE02A9ED", @@ -549,11 +551,11 @@ "DBClusterIdentifier": { "Ref": "DatabaseCluster68FC2945" }, - "DBInstanceClass": "db.t3.small", + "DBInstanceClass": "db.t3.medium", "DBSubnetGroupName": { "Ref": "DatabaseClusterSubnets7FAE1846" }, - "Engine": "aurora" + "Engine": "aurora-mysql" }, "DependsOn": [ "VpcPrivateSubnet1DefaultRouteBE02A9ED", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/InstanceUpdateBehaviorTestsDefaultTestDeployAssert287956FD.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/InstanceUpdateBehaviorTestsDefaultTestDeployAssert287956FD.assets.json index 74c854e881c96..986898beb77b0 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/InstanceUpdateBehaviorTestsDefaultTestDeployAssert287956FD.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/InstanceUpdateBehaviorTestsDefaultTestDeployAssert287956FD.assets.json @@ -1,5 +1,5 @@ { - "version": "20.0.0", + "version": "38.0.1", "files": { "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { "source": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/RollingUpdate.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/RollingUpdate.assets.json index f8b3e759e88ae..ffc7f6b5adf2e 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/RollingUpdate.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/RollingUpdate.assets.json @@ -1,7 +1,7 @@ { - "version": "20.0.0", + "version": "38.0.1", "files": { - "1accd12ce00e5515c3260ef941ea3ac32d181d0a68f17bcf2c92a244f7775df5": { + "ec7297c11c47fc0f2c7ceefadc49795f190af9e0f21e2ad0d40a066de90a0200": { "source": { "path": "RollingUpdate.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "1accd12ce00e5515c3260ef941ea3ac32d181d0a68f17bcf2c92a244f7775df5.json", + "objectKey": "ec7297c11c47fc0f2c7ceefadc49795f190af9e0f21e2ad0d40a066de90a0200.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/RollingUpdate.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/RollingUpdate.template.json index 7a6d9a63ffa85..63d0a592b2900 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/RollingUpdate.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/RollingUpdate.template.json @@ -18,9 +18,6 @@ "VpcPublicSubnet1Subnet5C2D37C4": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -44,21 +41,24 @@ "Key": "Name", "Value": "RollingUpdate/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTable6C95E38E": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "RollingUpdate/Vpc/PublicSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet1RouteTableAssociation97140677": { @@ -75,12 +75,12 @@ "VpcPublicSubnet1DefaultRoute3DA9E72A": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } }, "DependsOn": [ @@ -102,15 +102,15 @@ "VpcPublicSubnet1NATGateway4D7517AA": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "Tags": [ { "Key": "Name", @@ -126,9 +126,6 @@ "VpcPublicSubnet2Subnet691E08A3": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -152,21 +149,24 @@ "Key": "Name", "Value": "RollingUpdate/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTable94F7E489": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "RollingUpdate/Vpc/PublicSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPublicSubnet2RouteTableAssociationDD5762D8": { @@ -183,12 +183,12 @@ "VpcPublicSubnet2DefaultRoute97F91067": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "RouteTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } }, "DependsOn": [ @@ -210,15 +210,15 @@ "VpcPublicSubnet2NATGateway9182C01D": { "Type": "AWS::EC2::NatGateway", "Properties": { - "SubnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "AllocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "SubnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "Tags": [ { "Key": "Name", @@ -234,9 +234,6 @@ "VpcPrivateSubnet1Subnet536B997A": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 0, @@ -260,21 +257,24 @@ "Key": "Name", "Value": "RollingUpdate/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableB2C5B500": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "RollingUpdate/Vpc/PrivateSubnet1" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet1RouteTableAssociation70C59FA6": { @@ -291,21 +291,18 @@ "VpcPrivateSubnet1DefaultRouteBE02A9ED": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "VpcPrivateSubnet2Subnet3788AAA1": { "Type": "AWS::EC2::Subnet", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "AvailabilityZone": { "Fn::Select": [ 1, @@ -329,21 +326,24 @@ "Key": "Name", "Value": "RollingUpdate/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableA678073B": { "Type": "AWS::EC2::RouteTable", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "Tags": [ { "Key": "Name", "Value": "RollingUpdate/Vpc/PrivateSubnet2" } - ] + ], + "VpcId": { + "Ref": "Vpc8378EB38" + } } }, "VpcPrivateSubnet2RouteTableAssociationA89CAD56": { @@ -360,12 +360,12 @@ "VpcPrivateSubnet2DefaultRoute060D2087": { "Type": "AWS::EC2::Route", "Properties": { - "RouteTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "RouteTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, @@ -383,11 +383,11 @@ "VpcVPCGWBF912B6E": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { - "VpcId": { - "Ref": "Vpc8378EB38" - }, "InternetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "VpcId": { + "Ref": "Vpc8378EB38" } } }, @@ -460,12 +460,14 @@ "DatabaseCluster68FC2945": { "Type": "AWS::RDS::DBCluster", "Properties": { - "Engine": "aurora", "CopyTagsToSnapshot": true, + "DBClusterParameterGroupName": "default.aurora-mysql8.0", "DBSubnetGroupName": { "Ref": "DatabaseClusterSubnets7FAE1846" }, - "MasterUsername": { + "Engine": "aurora-mysql", + "EngineVersion": "8.0.mysql_aurora.3.07.1", + "MasterUserPassword": { "Fn::Join": [ "", [ @@ -473,11 +475,11 @@ { "Ref": "DatabaseClusterSecret3F333A5B" }, - ":SecretString:username::}}" + ":SecretString:password::}}" ] ] }, - "MasterUserPassword": { + "MasterUsername": { "Fn::Join": [ "", [ @@ -485,7 +487,7 @@ { "Ref": "DatabaseClusterSecret3F333A5B" }, - ":SecretString:password::}}" + ":SecretString:username::}}" ] ] }, @@ -507,11 +509,11 @@ "DBClusterIdentifier": { "Ref": "DatabaseCluster68FC2945" }, - "DBInstanceClass": "db.t3.small", + "DBInstanceClass": "db.t3.medium", "DBSubnetGroupName": { "Ref": "DatabaseClusterSubnets7FAE1846" }, - "Engine": "aurora" + "Engine": "aurora-mysql" }, "DependsOn": [ "VpcPrivateSubnet1DefaultRouteBE02A9ED", @@ -528,11 +530,11 @@ "DBClusterIdentifier": { "Ref": "DatabaseCluster68FC2945" }, - "DBInstanceClass": "db.t3.small", + "DBInstanceClass": "db.t3.medium", "DBSubnetGroupName": { "Ref": "DatabaseClusterSubnets7FAE1846" }, - "Engine": "aurora" + "Engine": "aurora-mysql" }, "DependsOn": [ "DatabaseClusterInstance1C566869D", @@ -550,11 +552,11 @@ "DBClusterIdentifier": { "Ref": "DatabaseCluster68FC2945" }, - "DBInstanceClass": "db.t3.small", + "DBInstanceClass": "db.t3.medium", "DBSubnetGroupName": { "Ref": "DatabaseClusterSubnets7FAE1846" }, - "Engine": "aurora" + "Engine": "aurora-mysql" }, "DependsOn": [ "DatabaseClusterInstance252BB9A46", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/cdk.out index 588d7b269d34f..c6e612584e352 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"20.0.0"} \ No newline at end of file +{"version":"38.0.1"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/integ.json index 8fbb2941a1596..17cc062426862 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/integ.json @@ -1,12 +1,13 @@ { - "version": "20.0.0", + "version": "38.0.1", "testCases": { "InstanceUpdateBehaviorTests/DefaultTest": { "stacks": [ "BulkUpdate", "RollingUpdate" ], - "assertionStack": "InstanceUpdateBehaviorTests/DefaultTest/DeployAssert" + "assertionStack": "InstanceUpdateBehaviorTests/DefaultTest/DeployAssert", + "assertionStackName": "InstanceUpdateBehaviorTestsDefaultTestDeployAssert287956FD" } } } \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/manifest.json index 06e1370bd2c7d..0179438ee91f1 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/manifest.json @@ -1,12 +1,6 @@ { - "version": "20.0.0", + "version": "38.0.1", "artifacts": { - "Tree": { - "type": "cdk:tree", - "properties": { - "file": "tree.json" - } - }, "BulkUpdate.assets": { "type": "cdk:asset-manifest", "properties": { @@ -20,10 +14,12 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "BulkUpdate.template.json", + "terminationProtection": false, "validateOnSynth": false, + "notificationArns": [], "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}/42666c8cb0240034f3396e58c987952835af422e7644673bd50941e11c6e1d6e.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/86789aa603c935d2419fcd3cb52ac6fd49778a57bddb556d387bfd1d6bbdc71a.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -253,10 +249,12 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "RollingUpdate.template.json", + "terminationProtection": false, "validateOnSynth": false, + "notificationArns": [], "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}/1accd12ce00e5515c3260ef941ea3ac32d181d0a68f17bcf2c92a244f7775df5.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/ec7297c11c47fc0f2c7ceefadc49795f190af9e0f21e2ad0d40a066de90a0200.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -486,7 +484,9 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "InstanceUpdateBehaviorTestsDefaultTestDeployAssert287956FD.template.json", + "terminationProtection": false, "validateOnSynth": false, + "notificationArns": [], "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}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", @@ -519,6 +519,12 @@ ] }, "displayName": "InstanceUpdateBehaviorTests/DefaultTest/DeployAssert" + }, + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } } } } \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/tree.json index bf4b703535799..45b8f4e04b183 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.js.snapshot/tree.json @@ -4,14 +4,6 @@ "id": "App", "path": "", "children": { - "Tree": { - "id": "Tree", - "path": "Tree", - "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.1.85" - } - }, "BulkUpdate": { "id": "BulkUpdate", "path": "BulkUpdate", @@ -39,8 +31,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnVPC", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "PublicSubnet1": { @@ -53,9 +45,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -79,12 +68,15 @@ "key": "Name", "value": "BulkUpdate/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Acl": { @@ -92,7 +84,7 @@ "path": "BulkUpdate/Vpc/PublicSubnet1/Acl", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.85" + "version": "10.3.0" } }, "RouteTable": { @@ -101,20 +93,20 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "Name", "value": "BulkUpdate/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "RouteTableAssociation": { @@ -132,8 +124,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnetRouteTableAssociation", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "DefaultRoute": { @@ -142,18 +134,18 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRoute", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "EIP": { @@ -172,8 +164,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnEIP", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "NATGateway": { @@ -182,15 +174,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "allocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "subnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "tags": [ { "key": "Name", @@ -200,14 +192,14 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnNatGateway", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PublicSubnet", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "PublicSubnet2": { @@ -220,9 +212,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -246,12 +235,15 @@ "key": "Name", "value": "BulkUpdate/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Acl": { @@ -259,7 +251,7 @@ "path": "BulkUpdate/Vpc/PublicSubnet2/Acl", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.85" + "version": "10.3.0" } }, "RouteTable": { @@ -268,20 +260,20 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "Name", "value": "BulkUpdate/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "RouteTableAssociation": { @@ -299,8 +291,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnetRouteTableAssociation", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "DefaultRoute": { @@ -309,18 +301,18 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRoute", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "EIP": { @@ -339,8 +331,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnEIP", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "NATGateway": { @@ -349,15 +341,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "allocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "subnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "tags": [ { "key": "Name", @@ -367,14 +359,14 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnNatGateway", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PublicSubnet", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "PrivateSubnet1": { @@ -387,9 +379,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -413,12 +402,15 @@ "key": "Name", "value": "BulkUpdate/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Acl": { @@ -426,7 +418,7 @@ "path": "BulkUpdate/Vpc/PrivateSubnet1/Acl", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.85" + "version": "10.3.0" } }, "RouteTable": { @@ -435,20 +427,20 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "Name", "value": "BulkUpdate/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "RouteTableAssociation": { @@ -466,8 +458,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnetRouteTableAssociation", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "DefaultRoute": { @@ -476,24 +468,24 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRoute", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PrivateSubnet", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "PrivateSubnet2": { @@ -506,9 +498,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -532,12 +521,15 @@ "key": "Name", "value": "BulkUpdate/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Acl": { @@ -545,7 +537,7 @@ "path": "BulkUpdate/Vpc/PrivateSubnet2/Acl", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.85" + "version": "10.3.0" } }, "RouteTable": { @@ -554,20 +546,20 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "Name", "value": "BulkUpdate/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "RouteTableAssociation": { @@ -585,8 +577,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnetRouteTableAssociation", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "DefaultRoute": { @@ -595,24 +587,24 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRoute", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PrivateSubnet", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "IGW": { @@ -630,8 +622,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnInternetGateway", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "VPCGW": { @@ -640,23 +632,23 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "internetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "vpcId": { + "Ref": "Vpc8378EB38" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnVPCGatewayAttachment", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.Vpc", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "DatabaseCluster": { @@ -685,14 +677,14 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBSubnetGroup", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.SubnetGroup", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "SecurityGroup": { @@ -719,14 +711,22 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSecurityGroup", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.SecurityGroup", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" + } + }, + "AuroraMySqlDatabaseClusterEngineDefaultParameterGroup": { + "id": "AuroraMySqlDatabaseClusterEngineDefaultParameterGroup", + "path": "BulkUpdate/DatabaseCluster/AuroraMySqlDatabaseClusterEngineDefaultParameterGroup", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Secret": { @@ -759,8 +759,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-secretsmanager.CfnSecret", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Attachment": { @@ -783,20 +783,20 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-secretsmanager.CfnSecretTargetAttachment", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-secretsmanager.SecretTargetAttachment", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.DatabaseSecret", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Resource": { @@ -805,11 +805,13 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::RDS::DBCluster", "aws:cdk:cloudformation:props": { - "engine": "aurora", "copyTagsToSnapshot": true, + "dbClusterParameterGroupName": "default.aurora-mysql8.0", "dbSubnetGroupName": { "Ref": "DatabaseClusterSubnets7FAE1846" }, + "engine": "aurora-mysql", + "engineVersion": "8.0.mysql_aurora.3.07.1", "masterUsername": { "Fn::Join": [ "", @@ -845,8 +847,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBCluster", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Instance1": { @@ -858,16 +860,16 @@ "dbClusterIdentifier": { "Ref": "DatabaseCluster68FC2945" }, - "dbInstanceClass": "db.t3.small", + "dbInstanceClass": "db.t3.medium", "dbSubnetGroupName": { "Ref": "DatabaseClusterSubnets7FAE1846" }, - "engine": "aurora" + "engine": "aurora-mysql" } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBInstance", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Instance2": { @@ -879,16 +881,16 @@ "dbClusterIdentifier": { "Ref": "DatabaseCluster68FC2945" }, - "dbInstanceClass": "db.t3.small", + "dbInstanceClass": "db.t3.medium", "dbSubnetGroupName": { "Ref": "DatabaseClusterSubnets7FAE1846" }, - "engine": "aurora" + "engine": "aurora-mysql" } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBInstance", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Instance3": { @@ -900,28 +902,44 @@ "dbClusterIdentifier": { "Ref": "DatabaseCluster68FC2945" }, - "dbInstanceClass": "db.t3.small", + "dbInstanceClass": "db.t3.medium", "dbSubnetGroupName": { "Ref": "DatabaseClusterSubnets7FAE1846" }, - "engine": "aurora" + "engine": "aurora-mysql" } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBInstance", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.DatabaseCluster", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" + } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "BulkUpdate/BootstrapVersion", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "BulkUpdate/CheckBootstrapVersion", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.85" + "version": "10.3.0" } }, "RollingUpdate": { @@ -951,8 +969,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnVPC", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "PublicSubnet1": { @@ -965,9 +983,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -991,12 +1006,15 @@ "key": "Name", "value": "RollingUpdate/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Acl": { @@ -1004,7 +1022,7 @@ "path": "RollingUpdate/Vpc/PublicSubnet1/Acl", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.85" + "version": "10.3.0" } }, "RouteTable": { @@ -1013,20 +1031,20 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "Name", "value": "RollingUpdate/Vpc/PublicSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "RouteTableAssociation": { @@ -1044,8 +1062,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnetRouteTableAssociation", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "DefaultRoute": { @@ -1054,18 +1072,18 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet1RouteTable6C95E38E" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet1RouteTable6C95E38E" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRoute", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "EIP": { @@ -1084,8 +1102,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnEIP", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "NATGateway": { @@ -1094,15 +1112,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "VpcPublicSubnet1Subnet5C2D37C4" - }, "allocationId": { "Fn::GetAtt": [ "VpcPublicSubnet1EIPD7E02669", "AllocationId" ] }, + "subnetId": { + "Ref": "VpcPublicSubnet1Subnet5C2D37C4" + }, "tags": [ { "key": "Name", @@ -1112,14 +1130,14 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnNatGateway", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PublicSubnet", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "PublicSubnet2": { @@ -1132,9 +1150,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -1158,12 +1173,15 @@ "key": "Name", "value": "RollingUpdate/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Acl": { @@ -1171,7 +1189,7 @@ "path": "RollingUpdate/Vpc/PublicSubnet2/Acl", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.85" + "version": "10.3.0" } }, "RouteTable": { @@ -1180,20 +1198,20 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "Name", "value": "RollingUpdate/Vpc/PublicSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "RouteTableAssociation": { @@ -1211,8 +1229,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnetRouteTableAssociation", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "DefaultRoute": { @@ -1221,18 +1239,18 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPublicSubnet2RouteTable94F7E489" - }, "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "routeTableId": { + "Ref": "VpcPublicSubnet2RouteTable94F7E489" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRoute", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "EIP": { @@ -1251,8 +1269,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnEIP", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "NATGateway": { @@ -1261,15 +1279,15 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { - "subnetId": { - "Ref": "VpcPublicSubnet2Subnet691E08A3" - }, "allocationId": { "Fn::GetAtt": [ "VpcPublicSubnet2EIP3C605A87", "AllocationId" ] }, + "subnetId": { + "Ref": "VpcPublicSubnet2Subnet691E08A3" + }, "tags": [ { "key": "Name", @@ -1279,14 +1297,14 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnNatGateway", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PublicSubnet", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "PrivateSubnet1": { @@ -1299,9 +1317,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 0, @@ -1325,12 +1340,15 @@ "key": "Name", "value": "RollingUpdate/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Acl": { @@ -1338,7 +1356,7 @@ "path": "RollingUpdate/Vpc/PrivateSubnet1/Acl", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.85" + "version": "10.3.0" } }, "RouteTable": { @@ -1347,20 +1365,20 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "Name", "value": "RollingUpdate/Vpc/PrivateSubnet1" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "RouteTableAssociation": { @@ -1378,8 +1396,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnetRouteTableAssociation", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "DefaultRoute": { @@ -1388,24 +1406,24 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet1NATGateway4D7517AA" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRoute", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PrivateSubnet", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "PrivateSubnet2": { @@ -1418,9 +1436,6 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "availabilityZone": { "Fn::Select": [ 1, @@ -1444,12 +1459,15 @@ "key": "Name", "value": "RollingUpdate/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnet", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Acl": { @@ -1457,7 +1475,7 @@ "path": "RollingUpdate/Vpc/PrivateSubnet2/Acl", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.85" + "version": "10.3.0" } }, "RouteTable": { @@ -1466,20 +1484,20 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "tags": [ { "key": "Name", "value": "RollingUpdate/Vpc/PrivateSubnet2" } - ] + ], + "vpcId": { + "Ref": "Vpc8378EB38" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRouteTable", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "RouteTableAssociation": { @@ -1497,8 +1515,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSubnetRouteTableAssociation", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "DefaultRoute": { @@ -1507,24 +1525,24 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { - "routeTableId": { - "Ref": "VpcPrivateSubnet2RouteTableA678073B" - }, "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { "Ref": "VpcPublicSubnet2NATGateway9182C01D" + }, + "routeTableId": { + "Ref": "VpcPrivateSubnet2RouteTableA678073B" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnRoute", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.PrivateSubnet", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "IGW": { @@ -1542,8 +1560,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnInternetGateway", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "VPCGW": { @@ -1552,23 +1570,23 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { - "vpcId": { - "Ref": "Vpc8378EB38" - }, "internetGatewayId": { "Ref": "VpcIGWD7BA715C" + }, + "vpcId": { + "Ref": "Vpc8378EB38" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnVPCGatewayAttachment", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.Vpc", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "DatabaseCluster": { @@ -1597,14 +1615,14 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBSubnetGroup", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.SubnetGroup", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "SecurityGroup": { @@ -1631,14 +1649,22 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.CfnSecurityGroup", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-ec2.SecurityGroup", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" + } + }, + "AuroraMySqlDatabaseClusterEngineDefaultParameterGroup": { + "id": "AuroraMySqlDatabaseClusterEngineDefaultParameterGroup", + "path": "RollingUpdate/DatabaseCluster/AuroraMySqlDatabaseClusterEngineDefaultParameterGroup", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Secret": { @@ -1671,8 +1697,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-secretsmanager.CfnSecret", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Attachment": { @@ -1695,20 +1721,20 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-secretsmanager.CfnSecretTargetAttachment", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-secretsmanager.SecretTargetAttachment", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.DatabaseSecret", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Resource": { @@ -1717,11 +1743,13 @@ "attributes": { "aws:cdk:cloudformation:type": "AWS::RDS::DBCluster", "aws:cdk:cloudformation:props": { - "engine": "aurora", "copyTagsToSnapshot": true, + "dbClusterParameterGroupName": "default.aurora-mysql8.0", "dbSubnetGroupName": { "Ref": "DatabaseClusterSubnets7FAE1846" }, + "engine": "aurora-mysql", + "engineVersion": "8.0.mysql_aurora.3.07.1", "masterUsername": { "Fn::Join": [ "", @@ -1757,8 +1785,8 @@ } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBCluster", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Instance1": { @@ -1770,16 +1798,16 @@ "dbClusterIdentifier": { "Ref": "DatabaseCluster68FC2945" }, - "dbInstanceClass": "db.t3.small", + "dbInstanceClass": "db.t3.medium", "dbSubnetGroupName": { "Ref": "DatabaseClusterSubnets7FAE1846" }, - "engine": "aurora" + "engine": "aurora-mysql" } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBInstance", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Instance2": { @@ -1791,16 +1819,16 @@ "dbClusterIdentifier": { "Ref": "DatabaseCluster68FC2945" }, - "dbInstanceClass": "db.t3.small", + "dbInstanceClass": "db.t3.medium", "dbSubnetGroupName": { "Ref": "DatabaseClusterSubnets7FAE1846" }, - "engine": "aurora" + "engine": "aurora-mysql" } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBInstance", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } }, "Instance3": { @@ -1812,28 +1840,44 @@ "dbClusterIdentifier": { "Ref": "DatabaseCluster68FC2945" }, - "dbInstanceClass": "db.t3.small", + "dbInstanceClass": "db.t3.medium", "dbSubnetGroupName": { "Ref": "DatabaseClusterSubnets7FAE1846" }, - "engine": "aurora" + "engine": "aurora-mysql" } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.CfnDBInstance", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-rds.DatabaseCluster", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.3.0" + } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "RollingUpdate/BootstrapVersion", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "RollingUpdate/CheckBootstrapVersion", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" } } }, "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.85" + "version": "10.3.0" } }, "InstanceUpdateBehaviorTests": { @@ -1849,33 +1893,59 @@ "path": "InstanceUpdateBehaviorTests/DefaultTest/Default", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.85" + "version": "10.3.0" } }, "DeployAssert": { "id": "DeployAssert", "path": "InstanceUpdateBehaviorTests/DefaultTest/DeployAssert", + "children": { + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "InstanceUpdateBehaviorTests/DefaultTest/DeployAssert/BootstrapVersion", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "InstanceUpdateBehaviorTests/DefaultTest/DeployAssert/CheckBootstrapVersion", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" + } + } + }, "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.85" + "version": "10.3.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/integ-tests.IntegTestCase", + "fqn": "@aws-cdk/integ-tests-alpha.IntegTestCase", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/integ-tests.IntegTest", + "fqn": "@aws-cdk/integ-tests-alpha.IntegTest", "version": "0.0.0" } + }, + "Tree": { + "id": "Tree", + "path": "Tree", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" + } } }, "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.85" + "version": "10.3.0" } } } \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.ts index 5a60a1b20a6ac..586d8ec69372a 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.ts +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.rolling-instance-updates.ts @@ -17,10 +17,12 @@ class RollingInstanceUpdateTestStack extends cdk.Stack { }); new rds.DatabaseCluster(this, 'DatabaseCluster', { - engine: rds.DatabaseClusterEngine.AURORA, + engine: rds.DatabaseClusterEngine.auroraMysql({ + version: rds.AuroraMysqlEngineVersion.VER_3_07_1, + }), instances: 3, instanceProps: { - instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE3, ec2.InstanceSize.SMALL), + instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE3, ec2.InstanceSize.MEDIUM), vpc, }, removalPolicy: cdk.RemovalPolicy.DESTROY, diff --git a/packages/aws-cdk-lib/aws-appsync/test/appsync-rds.test.ts b/packages/aws-cdk-lib/aws-appsync/test/appsync-rds.test.ts index 0f8e3a1790a04..ab140fbb4d722 100644 --- a/packages/aws-cdk-lib/aws-appsync/test/appsync-rds.test.ts +++ b/packages/aws-cdk-lib/aws-appsync/test/appsync-rds.test.ts @@ -33,7 +33,7 @@ describe('Rds Data Source configuration', () => { username: 'clusteradmin', }); serverlessCluster = new ServerlessCluster(stack, 'AuroraCluster', { - engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_2_07_1 }), + engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_3_07_1 }), credentials: { username: 'clusteradmin' }, clusterIdentifier: 'db-endpoint-test', vpc, @@ -494,7 +494,7 @@ describe('adding rds data source from imported api', () => { username: 'clusteradmin', }); serverlessCluster = new ServerlessCluster(stack, 'AuroraCluster', { - engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_2_07_1 }), + engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_3_07_1 }), credentials: { username: 'clusteradmin' }, clusterIdentifier: 'db-endpoint-test', vpc, diff --git a/packages/aws-cdk-lib/aws-rds/lib/cluster-engine.ts b/packages/aws-cdk-lib/aws-rds/lib/cluster-engine.ts index 07e28398e3f3e..ee55a56a900bf 100644 --- a/packages/aws-cdk-lib/aws-rds/lib/cluster-engine.ts +++ b/packages/aws-cdk-lib/aws-rds/lib/cluster-engine.ts @@ -209,6 +209,8 @@ abstract class MySqlClusterEngineBase extends ClusterEngineBase { /** * The versions for the Aurora cluster engine * (those returned by `DatabaseClusterEngine.aurora`). + * + * @deprecated use `AuroraMysqlEngineVersion` instead */ export class AuroraEngineVersion { /** Version "5.6.10a". */ @@ -286,12 +288,17 @@ export class AuroraEngineVersion { /** * Creation properties of the plain Aurora database cluster engine. * Used in `DatabaseClusterEngine.aurora`. + * + * @deprecated use `AuroraMysqlClusterEngineProps` instead */ export interface AuroraClusterEngineProps { /** The version of the Aurora cluster engine. */ readonly version: AuroraEngineVersion; } +/** + * @deprecated use `AuroraMysqlClusterEngine` instead + */ class AuroraClusterEngine extends MySqlClusterEngineBase { constructor(version?: AuroraEngineVersion) { super({ @@ -1172,6 +1179,8 @@ export class DatabaseClusterEngine { * **Note**: we do not recommend using unversioned engines for non-serverless Clusters, * as that can pose an availability risk. * We recommend using versioned engines created using the `aurora()` method + * + * @deprecated use `AURORA_MYSQL` instead */ public static readonly AURORA: IClusterEngine = new AuroraClusterEngine(); @@ -1193,7 +1202,11 @@ export class DatabaseClusterEngine { */ public static readonly AURORA_POSTGRESQL: IClusterEngine = new AuroraPostgresClusterEngine(); - /** Creates a new plain Aurora database cluster engine. */ + /** + * Creates a new plain Aurora database cluster engine. + * + * @deprecated use `auroraMysql()` instead + */ public static aurora(props: AuroraClusterEngineProps): IClusterEngine { return new AuroraClusterEngine(props.version); } diff --git a/packages/aws-cdk-lib/aws-rds/test/cluster-engine.test.ts b/packages/aws-cdk-lib/aws-rds/test/cluster-engine.test.ts index cee26e65dfbcf..0061eb36ccb9b 100644 --- a/packages/aws-cdk-lib/aws-rds/test/cluster-engine.test.ts +++ b/packages/aws-cdk-lib/aws-rds/test/cluster-engine.test.ts @@ -1,7 +1,8 @@ +import { testDeprecated } from '@aws-cdk/cdk-build-tools'; import { AuroraEngineVersion, AuroraMysqlEngineVersion, AuroraPostgresEngineVersion, DatabaseClusterEngine } from '../lib'; describe('cluster engine', () => { - test("default parameterGroupFamily for versionless Aurora cluster engine is 'aurora5.6'", () => { + testDeprecated("default parameterGroupFamily for versionless Aurora cluster engine is 'aurora5.6'", () => { // GIVEN const engine = DatabaseClusterEngine.AURORA; @@ -34,7 +35,7 @@ describe('cluster engine', () => { expect(family).toEqual(undefined); }); - test('cluster parameter group correctly determined for AURORA and given version', () => { + testDeprecated('cluster parameter group correctly determined for AURORA and given version', () => { // GIVEN const engine = DatabaseClusterEngine.aurora({ version: AuroraEngineVersion.VER_1_22_2, @@ -50,7 +51,7 @@ describe('cluster engine', () => { test('cluster parameter group correctly determined for AURORA_MYSQL and given version', () => { // GIVEN const engine = DatabaseClusterEngine.auroraMysql({ - version: AuroraMysqlEngineVersion.VER_2_07_1, + version: AuroraMysqlEngineVersion.VER_2_12_3, }); // WHEN @@ -63,7 +64,7 @@ describe('cluster engine', () => { test('cluster parameter group correctly determined for AURORA_MYSQL and given version 3', () => { // GIVEN const engine = DatabaseClusterEngine.auroraMysql({ - version: AuroraMysqlEngineVersion.VER_3_01_0, + version: AuroraMysqlEngineVersion.VER_3_07_1, }); // WHEN @@ -76,14 +77,14 @@ describe('cluster engine', () => { test('cluster parameter group correctly determined for AURORA_POSTGRESQL and given version', () => { // GIVEN const engine = DatabaseClusterEngine.auroraPostgres({ - version: AuroraPostgresEngineVersion.VER_11_6, + version: AuroraPostgresEngineVersion.VER_16_3, }); // WHEN const family = engine.parameterGroupFamily; // THEN - expect(family).toEqual('aurora-postgresql11'); + expect(family).toEqual('aurora-postgresql16'); }); test('parameter group family', () => { @@ -115,8 +116,8 @@ describe('cluster engine', () => { test('supported log types', () => { const mysqlLogTypes = ['error', 'general', 'slowquery', 'audit']; expect(DatabaseClusterEngine.aurora({ version: AuroraEngineVersion.VER_1_22_2 }).supportedLogTypes).toEqual(mysqlLogTypes); - expect(DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_2_08_1 }).supportedLogTypes).toEqual(mysqlLogTypes); - expect(DatabaseClusterEngine.auroraPostgres({ version: AuroraPostgresEngineVersion.VER_9_6_9 }).supportedLogTypes).toEqual(['postgresql']); + expect(DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_2_12_3 }).supportedLogTypes).toEqual(mysqlLogTypes); + expect(DatabaseClusterEngine.auroraPostgres({ version: AuroraPostgresEngineVersion.VER_16_3 }).supportedLogTypes).toEqual(['postgresql']); }); test('cluster parameter group correctly determined for AURORA_POSTGRESQL 14 (and other) and given version', () => { diff --git a/packages/aws-cdk-lib/aws-rds/test/cluster.test.ts b/packages/aws-cdk-lib/aws-rds/test/cluster.test.ts index a76cbb8ffcb7f..c3e4dcbe27eff 100644 --- a/packages/aws-cdk-lib/aws-rds/test/cluster.test.ts +++ b/packages/aws-cdk-lib/aws-rds/test/cluster.test.ts @@ -29,7 +29,7 @@ describe('cluster new api', () => { expect(() => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE2, ec2.InstanceSize.SMALL), vpc, @@ -49,7 +49,7 @@ describe('cluster new api', () => { expect(() => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, iamAuthentication: true, }); @@ -64,7 +64,7 @@ describe('cluster new api', () => { expect(() => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, writer: ClusterInstance.serverlessV2('writer'), iamAuthentication: true, }); @@ -80,7 +80,7 @@ describe('cluster new api', () => { expect(() => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE2, ec2.InstanceSize.SMALL), vpc, @@ -100,7 +100,7 @@ describe('cluster new api', () => { expect(() => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE2, ec2.InstanceSize.SMALL), vpcSubnets: vpc.selectSubnets( { subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS } ), @@ -130,7 +130,7 @@ describe('cluster new api', () => { expect(() => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, vpcSubnets: vpc.selectSubnets( { subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS } ), serverlessV2MaxCapacity: maxCapacity, @@ -150,7 +150,7 @@ describe('cluster new api', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.serverlessV2('writer'), iamAuthentication: true, @@ -207,7 +207,7 @@ describe('cluster new api', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, vpcSubnets: vpc.selectSubnets({ subnetType: ec2.SubnetType.PUBLIC }), writer: ClusterInstance.serverlessV2('writer'), @@ -244,7 +244,7 @@ describe('cluster new api', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { vpc: vpc, preferredMaintenanceWindow: PREFERRED_MAINTENANCE_WINDOW, @@ -267,7 +267,7 @@ describe('cluster new api', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc: vpc, writer: ClusterInstance.provisioned('Instance1', { preferredMaintenanceWindow: PREFERRED_MAINTENANCE_WINDOW, @@ -290,7 +290,7 @@ describe('cluster new api', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc: vpc, writer: ClusterInstance.provisioned('Instance1', { // No preferredMaintenanceWindow set @@ -322,7 +322,7 @@ describe('cluster new api', () => { // WHEN const pg = new ParameterGroup(stack, 'pg', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, }); const sg = new ec2.SecurityGroup(stack, 'sg', { vpc, @@ -342,13 +342,13 @@ describe('cluster new api', () => { const test1 = createCase(stack1); const test2 = createCase(stack2); new DatabaseCluster(stack1, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: test1, iamAuthentication: true, }); new DatabaseCluster(stack2, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc: test2.vpc, securityGroups: test2.securityGroups, writer: ClusterInstance.provisioned('Instance1', { @@ -384,7 +384,7 @@ describe('cluster new api', () => { // WHEN const pg = new ParameterGroup(stack, 'pg', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, }); const sg = new ec2.SecurityGroup(stack, 'sg', { vpc, @@ -407,7 +407,7 @@ describe('cluster new api', () => { // Create serverless cluster using workaround described here: // https://github.com/aws/aws-cdk/issues/20197#issuecomment-1284485844 const workaroundCluster = new DatabaseCluster(stack1, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: test1, iamAuthentication: true, }); @@ -426,7 +426,7 @@ describe('cluster new api', () => { // Create serverless cluster using new/official approach. // This should provide a non-breaking migration path from the workaround. new DatabaseCluster(stack2, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc: test2.vpc, securityGroups: test2.securityGroups, writer: ClusterInstance.serverlessV2('Instance1', { @@ -462,7 +462,7 @@ describe('cluster new api', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.serverlessV2('writer'), iamAuthentication: true, @@ -475,7 +475,7 @@ describe('cluster new api', () => { template.hasResourceProperties('AWS::RDS::DBInstance', { DBClusterIdentifier: { Ref: 'DatabaseB269D8BB' }, DBInstanceClass: 'db.serverless', - Engine: 'aurora', + Engine: 'aurora-mysql', PromotionTier: 0, }); }); @@ -488,13 +488,13 @@ describe('cluster new api', () => { // WHEN new DatabaseCluster(stack, 'Database', { removalPolicy: RemovalPolicy.RETAIN, - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.serverlessV2('writer', { allowMajorVersionUpgrade: true, autoMinorVersionUpgrade: true, enablePerformanceInsights: true, - parameterGroup: new ParameterGroup(stack, 'pg', { engine: DatabaseClusterEngine.AURORA }), + parameterGroup: new ParameterGroup(stack, 'pg', { engine: DatabaseClusterEngine.AURORA_MYSQL }), }), }); @@ -510,7 +510,7 @@ describe('cluster new api', () => { DBInstanceClass: 'db.serverless', DBParameterGroupName: { Ref: 'pg749EE6ED' }, EnablePerformanceInsights: true, - Engine: 'aurora', + Engine: 'aurora-mysql', PerformanceInsightsRetentionPeriod: 7, PromotionTier: 0, }, @@ -526,7 +526,7 @@ describe('cluster new api', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.provisioned('writer'), iamAuthentication: true, @@ -550,14 +550,14 @@ describe('cluster new api', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.provisioned('writer', { allowMajorVersionUpgrade: true, autoMinorVersionUpgrade: true, enablePerformanceInsights: true, instanceType: ec2.InstanceType.of(ec2.InstanceClass.C4, ec2.InstanceSize.LARGE ), - parameterGroup: new ParameterGroup(stack, 'pg', { engine: DatabaseClusterEngine.AURORA }), + parameterGroup: new ParameterGroup(stack, 'pg', { engine: DatabaseClusterEngine.AURORA_MYSQL }), }), iamAuthentication: true, }); @@ -574,7 +574,7 @@ describe('cluster new api', () => { DBInstanceClass: 'db.c4.large', DBParameterGroupName: { Ref: 'pg749EE6ED' }, EnablePerformanceInsights: true, - Engine: 'aurora', + Engine: 'aurora-mysql', PerformanceInsightsRetentionPeriod: 7, PromotionTier: 0, }); @@ -587,7 +587,7 @@ describe('cluster new api', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, vpcSubnets: vpc.selectSubnets({ subnetType: ec2.SubnetType.PUBLIC }), writer: ClusterInstance.serverlessV2('writer'), @@ -624,7 +624,7 @@ describe('cluster new api', () => { //WHEN const cluster = new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.serverlessV2('writer'), readers: [ClusterInstance.serverlessV2('reader')], @@ -647,7 +647,7 @@ describe('cluster new api', () => { //WHEN const cluster = new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.serverlessV2('writer'), readers: [ClusterInstance.serverlessV2('reader')], @@ -694,7 +694,7 @@ describe('cluster new api', () => { //WHEN const cluster = new DatabaseClusterFromSnapshot(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, snapshotIdentifier: 'snapshot-identifier', iamAuthentication: true, @@ -744,7 +744,7 @@ describe('cluster new api', () => { // WHEN const cluster = new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.provisioned('writer'), readers: [ClusterInstance.serverlessV2('reader')], @@ -781,7 +781,7 @@ describe('cluster new api', () => { // WHEN const cluster = new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.provisioned('writer'), readers: [ClusterInstance.serverlessV2('reader')], @@ -827,7 +827,7 @@ describe('cluster new api', () => { // WHEN const cluster = new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.provisioned('writer'), readers: [ClusterInstance.serverlessV2('reader')], @@ -864,7 +864,7 @@ describe('cluster new api', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.provisioned('writer'), readers: [ClusterInstance.serverlessV2('reader', { scaleWithWriter: true })], @@ -905,7 +905,7 @@ describe('cluster new api', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.provisioned('writer', { instanceType, @@ -947,7 +947,7 @@ describe('cluster new api', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.provisioned('writer', { // instanceType: ec2.InstanceType.of(ec2.InstanceClass.M5, ec2.InstanceSize.XLARGE24 ), @@ -980,7 +980,7 @@ describe('cluster new api', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.provisioned('writer', { instanceType: ec2.InstanceType.of(ec2.InstanceClass.M5, ec2.InstanceSize.XLARGE24 ), @@ -1028,7 +1028,7 @@ describe('cluster new api', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.provisioned('writer', { instanceType: ec2.InstanceType.of(ec2.InstanceClass.M5, ec2.InstanceSize.XLARGE24 ), @@ -1072,7 +1072,7 @@ describe('cluster new api', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.provisioned('writer', {}), readers: [ @@ -1113,7 +1113,7 @@ describe('cluster new api', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.provisioned('writer', { instanceType: ec2.InstanceType.of(ec2.InstanceClass.M5, ec2.InstanceSize.XLARGE24 ), @@ -1156,7 +1156,7 @@ describe('cluster new api', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.provisioned('writer', { instanceType: ec2.InstanceType.of(ec2.InstanceClass.M5, ec2.InstanceSize.XLARGE24 ), @@ -1210,7 +1210,7 @@ describe('cluster new api', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.provisioned('writer', { instanceType: ec2.InstanceType.of(ec2.InstanceClass.M5, ec2.InstanceSize.XLARGE24 ), @@ -1261,7 +1261,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, credentials: { username: 'admin', password: cdk.SecretValue.unsafePlainText('tooshort'), @@ -1276,7 +1276,7 @@ describe('cluster', () => { // THEN Template.fromStack(stack).hasResource('AWS::RDS::DBCluster', { Properties: { - Engine: 'aurora', + Engine: 'aurora-mysql', DBSubnetGroupName: { Ref: 'DatabaseSubnets56F17B9A' }, MasterUsername: 'admin', MasterUserPassword: 'tooshort', @@ -1303,7 +1303,7 @@ describe('cluster', () => { expect(() => { new DatabaseCluster(stack, 'Database', { instances: parameter.valueAsNumber, - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { vpc, }, @@ -1318,7 +1318,7 @@ describe('cluster', () => { // WHEN const cluster = new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instances: 1, credentials: { username: 'admin', @@ -1332,7 +1332,7 @@ describe('cluster', () => { // THEN Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBCluster', { - Engine: 'aurora', + Engine: 'aurora-mysql', DBSubnetGroupName: { Ref: 'DatabaseSubnets56F17B9A' }, MasterUsername: 'admin', MasterUserPassword: 'tooshort', @@ -1370,7 +1370,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instances: 5, instanceProps: { vpc, @@ -1403,7 +1403,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instances: 1, credentials: { username: 'admin', @@ -1418,7 +1418,7 @@ describe('cluster', () => { // THEN Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBCluster', { - Engine: 'aurora', + Engine: 'aurora-mysql', DBSubnetGroupName: { Ref: 'DatabaseSubnets56F17B9A' }, MasterUsername: 'admin', MasterUserPassword: 'tooshort', @@ -1433,14 +1433,14 @@ describe('cluster', () => { // WHEN const group = new ParameterGroup(stack, 'Params', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, description: 'bye', parameters: { param: 'value', }, }); new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, credentials: { username: 'admin', password: cdk.SecretValue.unsafePlainText('tooshort'), @@ -1464,7 +1464,7 @@ describe('cluster', () => { new DatabaseCluster(stack, 'Cluster', { credentials: { username: 'admin' }, - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { instanceType: ec2.InstanceType.of(ec2.InstanceClass.M5, ec2.InstanceSize.LARGE), vpc, @@ -1568,7 +1568,7 @@ describe('cluster', () => { const stack = testStack(); const vpc = new ec2.Vpc(stack, 'VPC'); const parameterGroup = new ParameterGroup(stack, 'ParameterGroup', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, parameters: { key: 'value', }, @@ -1576,7 +1576,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, credentials: { username: 'admin', }, @@ -1601,7 +1601,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, parameters: { locks: '100', }, @@ -1620,7 +1620,7 @@ describe('cluster', () => { }); Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBClusterParameterGroup', { - Family: 'aurora5.6', + Family: 'aurora-mysql5.7', Parameters: { locks: '100', }, @@ -1633,7 +1633,7 @@ describe('cluster', () => { }); Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBParameterGroup', { - Family: 'aurora5.6', + Family: 'aurora-mysql5.7', Parameters: { locks: '200', }, @@ -1655,7 +1655,7 @@ describe('cluster', () => { expect(() => { new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, parameters: { locks: '100', }, @@ -1685,7 +1685,7 @@ describe('cluster', () => { expect(() => { new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, parameters: { locks: '100', }, @@ -2175,7 +2175,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, credentials: { username: 'admin', }, @@ -2201,7 +2201,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, credentials: { username: 'admin', }, @@ -2224,7 +2224,7 @@ describe('cluster', () => { expect(() => { new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, credentials: { username: 'admin', }, @@ -2245,7 +2245,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { autoMinorVersionUpgrade: false, vpc, @@ -2264,7 +2264,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { allowMajorVersionUpgrade: true, vpc, @@ -2283,7 +2283,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { deleteAutomatedBackups: false, vpc, @@ -2354,7 +2354,7 @@ describe('cluster', () => { // WHEN const cluster = new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, credentials: { username: 'admin', }, @@ -2445,7 +2445,7 @@ describe('cluster', () => { const vpc = new ec2.Vpc(stack, 'VPC'); const cluster = new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_3_02_0 }), + engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_3_07_1 }), credentials: { username: 'admin', password: cdk.SecretValue.unsafePlainText('tooshort'), @@ -2473,7 +2473,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instances: 1, credentials: { username: 'admin', @@ -2530,7 +2530,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: ClusterInstance.serverlessV2('writer'), iamAuthentication: true, @@ -2589,7 +2589,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instances: 1, credentials: { username: 'admin', @@ -2987,7 +2987,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instances: 1, credentials: { username: 'admin', @@ -3012,7 +3012,7 @@ describe('cluster', () => { }); Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBClusterParameterGroup', { - Family: 'aurora5.6', + Family: 'aurora-mysql5.7', Parameters: { aurora_load_from_s3_role: { 'Fn::GetAtt': [ @@ -3033,7 +3033,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instances: 1, credentials: { username: 'admin', @@ -3058,7 +3058,7 @@ describe('cluster', () => { }); Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBClusterParameterGroup', { - Family: 'aurora5.6', + Family: 'aurora-mysql5.7', Parameters: { aurora_load_from_s3_role: { 'Fn::GetAtt': [ @@ -3236,7 +3236,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instances: 1, credentials: { username: 'admin', @@ -3261,7 +3261,7 @@ describe('cluster', () => { }); Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBClusterParameterGroup', { - Family: 'aurora5.6', + Family: 'aurora-mysql5.7', Parameters: { aurora_select_into_s3_role: { 'Fn::GetAtt': [ @@ -3282,7 +3282,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instances: 1, credentials: { username: 'admin', @@ -3307,7 +3307,7 @@ describe('cluster', () => { }); Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBClusterParameterGroup', { - Family: 'aurora5.6', + Family: 'aurora-mysql5.7', Parameters: { aurora_select_into_s3_role: { 'Fn::GetAtt': [ @@ -3374,7 +3374,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instances: 1, credentials: { username: 'admin', @@ -3408,7 +3408,7 @@ describe('cluster', () => { }); Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBClusterParameterGroup', { - Family: 'aurora5.6', + Family: 'aurora-mysql5.7', Parameters: { aurora_load_from_s3_role: { 'Fn::GetAtt': [ @@ -3432,7 +3432,7 @@ describe('cluster', () => { const vpc = new ec2.Vpc(stack, 'VPC'); const parameterGroup = new ParameterGroup(stack, 'ParameterGroup', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, parameters: { key: 'value', }, @@ -3443,7 +3443,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instances: 1, credentials: { username: 'admin', @@ -3478,7 +3478,7 @@ describe('cluster', () => { }); Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBClusterParameterGroup', { - Family: 'aurora5.6', + Family: 'aurora-mysql5.7', Parameters: { key: 'value', aurora_load_from_s3_role: { @@ -3671,7 +3671,7 @@ describe('cluster', () => { // THEN expect(() => new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instances: 1, credentials: { username: 'admin', @@ -3697,7 +3697,7 @@ describe('cluster', () => { // THEN expect(() => new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instances: 1, credentials: { username: 'admin', @@ -3718,7 +3718,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, credentials: { username: 'admin', password: cdk.SecretValue.unsafePlainText('tooshort'), @@ -3743,7 +3743,7 @@ describe('cluster', () => { // WHEN const cluster = new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, credentials: { username: 'admin', password: cdk.SecretValue.unsafePlainText('tooshort'), @@ -3789,7 +3789,7 @@ describe('cluster', () => { expect(() => { new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, credentials: { username: 'admin', password: cdk.SecretValue.unsafePlainText('tooshort'), @@ -3810,7 +3810,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, credentials: { username: 'admin', password: cdk.SecretValue.unsafePlainText('tooshort'), @@ -3836,7 +3836,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instances: 1, credentials: { username: 'admin', @@ -3862,7 +3862,7 @@ describe('cluster', () => { // WHEN const cluster = new DatabaseClusterFromSnapshot(stack, 'Database', { - engine: DatabaseClusterEngine.aurora({ version: AuroraEngineVersion.VER_1_22_2 }), + engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_3_07_1 }), instanceProps: { vpc, }, @@ -3873,8 +3873,8 @@ describe('cluster', () => { // THEN Template.fromStack(stack).hasResource('AWS::RDS::DBCluster', { Properties: { - Engine: 'aurora', - EngineVersion: '5.6.mysql_aurora.1.22.2', + Engine: 'aurora-mysql', + EngineVersion: '8.0.mysql_aurora.3.07.1', DBSubnetGroupName: { Ref: 'DatabaseSubnets56F17B9A' }, VpcSecurityGroupIds: [{ 'Fn::GetAtt': ['DatabaseSecurityGroup5C91FDCB', 'GroupId'] }], SnapshotIdentifier: 'mySnapshot', @@ -3918,7 +3918,7 @@ describe('cluster', () => { const vpc = new ec2.Vpc(stack, 'VPC'); new DatabaseClusterFromSnapshot(stack, 'Database', { - engine: DatabaseClusterEngine.aurora({ version: AuroraEngineVersion.VER_1_22_2 }), + engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_3_07_1 }), instanceProps: { vpc, }, @@ -3956,7 +3956,7 @@ describe('cluster', () => { const vpc = new ec2.Vpc(stack, 'VPC'); new DatabaseClusterFromSnapshot(stack, 'Database', { - engine: DatabaseClusterEngine.aurora({ version: AuroraEngineVersion.VER_1_22_2 }), + engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_3_07_1 }), instanceProps: { vpc, }, @@ -3980,7 +3980,7 @@ describe('cluster', () => { const vpc = new ec2.Vpc(stack, 'VPC'); expect(() => new DatabaseClusterFromSnapshot(stack, 'Database', { - engine: DatabaseClusterEngine.aurora({ version: AuroraEngineVersion.VER_1_22_2 }), + engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_3_07_1 }), instanceProps: { vpc, }, @@ -3998,7 +3998,7 @@ describe('cluster', () => { encryptionKey: new kms.Key(stack, 'PasswordKey'), }); new DatabaseClusterFromSnapshot(stack, 'Database', { - engine: DatabaseClusterEngine.aurora({ version: AuroraEngineVersion.VER_1_22_2 }), + engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_3_07_1 }), instanceProps: { vpc, }, @@ -4028,7 +4028,7 @@ describe('cluster', () => { // WHEN new DatabaseClusterFromSnapshot(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, snapshotIdentifier: 'mySnapshot', snapshotCredentials: SnapshotCredentials.fromSecret(secret), writer: ClusterInstance.serverlessV2('writer'), @@ -4053,7 +4053,7 @@ describe('cluster', () => { // WHEN new DatabaseClusterFromSnapshot(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, snapshotIdentifier: 'mySnapshot', snapshotCredentials: SnapshotCredentials.fromSecret(secret), writer: ClusterInstance.serverlessV2('writer'), @@ -4070,7 +4070,7 @@ describe('cluster', () => { // WHEN new DatabaseClusterFromSnapshot(stack, 'Database', { - engine: DatabaseClusterEngine.aurora({ version: AuroraEngineVersion.VER_1_22_2 }), + engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_3_07_1 }), instanceProps: { vpc, }, @@ -4091,7 +4091,7 @@ describe('cluster', () => { const vpc = new ec2.Vpc(stack, 'VPC'); const cluster = new DatabaseClusterFromSnapshot(stack, 'Database', { - engine: DatabaseClusterEngine.aurora({ version: AuroraEngineVersion.VER_1_22_2 }), + engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_3_07_1 }), instanceProps: { vpc, }, @@ -4115,7 +4115,7 @@ describe('cluster', () => { const vpc = new ec2.Vpc(stack, 'VPC'); const cluster = new DatabaseClusterFromSnapshot(stack, 'Database', { - engine: DatabaseClusterEngine.aurora({ version: AuroraEngineVersion.VER_1_22_2 }), + engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_3_07_1 }), instanceProps: { vpc, }, @@ -4135,7 +4135,7 @@ describe('cluster', () => { const vpc = new ec2.Vpc(stack, 'VPC'); const cluster = new DatabaseClusterFromSnapshot(stack, 'Database', { - engine: DatabaseClusterEngine.aurora({ version: AuroraEngineVersion.VER_1_22_2 }), + engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_3_07_1 }), instanceProps: { vpc, }, @@ -4178,7 +4178,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.aurora({ version: AuroraEngineVersion.VER_1_22_2 }), + engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_3_07_1 }), credentials: { username: 'admin', }, @@ -4202,7 +4202,7 @@ describe('cluster', () => { // WHEN const cluster = new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.aurora({ version: AuroraEngineVersion.VER_1_22_2 }), + engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_3_07_1 }), credentials: { username: 'admin', }, @@ -4222,7 +4222,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.aurora({ version: AuroraEngineVersion.VER_1_22_2 }), + engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_3_07_1 }), credentials: Credentials.fromGeneratedSecret('admin'), instanceProps: { vpc, @@ -4254,7 +4254,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.aurora({ version: AuroraEngineVersion.VER_1_22_2 }), + engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_3_07_1 }), credentials: Credentials.fromGeneratedSecret('admin', { replicaRegions: [{ region: 'eu-west-1' }], }), @@ -4285,7 +4285,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.aurora({ version: AuroraEngineVersion.VER_1_22_2 }), + engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_3_07_1 }), credentials: Credentials.fromSecret(secret), instanceProps: { vpc, @@ -4306,7 +4306,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.aurora({ version: AuroraEngineVersion.VER_1_22_2 }), + engine: DatabaseClusterEngine.auroraMysql({ version: AuroraMysqlEngineVersion.VER_3_07_1 }), credentials: Credentials.fromGeneratedSecret('admin', { secretName }), instanceProps: { vpc, @@ -4326,7 +4326,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { vpc, vpcSubnets: { @@ -4337,7 +4337,7 @@ describe('cluster', () => { }); // THEN Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBInstance', { - Engine: 'aurora', + Engine: 'aurora-mysql', PubliclyAccessible: true, }); }); @@ -4349,7 +4349,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { vpc, vpcSubnets: { @@ -4360,7 +4360,7 @@ describe('cluster', () => { }); // THEN Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBInstance', { - Engine: 'aurora', + Engine: 'aurora-mysql', PubliclyAccessible: false, }); }); @@ -4372,7 +4372,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { vpc, vpcSubnets: { @@ -4382,7 +4382,7 @@ describe('cluster', () => { }); // THEN Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBInstance', { - Engine: 'aurora', + Engine: 'aurora-mysql', PubliclyAccessible: true, }); }); @@ -4394,7 +4394,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, writer: ClusterInstance.serverlessV2('writer'), vpc, vpcSubnets: { @@ -4404,7 +4404,7 @@ describe('cluster', () => { // THEN Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBInstance', { - Engine: 'aurora', + Engine: 'aurora-mysql', PubliclyAccessible: true, }); }); @@ -4416,7 +4416,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, writer: ClusterInstance.serverlessV2('writer', { publiclyAccessible: true, }), @@ -4428,7 +4428,7 @@ describe('cluster', () => { // THEN Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBInstance', { - Engine: 'aurora', + Engine: 'aurora-mysql', PubliclyAccessible: true, }); }); @@ -4440,7 +4440,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, writer: ClusterInstance.serverlessV2('writer', { publiclyAccessible: false, }), @@ -4452,7 +4452,7 @@ describe('cluster', () => { // THEN Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBInstance', { - Engine: 'aurora', + Engine: 'aurora-mysql', PubliclyAccessible: false, }); }); @@ -4465,7 +4465,7 @@ describe('cluster', () => { // WHEN const clusterIdentifier = 'TestClusterIdentifier'; new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { vpc }, clusterIdentifier, }); @@ -4485,7 +4485,7 @@ describe('cluster', () => { // WHEN const clusterIdentifier = 'TestClusterIdentifier'; new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { vpc }, clusterIdentifier, }); @@ -4503,7 +4503,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { vpc, }, @@ -4522,7 +4522,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { vpc, }, @@ -4542,7 +4542,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, copyTagsToSnapshot: true, instanceProps: { vpc, @@ -4562,7 +4562,7 @@ describe('cluster', () => { // WHEN new DatabaseCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { vpc, }, @@ -4912,7 +4912,7 @@ test.each([ // WHEN new DatabaseCluster(stack, 'Cluster', { credentials: { username: 'admin' }, - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { instanceType: ec2.InstanceType.of(ec2.InstanceClass.M5, ec2.InstanceSize.LARGE), vpc: new ec2.Vpc(stack, 'Vpc'), @@ -4946,7 +4946,7 @@ test.each([ // WHEN new DatabaseCluster(stack, 'Cluster', { credentials: { username: 'admin' }, - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { instanceType: ec2.InstanceType.of(ec2.InstanceClass.M5, ec2.InstanceSize.LARGE), vpc: new ec2.Vpc(stack, 'Vpc'), diff --git a/packages/aws-cdk-lib/aws-rds/test/parameter-group.test.ts b/packages/aws-cdk-lib/aws-rds/test/parameter-group.test.ts index a47d76953bd11..c145e8dc769b0 100644 --- a/packages/aws-cdk-lib/aws-rds/test/parameter-group.test.ts +++ b/packages/aws-cdk-lib/aws-rds/test/parameter-group.test.ts @@ -9,7 +9,7 @@ describe('parameter group', () => { // WHEN new ParameterGroup(stack, 'Params', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, description: 'desc', parameters: { key: 'value', @@ -27,7 +27,7 @@ describe('parameter group', () => { // WHEN const parameterGroup = new ParameterGroup(stack, 'Params', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, description: 'desc', name: 'name', parameters: { @@ -40,7 +40,7 @@ describe('parameter group', () => { Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBParameterGroup', { DBParameterGroupName: 'name', Description: 'desc', - Family: 'aurora5.6', + Family: 'aurora-mysql5.7', Parameters: { key: 'value', }, @@ -53,7 +53,7 @@ describe('parameter group', () => { // WHEN const parameterGroup = new ParameterGroup(stack, 'Params', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, description: 'desc', name: 'name', parameters: { @@ -66,7 +66,7 @@ describe('parameter group', () => { Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBClusterParameterGroup', { DBClusterParameterGroupName: 'name', Description: 'desc', - Family: 'aurora5.6', + Family: 'aurora-mysql5.7', Parameters: { key: 'value', }, @@ -79,7 +79,7 @@ describe('parameter group', () => { // WHEN const parameterGroup = new ParameterGroup(stack, 'Params', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, description: 'desc', parameters: { key: 'value', @@ -99,7 +99,7 @@ describe('parameter group', () => { // WHEN const parameterGroup = new ParameterGroup(stack, 'Params', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, description: 'desc', removalPolicy: cdk.RemovalPolicy.RETAIN, parameters: { @@ -126,7 +126,7 @@ describe('parameter group', () => { // WHEN const clusterParameterGroup = new ParameterGroup(stack, 'Params', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, description: 'desc', parameters: { key1: 'value1', @@ -139,7 +139,7 @@ describe('parameter group', () => { // THEN Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBClusterParameterGroup', { Description: 'desc', - Family: 'aurora5.6', + Family: 'aurora-mysql5.7', Parameters: { key1: 'value1', key2: 'value2', diff --git a/packages/aws-cdk-lib/aws-rds/test/proxy.test.ts b/packages/aws-cdk-lib/aws-rds/test/proxy.test.ts index b8c31cdcb4595..47c5774656def 100644 --- a/packages/aws-cdk-lib/aws-rds/test/proxy.test.ts +++ b/packages/aws-cdk-lib/aws-rds/test/proxy.test.ts @@ -353,7 +353,7 @@ describe('proxy', () => { test('new Proxy with a single Secret can use grantConnect() without a dbUser passed', () => { // GIVEN const cluster = new rds.DatabaseCluster(stack, 'Database', { - engine: rds.DatabaseClusterEngine.AURORA, + engine: rds.DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { vpc }, }); @@ -409,7 +409,7 @@ describe('proxy', () => { test('new Proxy with multiple Secrets cannot use grantConnect() without a dbUser passed', () => { // GIVEN const cluster = new rds.DatabaseCluster(stack, 'Database', { - engine: rds.DatabaseClusterEngine.AURORA, + engine: rds.DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { vpc }, }); @@ -436,7 +436,7 @@ describe('proxy', () => { test('new Proxy with kms encrypted Secrets has permissions to kms:Decrypt that secret using its key', () => { // GIVEN const cluster = new rds.DatabaseCluster(stack, 'Database', { - engine: rds.DatabaseClusterEngine.AURORA, + engine: rds.DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { vpc }, }); @@ -481,7 +481,7 @@ describe('proxy', () => { test('DBProxyTargetGroup should have dependency on the proxy targets', () => { // GIVEN const cluster = new rds.DatabaseCluster(stack, 'cluster', { - engine: rds.DatabaseClusterEngine.AURORA, + engine: rds.DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { vpc, }, @@ -513,7 +513,7 @@ describe('proxy', () => { test('Correct dependencies are created when multiple DatabaseProxy are created with addProxy', () => { // GIVEN const cluster = new rds.DatabaseCluster(stack, 'cluster', { - engine: rds.DatabaseClusterEngine.AURORA, + engine: rds.DatabaseClusterEngine.AURORA_MYSQL, instanceProps: { vpc, }, @@ -561,7 +561,7 @@ describe('proxy', () => { test('DBProxyTargetGroup should have dependency on the proxy targets when using cluster with writer and readers properties', () => { // GIVEN const cluster = new rds.DatabaseCluster(stack, 'cluster', { - engine: rds.DatabaseClusterEngine.AURORA, + engine: rds.DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: rds.ClusterInstance.provisioned('writer'), readers: [rds.ClusterInstance.provisioned('reader')], @@ -593,7 +593,7 @@ describe('proxy', () => { test('Correct dependencies are created when multiple DatabaseProxy are created with addProxy for cluster with writer and readers properties', () => { // GIVEN const cluster = new rds.DatabaseCluster(stack, 'cluster', { - engine: rds.DatabaseClusterEngine.AURORA, + engine: rds.DatabaseClusterEngine.AURORA_MYSQL, vpc, writer: rds.ClusterInstance.provisioned('writer'), readers: [rds.ClusterInstance.provisioned('reader')], diff --git a/packages/aws-cdk-lib/aws-rds/test/serverless-cluster.test.ts b/packages/aws-cdk-lib/aws-rds/test/serverless-cluster.test.ts index 5382baf85984c..2feff6668c412 100644 --- a/packages/aws-cdk-lib/aws-rds/test/serverless-cluster.test.ts +++ b/packages/aws-cdk-lib/aws-rds/test/serverless-cluster.test.ts @@ -250,7 +250,7 @@ describe('serverless cluster', () => { // WHEN const cluster = new ServerlessCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_MYSQL, credentials: { username: 'admin', }, @@ -891,7 +891,7 @@ describe('serverless cluster', () => { // WHEN new ServerlessCluster(stack, 'Database', { - engine: DatabaseClusterEngine.AURORA, + engine: DatabaseClusterEngine.AURORA_POSTGRESQL, parameterGroup: ParameterGroup.fromParameterGroupName(stack, 'ParameterGroup', 'default.aurora-postgresql11'), });