add tests for explicit IPV4 network type

aws · Oct 26, 2022 · ea76456 · ea76456
1 parent d5626a8
commit ea76456
Show file tree

Hide file tree

Showing 12 changed files with 603 additions and 95 deletions.
diff --git a/...s-cdk/aws-rds/test/cluster-dual.integ.snapshot/aws-cdk-rds-cluster-dual-integ.assets.json b/...s-cdk/aws-rds/test/cluster-dual.integ.snapshot/aws-cdk-rds-cluster-dual-integ.assets.json
@@ -1,15 +1,15 @@
 {
   "version": "21.0.0",
   "files": {
-    "9b8293a935910285b9a77c0b7aa6288d109228bc8ab9b69cd74b8a3e12b65706": {
+    "b5ff1147ce210b6a8be6120310d71e1a1bcb6c64b802b268e0b994bb80eb9ced": {
       "source": {
         "path": "aws-cdk-rds-cluster-dual-integ.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "9b8293a935910285b9a77c0b7aa6288d109228bc8ab9b69cd74b8a3e12b65706.json",
+          "objectKey": "b5ff1147ce210b6a8be6120310d71e1a1bcb6c64b802b268e0b994bb80eb9ced.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...cdk/aws-rds/test/cluster-dual.integ.snapshot/aws-cdk-rds-cluster-dual-integ.template.json b/...cdk/aws-rds/test/cluster-dual.integ.snapshot/aws-cdk-rds-cluster-dual-integ.template.json
@@ -354,10 +354,10 @@
     "AmazonProvidedIpv6CidrBlock": true
    }
   },
-  "ClusterSubnetsDCFA5CB7": {
+  "DualstackClusterSubnets00EA466E": {
    "Type": "AWS::RDS::DBSubnetGroup",
    "Properties": {
-    "DBSubnetGroupDescription": "Subnets for Cluster database",
+    "DBSubnetGroupDescription": "Subnets for DualstackCluster database",
     "SubnetIds": [
      {
       "Ref": "VPCIsolatedSubnet1SubnetEBD00FC6"
@@ -368,7 +368,7 @@
     ]
    }
   },
-  "ClusterSecurityGroup0921994B": {
+  "DualstackClusterSecurityGroupA8CDA208": {
    "Type": "AWS::EC2::SecurityGroup",
    "Properties": {
     "GroupDescription": "RDS security group",
@@ -384,14 +384,14 @@
     }
    }
   },
-  "ClusterEB0386A7": {
+  "DualstackCluster84A5FE37": {
    "Type": "AWS::RDS::DBCluster",
    "Properties": {
     "Engine": "aurora-mysql",
     "CopyTagsToSnapshot": true,
     "DBClusterParameterGroupName": "default.aurora-mysql8.0",
     "DBSubnetGroupName": {
-     "Ref": "ClusterSubnetsDCFA5CB7"
+     "Ref": "DualstackClusterSubnets00EA466E"
     },
     "EngineVersion": "8.0.mysql_aurora.3.02.0",
     "MasterUsername": "admin",
@@ -400,7 +400,7 @@
     "VpcSecurityGroupIds": [
      {
       "Fn::GetAtt": [
-       "ClusterSecurityGroup0921994B",
+       "DualstackClusterSecurityGroupA8CDA208",
        "GroupId"
       ]
      }
@@ -409,15 +409,15 @@
    "UpdateReplacePolicy": "Delete",
    "DeletionPolicy": "Delete"
   },
-  "ClusterInstance1448F06E4": {
+  "DualstackClusterInstance11BFB1E7F": {
    "Type": "AWS::RDS::DBInstance",
    "Properties": {
     "DBClusterIdentifier": {
-     "Ref": "ClusterEB0386A7"
+     "Ref": "DualstackCluster84A5FE37"
     },
     "DBInstanceClass": "db.t3.medium",
     "DBSubnetGroupName": {
-     "Ref": "ClusterSubnetsDCFA5CB7"
+     "Ref": "DualstackClusterSubnets00EA466E"
     },
     "Engine": "aurora-mysql",
     "PubliclyAccessible": false
@@ -429,15 +429,110 @@
    "UpdateReplacePolicy": "Delete",
    "DeletionPolicy": "Delete"
   },
-  "ClusterInstance2C3E0561B": {
+  "DualstackClusterInstance227DA8F29": {
    "Type": "AWS::RDS::DBInstance",
    "Properties": {
     "DBClusterIdentifier": {
-     "Ref": "ClusterEB0386A7"
+     "Ref": "DualstackCluster84A5FE37"
     },
     "DBInstanceClass": "db.t3.medium",
     "DBSubnetGroupName": {
-     "Ref": "ClusterSubnetsDCFA5CB7"
+     "Ref": "DualstackClusterSubnets00EA466E"
+    },
+    "Engine": "aurora-mysql",
+    "PubliclyAccessible": false
+   },
+   "DependsOn": [
+    "VPCIsolatedSubnet1RouteTableAssociationA2D18F7C",
+    "VPCIsolatedSubnet2RouteTableAssociation7BF8E0EB"
+   ],
+   "UpdateReplacePolicy": "Delete",
+   "DeletionPolicy": "Delete"
+  },
+  "Ipv4ClusterSubnets5BD573AA": {
+   "Type": "AWS::RDS::DBSubnetGroup",
+   "Properties": {
+    "DBSubnetGroupDescription": "Subnets for Ipv4Cluster database",
+    "SubnetIds": [
+     {
+      "Ref": "VPCIsolatedSubnet1SubnetEBD00FC6"
+     },
+     {
+      "Ref": "VPCIsolatedSubnet2Subnet4B1C8CAA"
+     }
+    ]
+   }
+  },
+  "Ipv4ClusterSecurityGroup90341172": {
+   "Type": "AWS::EC2::SecurityGroup",
+   "Properties": {
+    "GroupDescription": "RDS security group",
+    "SecurityGroupEgress": [
+     {
+      "CidrIp": "0.0.0.0/0",
+      "Description": "Allow all outbound traffic by default",
+      "IpProtocol": "-1"
+     }
+    ],
+    "VpcId": {
+     "Ref": "VPCB9E5F0B4"
+    }
+   }
+  },
+  "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",
+    "MasterUserPassword": "7959866cacc02c2d243ecfe177464fe6",
+    "NetworkType": "IPV4",
+    "VpcSecurityGroupIds": [
+     {
+      "Fn::GetAtt": [
+       "Ipv4ClusterSecurityGroup90341172",
+       "GroupId"
+      ]
+     }
+    ]
+   },
+   "UpdateReplacePolicy": "Delete",
+   "DeletionPolicy": "Delete"
+  },
+  "Ipv4ClusterInstance1AC5CF4FD": {
+   "Type": "AWS::RDS::DBInstance",
+   "Properties": {
+    "DBClusterIdentifier": {
+     "Ref": "Ipv4Cluster5F67A28A"
+    },
+    "DBInstanceClass": "db.t3.medium",
+    "DBSubnetGroupName": {
+     "Ref": "Ipv4ClusterSubnets5BD573AA"
+    },
+    "Engine": "aurora-mysql",
+    "PubliclyAccessible": false
+   },
+   "DependsOn": [
+    "VPCIsolatedSubnet1RouteTableAssociationA2D18F7C",
+    "VPCIsolatedSubnet2RouteTableAssociation7BF8E0EB"
+   ],
+   "UpdateReplacePolicy": "Delete",
+   "DeletionPolicy": "Delete"
+  },
+  "Ipv4ClusterInstance20433FFCA": {
+   "Type": "AWS::RDS::DBInstance",
+   "Properties": {
+    "DBClusterIdentifier": {
+     "Ref": "Ipv4Cluster5F67A28A"
+    },
+    "DBInstanceClass": "db.t3.medium",
+    "DBSubnetGroupName": {
+     "Ref": "Ipv4ClusterSubnets5BD573AA"
     },
     "Engine": "aurora-mysql",
     "PubliclyAccessible": false

diff --git a/packages/@aws-cdk/aws-rds/test/cluster-dual.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-rds/test/cluster-dual.integ.snapshot/manifest.json
@@ -23,7 +23,7 @@
         "validateOnSynth": false,
         "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}/9b8293a935910285b9a77c0b7aa6288d109228bc8ab9b69cd74b8a3e12b65706.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/b5ff1147ce210b6a8be6120310d71e1a1bcb6c64b802b268e0b994bb80eb9ced.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -147,34 +147,64 @@
             "data": "Ipv6CidrBlock"
           }
         ],
-        "/aws-cdk-rds-cluster-dual-integ/Cluster/Subnets/Default": [
+        "/aws-cdk-rds-cluster-dual-integ/DualstackCluster/Subnets/Default": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "ClusterSubnetsDCFA5CB7"
+            "data": "DualstackClusterSubnets00EA466E"
           }
         ],
-        "/aws-cdk-rds-cluster-dual-integ/Cluster/SecurityGroup/Resource": [
+        "/aws-cdk-rds-cluster-dual-integ/DualstackCluster/SecurityGroup/Resource": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "ClusterSecurityGroup0921994B"
+            "data": "DualstackClusterSecurityGroupA8CDA208"
           }
         ],
-        "/aws-cdk-rds-cluster-dual-integ/Cluster/Resource": [
+        "/aws-cdk-rds-cluster-dual-integ/DualstackCluster/Resource": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "ClusterEB0386A7"
+            "data": "DualstackCluster84A5FE37"
           }
         ],
-        "/aws-cdk-rds-cluster-dual-integ/Cluster/Instance1": [
+        "/aws-cdk-rds-cluster-dual-integ/DualstackCluster/Instance1": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "ClusterInstance1448F06E4"
+            "data": "DualstackClusterInstance11BFB1E7F"
           }
         ],
-        "/aws-cdk-rds-cluster-dual-integ/Cluster/Instance2": [
+        "/aws-cdk-rds-cluster-dual-integ/DualstackCluster/Instance2": [
           {
             "type": "aws:cdk:logicalId",
-            "data": "ClusterInstance2C3E0561B"
+            "data": "DualstackClusterInstance227DA8F29"
+          }
+        ],
+        "/aws-cdk-rds-cluster-dual-integ/Ipv4Cluster/Subnets/Default": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "Ipv4ClusterSubnets5BD573AA"
+          }
+        ],
+        "/aws-cdk-rds-cluster-dual-integ/Ipv4Cluster/SecurityGroup/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "Ipv4ClusterSecurityGroup90341172"
+          }
+        ],
+        "/aws-cdk-rds-cluster-dual-integ/Ipv4Cluster/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "Ipv4Cluster5F67A28A"
+          }
+        ],
+        "/aws-cdk-rds-cluster-dual-integ/Ipv4Cluster/Instance1": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "Ipv4ClusterInstance1AC5CF4FD"
+          }
+        ],
+        "/aws-cdk-rds-cluster-dual-integ/Ipv4Cluster/Instance2": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "Ipv4ClusterInstance20433FFCA"
           }
         ],
         "/aws-cdk-rds-cluster-dual-integ/BootstrapVersion": [