From 0333c810cb6e7925696987f3410748ecf146daa3 Mon Sep 17 00:00:00 2001 From: Vandita2020 Date: Thu, 25 Jan 2024 10:19:36 -0800 Subject: [PATCH 1/2] Add support for Ipv6 VPC for Lambda --- ...efaultTestDeployAssert8ACBFB2C.assets.json | 19 + ...aultTestDeployAssert8ACBFB2C.template.json | 36 + .../DualStackVpc.assets.json | 32 + .../DualStackVpc.template.json | 1145 +++++++++++++ .../__entrypoint__.js | 147 ++ .../index.js | 1 + .../cdk.out | 1 + .../integ.json | 12 + .../manifest.json | 383 +++++ .../tree.json | 1501 +++++++++++++++++ .../test/integ.lambda_with_dualStack_vpc.ts | 42 + packages/aws-cdk-lib/aws-lambda/README.md | 43 + .../aws-cdk-lib/aws-lambda/lib/function.ts | 28 +- .../aws-lambda/test/function.test.ts | 52 + 14 files changed, 3438 insertions(+), 4 deletions(-) create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackTestingDefaultTestDeployAssert8ACBFB2C.assets.json create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackTestingDefaultTestDeployAssert8ACBFB2C.template.json create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackVpc.assets.json create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackVpc.template.json create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/asset.4554b47be6f57b68c6c7a7391dcc73894866d2377fe174883351e7639097f292/__entrypoint__.js create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/asset.4554b47be6f57b68c6c7a7391dcc73894866d2377fe174883351e7639097f292/index.js create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/cdk.out create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/integ.json create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/manifest.json create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/tree.json create mode 100644 packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.ts diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackTestingDefaultTestDeployAssert8ACBFB2C.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackTestingDefaultTestDeployAssert8ACBFB2C.assets.json new file mode 100644 index 0000000000000..1f48cdfd504c4 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackTestingDefaultTestDeployAssert8ACBFB2C.assets.json @@ -0,0 +1,19 @@ +{ + "version": "36.0.0", + "files": { + "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { + "source": { + "path": "DualStackTestingDefaultTestDeployAssert8ACBFB2C.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-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackTestingDefaultTestDeployAssert8ACBFB2C.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackTestingDefaultTestDeployAssert8ACBFB2C.template.json new file mode 100644 index 0000000000000..ad9d0fb73d1dd --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackTestingDefaultTestDeployAssert8ACBFB2C.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-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackVpc.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackVpc.assets.json new file mode 100644 index 0000000000000..338263e438f8d --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackVpc.assets.json @@ -0,0 +1,32 @@ +{ + "version": "36.0.0", + "files": { + "4554b47be6f57b68c6c7a7391dcc73894866d2377fe174883351e7639097f292": { + "source": { + "path": "asset.4554b47be6f57b68c6c7a7391dcc73894866d2377fe174883351e7639097f292", + "packaging": "zip" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "4554b47be6f57b68c6c7a7391dcc73894866d2377fe174883351e7639097f292.zip", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + }, + "225ebf0ceea059c584f3011672077deab41d93a6383af8a75ea4fb479f44b37d": { + "source": { + "path": "DualStackVpc.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "225ebf0ceea059c584f3011672077deab41d93a6383af8a75ea4fb479f44b37d.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-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackVpc.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackVpc.template.json new file mode 100644 index 0000000000000..b98c91886b34d --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackVpc.template.json @@ -0,0 +1,1145 @@ +{ + "Resources": { + "DualStackProtocolVpc85768F2C": { + "Type": "AWS::EC2::VPC", + "Properties": { + "CidrBlock": "10.0.0.0/16", + "EnableDnsHostnames": true, + "EnableDnsSupport": true, + "InstanceTenancy": "default", + "Tags": [ + { + "Key": "Name", + "Value": "DualStackVpc/DualStackProtocolVpc" + } + ] + } + }, + "DualStackProtocolVpcipv6cidr449C49CD": { + "Type": "AWS::EC2::VPCCidrBlock", + "Properties": { + "AmazonProvidedIpv6CidrBlock": true, + "VpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + } + }, + "DualStackProtocolVpcPub1Subnet1Subnet74CA4B8A": { + "Type": "AWS::EC2::Subnet", + "Properties": { + "AssignIpv6AddressOnCreation": true, + "AvailabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, + "CidrBlock": "10.0.0.0/19", + "Ipv6CidrBlock": { + "Fn::Select": [ + 0, + { + "Fn::Cidr": [ + { + "Fn::Select": [ + 0, + { + "Fn::GetAtt": [ + "DualStackProtocolVpc85768F2C", + "Ipv6CidrBlocks" + ] + } + ] + }, + 6, + "64" + ] + } + ] + }, + "MapPublicIpOnLaunch": false, + "Tags": [ + { + "Key": "aws-cdk:subnet-name", + "Value": "Pub1" + }, + { + "Key": "aws-cdk:subnet-type", + "Value": "Public" + }, + { + "Key": "Name", + "Value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1" + } + ], + "VpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPub1Subnet1RouteTable67D20294": { + "Type": "AWS::EC2::RouteTable", + "Properties": { + "Tags": [ + { + "Key": "Name", + "Value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1" + } + ], + "VpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPub1Subnet1RouteTableAssociation047F9491": { + "Type": "AWS::EC2::SubnetRouteTableAssociation", + "Properties": { + "RouteTableId": { + "Ref": "DualStackProtocolVpcPub1Subnet1RouteTable67D20294" + }, + "SubnetId": { + "Ref": "DualStackProtocolVpcPub1Subnet1Subnet74CA4B8A" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPub1Subnet1DefaultRoute95ED74BD": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationCidrBlock": "0.0.0.0/0", + "GatewayId": { + "Ref": "DualStackProtocolVpcIGW0F74732B" + }, + "RouteTableId": { + "Ref": "DualStackProtocolVpcPub1Subnet1RouteTable67D20294" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD", + "DualStackProtocolVpcVPCGWADE48B7D" + ] + }, + "DualStackProtocolVpcPub1Subnet1DefaultRoute6C01F89FD": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationIpv6CidrBlock": "::/0", + "GatewayId": { + "Ref": "DualStackProtocolVpcIGW0F74732B" + }, + "RouteTableId": { + "Ref": "DualStackProtocolVpcPub1Subnet1RouteTable67D20294" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPub1Subnet1EIP12EDF1FD": { + "Type": "AWS::EC2::EIP", + "Properties": { + "Domain": "vpc", + "Tags": [ + { + "Key": "Name", + "Value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1" + } + ] + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPub1Subnet1NATGateway241D9A98": { + "Type": "AWS::EC2::NatGateway", + "Properties": { + "AllocationId": { + "Fn::GetAtt": [ + "DualStackProtocolVpcPub1Subnet1EIP12EDF1FD", + "AllocationId" + ] + }, + "SubnetId": { + "Ref": "DualStackProtocolVpcPub1Subnet1Subnet74CA4B8A" + }, + "Tags": [ + { + "Key": "Name", + "Value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1" + } + ] + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD", + "DualStackProtocolVpcPub1Subnet1DefaultRoute95ED74BD", + "DualStackProtocolVpcPub1Subnet1DefaultRoute6C01F89FD", + "DualStackProtocolVpcPub1Subnet1RouteTableAssociation047F9491" + ] + }, + "DualStackProtocolVpcPub1Subnet2Subnet8B1A85E2": { + "Type": "AWS::EC2::Subnet", + "Properties": { + "AssignIpv6AddressOnCreation": true, + "AvailabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, + "CidrBlock": "10.0.32.0/19", + "Ipv6CidrBlock": { + "Fn::Select": [ + 1, + { + "Fn::Cidr": [ + { + "Fn::Select": [ + 0, + { + "Fn::GetAtt": [ + "DualStackProtocolVpc85768F2C", + "Ipv6CidrBlocks" + ] + } + ] + }, + 6, + "64" + ] + } + ] + }, + "MapPublicIpOnLaunch": false, + "Tags": [ + { + "Key": "aws-cdk:subnet-name", + "Value": "Pub1" + }, + { + "Key": "aws-cdk:subnet-type", + "Value": "Public" + }, + { + "Key": "Name", + "Value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2" + } + ], + "VpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPub1Subnet2RouteTable63549985": { + "Type": "AWS::EC2::RouteTable", + "Properties": { + "Tags": [ + { + "Key": "Name", + "Value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2" + } + ], + "VpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPub1Subnet2RouteTableAssociation12736FE3": { + "Type": "AWS::EC2::SubnetRouteTableAssociation", + "Properties": { + "RouteTableId": { + "Ref": "DualStackProtocolVpcPub1Subnet2RouteTable63549985" + }, + "SubnetId": { + "Ref": "DualStackProtocolVpcPub1Subnet2Subnet8B1A85E2" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPub1Subnet2DefaultRoute293C2941": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationCidrBlock": "0.0.0.0/0", + "GatewayId": { + "Ref": "DualStackProtocolVpcIGW0F74732B" + }, + "RouteTableId": { + "Ref": "DualStackProtocolVpcPub1Subnet2RouteTable63549985" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD", + "DualStackProtocolVpcVPCGWADE48B7D" + ] + }, + "DualStackProtocolVpcPub1Subnet2DefaultRoute67E6A8DC8": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationIpv6CidrBlock": "::/0", + "GatewayId": { + "Ref": "DualStackProtocolVpcIGW0F74732B" + }, + "RouteTableId": { + "Ref": "DualStackProtocolVpcPub1Subnet2RouteTable63549985" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPub1Subnet2EIP149FAFF5": { + "Type": "AWS::EC2::EIP", + "Properties": { + "Domain": "vpc", + "Tags": [ + { + "Key": "Name", + "Value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2" + } + ] + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPub1Subnet2NATGateway64DC713B": { + "Type": "AWS::EC2::NatGateway", + "Properties": { + "AllocationId": { + "Fn::GetAtt": [ + "DualStackProtocolVpcPub1Subnet2EIP149FAFF5", + "AllocationId" + ] + }, + "SubnetId": { + "Ref": "DualStackProtocolVpcPub1Subnet2Subnet8B1A85E2" + }, + "Tags": [ + { + "Key": "Name", + "Value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2" + } + ] + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD", + "DualStackProtocolVpcPub1Subnet2DefaultRoute293C2941", + "DualStackProtocolVpcPub1Subnet2DefaultRoute67E6A8DC8", + "DualStackProtocolVpcPub1Subnet2RouteTableAssociation12736FE3" + ] + }, + "DualStackProtocolVpcPub2Subnet1Subnet483B9827": { + "Type": "AWS::EC2::Subnet", + "Properties": { + "AssignIpv6AddressOnCreation": true, + "AvailabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, + "CidrBlock": "10.0.64.0/19", + "Ipv6CidrBlock": { + "Fn::Select": [ + 2, + { + "Fn::Cidr": [ + { + "Fn::Select": [ + 0, + { + "Fn::GetAtt": [ + "DualStackProtocolVpc85768F2C", + "Ipv6CidrBlocks" + ] + } + ] + }, + 6, + "64" + ] + } + ] + }, + "MapPublicIpOnLaunch": false, + "Tags": [ + { + "Key": "aws-cdk:subnet-name", + "Value": "Pub2" + }, + { + "Key": "aws-cdk:subnet-type", + "Value": "Public" + }, + { + "Key": "Name", + "Value": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1" + } + ], + "VpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPub2Subnet1RouteTable95379836": { + "Type": "AWS::EC2::RouteTable", + "Properties": { + "Tags": [ + { + "Key": "Name", + "Value": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1" + } + ], + "VpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPub2Subnet1RouteTableAssociation24FAAE7F": { + "Type": "AWS::EC2::SubnetRouteTableAssociation", + "Properties": { + "RouteTableId": { + "Ref": "DualStackProtocolVpcPub2Subnet1RouteTable95379836" + }, + "SubnetId": { + "Ref": "DualStackProtocolVpcPub2Subnet1Subnet483B9827" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPub2Subnet1DefaultRouteB99615CA": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationCidrBlock": "0.0.0.0/0", + "GatewayId": { + "Ref": "DualStackProtocolVpcIGW0F74732B" + }, + "RouteTableId": { + "Ref": "DualStackProtocolVpcPub2Subnet1RouteTable95379836" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD", + "DualStackProtocolVpcVPCGWADE48B7D" + ] + }, + "DualStackProtocolVpcPub2Subnet1DefaultRoute670D1366F": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationIpv6CidrBlock": "::/0", + "GatewayId": { + "Ref": "DualStackProtocolVpcIGW0F74732B" + }, + "RouteTableId": { + "Ref": "DualStackProtocolVpcPub2Subnet1RouteTable95379836" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPub2Subnet2SubnetCA5962A0": { + "Type": "AWS::EC2::Subnet", + "Properties": { + "AssignIpv6AddressOnCreation": true, + "AvailabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, + "CidrBlock": "10.0.96.0/19", + "Ipv6CidrBlock": { + "Fn::Select": [ + 3, + { + "Fn::Cidr": [ + { + "Fn::Select": [ + 0, + { + "Fn::GetAtt": [ + "DualStackProtocolVpc85768F2C", + "Ipv6CidrBlocks" + ] + } + ] + }, + 6, + "64" + ] + } + ] + }, + "MapPublicIpOnLaunch": false, + "Tags": [ + { + "Key": "aws-cdk:subnet-name", + "Value": "Pub2" + }, + { + "Key": "aws-cdk:subnet-type", + "Value": "Public" + }, + { + "Key": "Name", + "Value": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2" + } + ], + "VpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPub2Subnet2RouteTable1300ACEE": { + "Type": "AWS::EC2::RouteTable", + "Properties": { + "Tags": [ + { + "Key": "Name", + "Value": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2" + } + ], + "VpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPub2Subnet2RouteTableAssociation7E1F73B5": { + "Type": "AWS::EC2::SubnetRouteTableAssociation", + "Properties": { + "RouteTableId": { + "Ref": "DualStackProtocolVpcPub2Subnet2RouteTable1300ACEE" + }, + "SubnetId": { + "Ref": "DualStackProtocolVpcPub2Subnet2SubnetCA5962A0" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPub2Subnet2DefaultRoute6B98C127": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationCidrBlock": "0.0.0.0/0", + "GatewayId": { + "Ref": "DualStackProtocolVpcIGW0F74732B" + }, + "RouteTableId": { + "Ref": "DualStackProtocolVpcPub2Subnet2RouteTable1300ACEE" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD", + "DualStackProtocolVpcVPCGWADE48B7D" + ] + }, + "DualStackProtocolVpcPub2Subnet2DefaultRoute60CFFE651": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationIpv6CidrBlock": "::/0", + "GatewayId": { + "Ref": "DualStackProtocolVpcIGW0F74732B" + }, + "RouteTableId": { + "Ref": "DualStackProtocolVpcPub2Subnet2RouteTable1300ACEE" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPriv1Subnet1Subnet6E77EDE7": { + "Type": "AWS::EC2::Subnet", + "Properties": { + "AssignIpv6AddressOnCreation": true, + "AvailabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, + "CidrBlock": "10.0.128.0/19", + "Ipv6CidrBlock": { + "Fn::Select": [ + 4, + { + "Fn::Cidr": [ + { + "Fn::Select": [ + 0, + { + "Fn::GetAtt": [ + "DualStackProtocolVpc85768F2C", + "Ipv6CidrBlocks" + ] + } + ] + }, + 6, + "64" + ] + } + ] + }, + "MapPublicIpOnLaunch": false, + "Tags": [ + { + "Key": "aws-cdk:subnet-name", + "Value": "Priv1" + }, + { + "Key": "aws-cdk:subnet-type", + "Value": "Private" + }, + { + "Key": "Name", + "Value": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1" + } + ], + "VpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11": { + "Type": "AWS::EC2::RouteTable", + "Properties": { + "Tags": [ + { + "Key": "Name", + "Value": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1" + } + ], + "VpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPriv1Subnet1RouteTableAssociation9D52852A": { + "Type": "AWS::EC2::SubnetRouteTableAssociation", + "Properties": { + "RouteTableId": { + "Ref": "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11" + }, + "SubnetId": { + "Ref": "DualStackProtocolVpcPriv1Subnet1Subnet6E77EDE7" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPriv1Subnet1DefaultRouteEC60BBD4": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationCidrBlock": "0.0.0.0/0", + "NatGatewayId": { + "Ref": "DualStackProtocolVpcPub1Subnet1NATGateway241D9A98" + }, + "RouteTableId": { + "Ref": "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPriv1Subnet1DefaultRoute65CC26492": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationIpv6CidrBlock": "::/0", + "EgressOnlyInternetGatewayId": { + "Ref": "DualStackProtocolVpcEIGW64BED696A" + }, + "RouteTableId": { + "Ref": "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPriv1Subnet1Nat649573F0A7": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationIpv6CidrBlock": "64:ff9b::/96", + "NatGatewayId": { + "Ref": "DualStackProtocolVpcPub1Subnet1NATGateway241D9A98" + }, + "RouteTableId": { + "Ref": "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPriv1Subnet2SubnetBC65773F": { + "Type": "AWS::EC2::Subnet", + "Properties": { + "AssignIpv6AddressOnCreation": true, + "AvailabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, + "CidrBlock": "10.0.160.0/19", + "Ipv6CidrBlock": { + "Fn::Select": [ + 5, + { + "Fn::Cidr": [ + { + "Fn::Select": [ + 0, + { + "Fn::GetAtt": [ + "DualStackProtocolVpc85768F2C", + "Ipv6CidrBlocks" + ] + } + ] + }, + 6, + "64" + ] + } + ] + }, + "MapPublicIpOnLaunch": false, + "Tags": [ + { + "Key": "aws-cdk:subnet-name", + "Value": "Priv1" + }, + { + "Key": "aws-cdk:subnet-type", + "Value": "Private" + }, + { + "Key": "Name", + "Value": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2" + } + ], + "VpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPriv1Subnet2RouteTableC8DC5D06": { + "Type": "AWS::EC2::RouteTable", + "Properties": { + "Tags": [ + { + "Key": "Name", + "Value": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2" + } + ], + "VpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPriv1Subnet2RouteTableAssociation0F224C80": { + "Type": "AWS::EC2::SubnetRouteTableAssociation", + "Properties": { + "RouteTableId": { + "Ref": "DualStackProtocolVpcPriv1Subnet2RouteTableC8DC5D06" + }, + "SubnetId": { + "Ref": "DualStackProtocolVpcPriv1Subnet2SubnetBC65773F" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPriv1Subnet2DefaultRouteD01D04E1": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationCidrBlock": "0.0.0.0/0", + "NatGatewayId": { + "Ref": "DualStackProtocolVpcPub1Subnet2NATGateway64DC713B" + }, + "RouteTableId": { + "Ref": "DualStackProtocolVpcPriv1Subnet2RouteTableC8DC5D06" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcPriv1Subnet2DefaultRoute63F529AA9": { + "Type": "AWS::EC2::Route", + "Properties": { + "DestinationIpv6CidrBlock": "::/0", + "EgressOnlyInternetGatewayId": { + "Ref": "DualStackProtocolVpcEIGW64BED696A" + }, + "RouteTableId": { + "Ref": "DualStackProtocolVpcPriv1Subnet2RouteTableC8DC5D06" + } + }, + "DependsOn": [ + "DualStackProtocolVpcipv6cidr449C49CD" + ] + }, + "DualStackProtocolVpcIGW0F74732B": { + "Type": "AWS::EC2::InternetGateway", + "Properties": { + "Tags": [ + { + "Key": "Name", + "Value": "DualStackVpc/DualStackProtocolVpc" + } + ] + } + }, + "DualStackProtocolVpcVPCGWADE48B7D": { + "Type": "AWS::EC2::VPCGatewayAttachment", + "Properties": { + "InternetGatewayId": { + "Ref": "DualStackProtocolVpcIGW0F74732B" + }, + "VpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + } + }, + "DualStackProtocolVpcEIGW64BED696A": { + "Type": "AWS::EC2::EgressOnlyInternetGateway", + "Properties": { + "VpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + } + }, + "DualStackProtocolVpcRestrictDefaultSecurityGroupCustomResource592699C8": { + "Type": "Custom::VpcRestrictDefaultSG", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomVpcRestrictDefaultSGCustomResourceProviderHandlerDC833E5E", + "Arn" + ] + }, + "DefaultSecurityGroupId": { + "Fn::GetAtt": [ + "DualStackProtocolVpc85768F2C", + "DefaultSecurityGroup" + ] + }, + "Account": { + "Ref": "AWS::AccountId" + } + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, + "CustomVpcRestrictDefaultSGCustomResourceProviderRole26592FE0": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ] + }, + "ManagedPolicyArns": [ + { + "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + } + ], + "Policies": [ + { + "PolicyName": "Inline", + "PolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Effect": "Allow", + "Action": [ + "ec2:AuthorizeSecurityGroupIngress", + "ec2:AuthorizeSecurityGroupEgress", + "ec2:RevokeSecurityGroupIngress", + "ec2:RevokeSecurityGroupEgress" + ], + "Resource": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":ec2:", + { + "Ref": "AWS::Region" + }, + ":", + { + "Ref": "AWS::AccountId" + }, + ":security-group/", + { + "Fn::GetAtt": [ + "DualStackProtocolVpc85768F2C", + "DefaultSecurityGroup" + ] + } + ] + ] + } + ] + } + ] + } + } + ] + } + }, + "CustomVpcRestrictDefaultSGCustomResourceProviderHandlerDC833E5E": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "4554b47be6f57b68c6c7a7391dcc73894866d2377fe174883351e7639097f292.zip" + }, + "Timeout": 900, + "MemorySize": 128, + "Handler": "__entrypoint__.handler", + "Role": { + "Fn::GetAtt": [ + "CustomVpcRestrictDefaultSGCustomResourceProviderRole26592FE0", + "Arn" + ] + }, + "Runtime": "nodejs18.x", + "Description": "Lambda function for removing all inbound/outbound rules from the VPC default security group" + }, + "DependsOn": [ + "CustomVpcRestrictDefaultSGCustomResourceProviderRole26592FE0" + ] + }, + "LambdawithIPv6VPCServiceRoleC3866C85": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "ManagedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + }, + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole" + ] + ] + } + ] + }, + "DependsOn": [ + "DualStackProtocolVpcPriv1Subnet1DefaultRouteEC60BBD4", + "DualStackProtocolVpcPriv1Subnet1DefaultRoute65CC26492", + "DualStackProtocolVpcPriv1Subnet1Nat649573F0A7", + "DualStackProtocolVpcPriv1Subnet1RouteTableAssociation9D52852A", + "DualStackProtocolVpcPriv1Subnet2DefaultRouteD01D04E1", + "DualStackProtocolVpcPriv1Subnet2DefaultRoute63F529AA9", + "DualStackProtocolVpcPriv1Subnet2RouteTableAssociation0F224C80" + ] + }, + "LambdawithIPv6VPCSecurityGroup1BC5651B": { + "Type": "AWS::EC2::SecurityGroup", + "Properties": { + "GroupDescription": "Automatic security group for Lambda Function DualStackVpcLambdawithIPv6VPC4667BF31", + "SecurityGroupEgress": [ + { + "CidrIp": "0.0.0.0/0", + "Description": "Allow all outbound traffic by default", + "IpProtocol": "-1" + } + ], + "VpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + }, + "DependsOn": [ + "DualStackProtocolVpcPriv1Subnet1DefaultRouteEC60BBD4", + "DualStackProtocolVpcPriv1Subnet1DefaultRoute65CC26492", + "DualStackProtocolVpcPriv1Subnet1Nat649573F0A7", + "DualStackProtocolVpcPriv1Subnet1RouteTableAssociation9D52852A", + "DualStackProtocolVpcPriv1Subnet2DefaultRouteD01D04E1", + "DualStackProtocolVpcPriv1Subnet2DefaultRoute63F529AA9", + "DualStackProtocolVpcPriv1Subnet2RouteTableAssociation0F224C80" + ] + }, + "LambdawithIPv6VPCF50054B3": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "ZipFile": "def main(event, context): pass" + }, + "Handler": "index.main", + "Role": { + "Fn::GetAtt": [ + "LambdawithIPv6VPCServiceRoleC3866C85", + "Arn" + ] + }, + "Runtime": "python3.9", + "VpcConfig": { + "Ipv6AllowedForDualStack": true, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "LambdawithIPv6VPCSecurityGroup1BC5651B", + "GroupId" + ] + } + ], + "SubnetIds": [ + { + "Ref": "DualStackProtocolVpcPriv1Subnet1Subnet6E77EDE7" + }, + { + "Ref": "DualStackProtocolVpcPriv1Subnet2SubnetBC65773F" + } + ] + } + }, + "DependsOn": [ + "DualStackProtocolVpcPriv1Subnet1DefaultRouteEC60BBD4", + "DualStackProtocolVpcPriv1Subnet1DefaultRoute65CC26492", + "DualStackProtocolVpcPriv1Subnet1Nat649573F0A7", + "DualStackProtocolVpcPriv1Subnet1RouteTableAssociation9D52852A", + "DualStackProtocolVpcPriv1Subnet2DefaultRouteD01D04E1", + "DualStackProtocolVpcPriv1Subnet2DefaultRoute63F529AA9", + "DualStackProtocolVpcPriv1Subnet2RouteTableAssociation0F224C80", + "LambdawithIPv6VPCServiceRoleC3866C85" + ] + } + }, + "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-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/asset.4554b47be6f57b68c6c7a7391dcc73894866d2377fe174883351e7639097f292/__entrypoint__.js b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/asset.4554b47be6f57b68c6c7a7391dcc73894866d2377fe174883351e7639097f292/__entrypoint__.js new file mode 100644 index 0000000000000..1e64dba70bdc0 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/asset.4554b47be6f57b68c6c7a7391dcc73894866d2377fe174883351e7639097f292/__entrypoint__.js @@ -0,0 +1,147 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.withRetries = exports.handler = exports.external = void 0; +const https = require("https"); +const url = require("url"); +// for unit tests +exports.external = { + sendHttpRequest: defaultSendHttpRequest, + log: defaultLog, + includeStackTraces: true, + userHandlerIndex: './index', +}; +const CREATE_FAILED_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::CREATE_FAILED'; +const MISSING_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::MISSING_PHYSICAL_ID'; +async function handler(event, context) { + const sanitizedEvent = { ...event, ResponseURL: '...' }; + exports.external.log(JSON.stringify(sanitizedEvent, undefined, 2)); + // ignore DELETE event when the physical resource ID is the marker that + // indicates that this DELETE is a subsequent DELETE to a failed CREATE + // operation. + if (event.RequestType === 'Delete' && event.PhysicalResourceId === CREATE_FAILED_PHYSICAL_ID_MARKER) { + exports.external.log('ignoring DELETE event caused by a failed CREATE event'); + await submitResponse('SUCCESS', event); + return; + } + try { + // invoke the user handler. this is intentionally inside the try-catch to + // ensure that if there is an error it's reported as a failure to + // cloudformation (otherwise cfn waits). + // eslint-disable-next-line @typescript-eslint/no-require-imports + const userHandler = require(exports.external.userHandlerIndex).handler; + const result = await userHandler(sanitizedEvent, context); + // validate user response and create the combined event + const responseEvent = renderResponse(event, result); + // submit to cfn as success + await submitResponse('SUCCESS', responseEvent); + } + catch (e) { + const resp = { + ...event, + Reason: exports.external.includeStackTraces ? e.stack : e.message, + }; + if (!resp.PhysicalResourceId) { + // special case: if CREATE fails, which usually implies, we usually don't + // have a physical resource id. in this case, the subsequent DELETE + // operation does not have any meaning, and will likely fail as well. to + // address this, we use a marker so the provider framework can simply + // ignore the subsequent DELETE. + if (event.RequestType === 'Create') { + exports.external.log('CREATE failed, responding with a marker physical resource id so that the subsequent DELETE will be ignored'); + resp.PhysicalResourceId = CREATE_FAILED_PHYSICAL_ID_MARKER; + } + else { + // otherwise, if PhysicalResourceId is not specified, something is + // terribly wrong because all other events should have an ID. + exports.external.log(`ERROR: Malformed event. "PhysicalResourceId" is required: ${JSON.stringify(event)}`); + } + } + // this is an actual error, fail the activity altogether and exist. + await submitResponse('FAILED', resp); + } +} +exports.handler = handler; +function renderResponse(cfnRequest, handlerResponse = {}) { + // if physical ID is not returned, we have some defaults for you based + // on the request type. + const physicalResourceId = handlerResponse.PhysicalResourceId ?? cfnRequest.PhysicalResourceId ?? cfnRequest.RequestId; + // if we are in DELETE and physical ID was changed, it's an error. + if (cfnRequest.RequestType === 'Delete' && physicalResourceId !== cfnRequest.PhysicalResourceId) { + throw new Error(`DELETE: cannot change the physical resource ID from "${cfnRequest.PhysicalResourceId}" to "${handlerResponse.PhysicalResourceId}" during deletion`); + } + // merge request event and result event (result prevails). + return { + ...cfnRequest, + ...handlerResponse, + PhysicalResourceId: physicalResourceId, + }; +} +async function submitResponse(status, event) { + const json = { + Status: status, + Reason: event.Reason ?? status, + StackId: event.StackId, + RequestId: event.RequestId, + PhysicalResourceId: event.PhysicalResourceId || MISSING_PHYSICAL_ID_MARKER, + LogicalResourceId: event.LogicalResourceId, + NoEcho: event.NoEcho, + Data: event.Data, + }; + exports.external.log('submit response to cloudformation', json); + const responseBody = JSON.stringify(json); + const parsedUrl = url.parse(event.ResponseURL); + const req = { + hostname: parsedUrl.hostname, + path: parsedUrl.path, + method: 'PUT', + headers: { + 'content-type': '', + 'content-length': Buffer.byteLength(responseBody, 'utf8'), + }, + }; + const retryOptions = { + attempts: 5, + sleep: 1000, + }; + await withRetries(retryOptions, exports.external.sendHttpRequest)(req, responseBody); +} +async function defaultSendHttpRequest(options, responseBody) { + return new Promise((resolve, reject) => { + try { + const request = https.request(options, _ => resolve()); + request.on('error', reject); + request.write(responseBody); + request.end(); + } + catch (e) { + reject(e); + } + }); +} +function defaultLog(fmt, ...params) { + // eslint-disable-next-line no-console + console.log(fmt, ...params); +} +function withRetries(options, fn) { + return async (...xs) => { + let attempts = options.attempts; + let ms = options.sleep; + while (true) { + try { + return await fn(...xs); + } + catch (e) { + if (attempts-- <= 0) { + throw e; + } + await sleep(Math.floor(Math.random() * ms)); + ms *= 2; + } + } + }; +} +exports.withRetries = withRetries; +async function sleep(ms) { + return new Promise((ok) => setTimeout(ok, ms)); +} +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,2BAA2B;AAE3B,iBAAiB;AACJ,QAAA,QAAQ,GAAG;IACtB,eAAe,EAAE,sBAAsB;IACvC,GAAG,EAAE,UAAU;IACf,kBAAkB,EAAE,IAAI;IACxB,gBAAgB,EAAE,SAAS;CAC5B,CAAC;AAEF,MAAM,gCAAgC,GAAG,wDAAwD,CAAC;AAClG,MAAM,0BAA0B,GAAG,8DAA8D,CAAC;AAW3F,KAAK,UAAU,OAAO,CAAC,KAAkD,EAAE,OAA0B;IAC1G,MAAM,cAAc,GAAG,EAAE,GAAG,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;IACxD,gBAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IAE3D,uEAAuE;IACvE,uEAAuE;IACvE,aAAa;IACb,IAAI,KAAK,CAAC,WAAW,KAAK,QAAQ,IAAI,KAAK,CAAC,kBAAkB,KAAK,gCAAgC,EAAE;QACnG,gBAAQ,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;QACtE,MAAM,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QACvC,OAAO;KACR;IAED,IAAI;QACF,yEAAyE;QACzE,iEAAiE;QACjE,wCAAwC;QACxC,iEAAiE;QACjE,MAAM,WAAW,GAAY,OAAO,CAAC,gBAAQ,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC;QACxE,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAE1D,uDAAuD;QACvD,MAAM,aAAa,GAAG,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAEpD,2BAA2B;QAC3B,MAAM,cAAc,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;KAChD;IAAC,OAAO,CAAM,EAAE;QACf,MAAM,IAAI,GAAa;YACrB,GAAG,KAAK;YACR,MAAM,EAAE,gBAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO;SAC1D,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC5B,yEAAyE;YACzE,mEAAmE;YACnE,wEAAwE;YACxE,qEAAqE;YACrE,gCAAgC;YAChC,IAAI,KAAK,CAAC,WAAW,KAAK,QAAQ,EAAE;gBAClC,gBAAQ,CAAC,GAAG,CAAC,4GAA4G,CAAC,CAAC;gBAC3H,IAAI,CAAC,kBAAkB,GAAG,gCAAgC,CAAC;aAC5D;iBAAM;gBACL,kEAAkE;gBAClE,6DAA6D;gBAC7D,gBAAQ,CAAC,GAAG,CAAC,6DAA6D,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;aACpG;SACF;QAED,mEAAmE;QACnE,MAAM,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;KACtC;AACH,CAAC;AAnDD,0BAmDC;AAED,SAAS,cAAc,CACrB,UAAyF,EACzF,kBAA0C,EAAG;IAE7C,sEAAsE;IACtE,uBAAuB;IACvB,MAAM,kBAAkB,GAAG,eAAe,CAAC,kBAAkB,IAAI,UAAU,CAAC,kBAAkB,IAAI,UAAU,CAAC,SAAS,CAAC;IAEvH,kEAAkE;IAClE,IAAI,UAAU,CAAC,WAAW,KAAK,QAAQ,IAAI,kBAAkB,KAAK,UAAU,CAAC,kBAAkB,EAAE;QAC/F,MAAM,IAAI,KAAK,CAAC,wDAAwD,UAAU,CAAC,kBAAkB,SAAS,eAAe,CAAC,kBAAkB,mBAAmB,CAAC,CAAC;KACtK;IAED,0DAA0D;IAC1D,OAAO;QACL,GAAG,UAAU;QACb,GAAG,eAAe;QAClB,kBAAkB,EAAE,kBAAkB;KACvC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,MAA4B,EAAE,KAAe;IACzE,MAAM,IAAI,GAAmD;QAC3D,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,MAAM;QAC9B,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,kBAAkB,EAAE,KAAK,CAAC,kBAAkB,IAAI,0BAA0B;QAC1E,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;QAC1C,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,IAAI,EAAE,KAAK,CAAC,IAAI;KACjB,CAAC;IAEF,gBAAQ,CAAC,GAAG,CAAC,mCAAmC,EAAE,IAAI,CAAC,CAAC;IAExD,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC/C,MAAM,GAAG,GAAG;QACV,QAAQ,EAAE,SAAS,CAAC,QAAQ;QAC5B,IAAI,EAAE,SAAS,CAAC,IAAI;QACpB,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,cAAc,EAAE,EAAE;YAClB,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,YAAY,EAAE,MAAM,CAAC;SAC1D;KACF,CAAC;IAEF,MAAM,YAAY,GAAG;QACnB,QAAQ,EAAE,CAAC;QACX,KAAK,EAAE,IAAI;KACZ,CAAC;IACF,MAAM,WAAW,CAAC,YAAY,EAAE,gBAAQ,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAC/E,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,OAA6B,EAAE,YAAoB;IACvF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI;YACF,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YACvD,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC5B,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC5B,OAAO,CAAC,GAAG,EAAE,CAAC;SACf;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,CAAC,CAAC,CAAC;SACX;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,UAAU,CAAC,GAAW,EAAE,GAAG,MAAa;IAC/C,sCAAsC;IACtC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC;AAC9B,CAAC;AASD,SAAgB,WAAW,CAA0B,OAAqB,EAAE,EAA4B;IACtG,OAAO,KAAK,EAAE,GAAG,EAAK,EAAE,EAAE;QACxB,IAAI,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAChC,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC;QACvB,OAAO,IAAI,EAAE;YACX,IAAI;gBACF,OAAO,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;aACxB;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,QAAQ,EAAE,IAAI,CAAC,EAAE;oBACnB,MAAM,CAAC,CAAC;iBACT;gBACD,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;gBAC5C,EAAE,IAAI,CAAC,CAAC;aACT;SACF;IACH,CAAC,CAAC;AACJ,CAAC;AAhBD,kCAgBC;AAED,KAAK,UAAU,KAAK,CAAC,EAAU;IAC7B,OAAO,IAAI,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;AACjD,CAAC","sourcesContent":["import * as https from 'https';\nimport * as url from 'url';\n\n// for unit tests\nexport const external = {\n  sendHttpRequest: defaultSendHttpRequest,\n  log: defaultLog,\n  includeStackTraces: true,\n  userHandlerIndex: './index',\n};\n\nconst CREATE_FAILED_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::CREATE_FAILED';\nconst MISSING_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::MISSING_PHYSICAL_ID';\n\nexport type Response = AWSLambda.CloudFormationCustomResourceEvent & HandlerResponse;\nexport type Handler = (event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context) => Promise<HandlerResponse | void>;\nexport type HandlerResponse = undefined | {\n  Data?: any;\n  PhysicalResourceId?: string;\n  Reason?: string;\n  NoEcho?: boolean;\n};\n\nexport async function handler(event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context) {\n  const sanitizedEvent = { ...event, ResponseURL: '...' };\n  external.log(JSON.stringify(sanitizedEvent, undefined, 2));\n\n  // ignore DELETE event when the physical resource ID is the marker that\n  // indicates that this DELETE is a subsequent DELETE to a failed CREATE\n  // operation.\n  if (event.RequestType === 'Delete' && event.PhysicalResourceId === CREATE_FAILED_PHYSICAL_ID_MARKER) {\n    external.log('ignoring DELETE event caused by a failed CREATE event');\n    await submitResponse('SUCCESS', event);\n    return;\n  }\n\n  try {\n    // invoke the user handler. this is intentionally inside the try-catch to\n    // ensure that if there is an error it's reported as a failure to\n    // cloudformation (otherwise cfn waits).\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    const userHandler: Handler = require(external.userHandlerIndex).handler;\n    const result = await userHandler(sanitizedEvent, context);\n\n    // validate user response and create the combined event\n    const responseEvent = renderResponse(event, result);\n\n    // submit to cfn as success\n    await submitResponse('SUCCESS', responseEvent);\n  } catch (e: any) {\n    const resp: Response = {\n      ...event,\n      Reason: external.includeStackTraces ? e.stack : e.message,\n    };\n\n    if (!resp.PhysicalResourceId) {\n      // special case: if CREATE fails, which usually implies, we usually don't\n      // have a physical resource id. in this case, the subsequent DELETE\n      // operation does not have any meaning, and will likely fail as well. to\n      // address this, we use a marker so the provider framework can simply\n      // ignore the subsequent DELETE.\n      if (event.RequestType === 'Create') {\n        external.log('CREATE failed, responding with a marker physical resource id so that the subsequent DELETE will be ignored');\n        resp.PhysicalResourceId = CREATE_FAILED_PHYSICAL_ID_MARKER;\n      } else {\n        // otherwise, if PhysicalResourceId is not specified, something is\n        // terribly wrong because all other events should have an ID.\n        external.log(`ERROR: Malformed event. \"PhysicalResourceId\" is required: ${JSON.stringify(event)}`);\n      }\n    }\n\n    // this is an actual error, fail the activity altogether and exist.\n    await submitResponse('FAILED', resp);\n  }\n}\n\nfunction renderResponse(\n  cfnRequest: AWSLambda.CloudFormationCustomResourceEvent & { PhysicalResourceId?: string },\n  handlerResponse: void | HandlerResponse = { }): Response {\n\n  // if physical ID is not returned, we have some defaults for you based\n  // on the request type.\n  const physicalResourceId = handlerResponse.PhysicalResourceId ?? cfnRequest.PhysicalResourceId ?? cfnRequest.RequestId;\n\n  // if we are in DELETE and physical ID was changed, it's an error.\n  if (cfnRequest.RequestType === 'Delete' && physicalResourceId !== cfnRequest.PhysicalResourceId) {\n    throw new Error(`DELETE: cannot change the physical resource ID from \"${cfnRequest.PhysicalResourceId}\" to \"${handlerResponse.PhysicalResourceId}\" during deletion`);\n  }\n\n  // merge request event and result event (result prevails).\n  return {\n    ...cfnRequest,\n    ...handlerResponse,\n    PhysicalResourceId: physicalResourceId,\n  };\n}\n\nasync function submitResponse(status: 'SUCCESS' | 'FAILED', event: Response) {\n  const json: AWSLambda.CloudFormationCustomResourceResponse = {\n    Status: status,\n    Reason: event.Reason ?? status,\n    StackId: event.StackId,\n    RequestId: event.RequestId,\n    PhysicalResourceId: event.PhysicalResourceId || MISSING_PHYSICAL_ID_MARKER,\n    LogicalResourceId: event.LogicalResourceId,\n    NoEcho: event.NoEcho,\n    Data: event.Data,\n  };\n\n  external.log('submit response to cloudformation', json);\n\n  const responseBody = JSON.stringify(json);\n  const parsedUrl = url.parse(event.ResponseURL);\n  const req = {\n    hostname: parsedUrl.hostname,\n    path: parsedUrl.path,\n    method: 'PUT',\n    headers: {\n      'content-type': '',\n      'content-length': Buffer.byteLength(responseBody, 'utf8'),\n    },\n  };\n\n  const retryOptions = {\n    attempts: 5,\n    sleep: 1000,\n  };\n  await withRetries(retryOptions, external.sendHttpRequest)(req, responseBody);\n}\n\nasync function defaultSendHttpRequest(options: https.RequestOptions, responseBody: string): Promise<void> {\n  return new Promise((resolve, reject) => {\n    try {\n      const request = https.request(options, _ => resolve());\n      request.on('error', reject);\n      request.write(responseBody);\n      request.end();\n    } catch (e) {\n      reject(e);\n    }\n  });\n}\n\nfunction defaultLog(fmt: string, ...params: any[]) {\n  // eslint-disable-next-line no-console\n  console.log(fmt, ...params);\n}\n\nexport interface RetryOptions {\n  /** How many retries (will at least try once) */\n  readonly attempts: number;\n  /** Sleep base, in ms */\n  readonly sleep: number;\n}\n\nexport function withRetries<A extends Array<any>, B>(options: RetryOptions, fn: (...xs: A) => Promise<B>): (...xs: A) => Promise<B> {\n  return async (...xs: A) => {\n    let attempts = options.attempts;\n    let ms = options.sleep;\n    while (true) {\n      try {\n        return await fn(...xs);\n      } catch (e) {\n        if (attempts-- <= 0) {\n          throw e;\n        }\n        await sleep(Math.floor(Math.random() * ms));\n        ms *= 2;\n      }\n    }\n  };\n}\n\nasync function sleep(ms: number): Promise<void> {\n  return new Promise((ok) => setTimeout(ok, ms));\n}\n"]} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/asset.4554b47be6f57b68c6c7a7391dcc73894866d2377fe174883351e7639097f292/index.js b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/asset.4554b47be6f57b68c6c7a7391dcc73894866d2377fe174883351e7639097f292/index.js new file mode 100644 index 0000000000000..013bcaffd8fe5 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/asset.4554b47be6f57b68c6c7a7391dcc73894866d2377fe174883351e7639097f292/index.js @@ -0,0 +1 @@ +"use strict";var I=Object.create;var t=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var P=Object.getOwnPropertyNames;var g=Object.getPrototypeOf,l=Object.prototype.hasOwnProperty;var G=(r,e)=>{for(var o in e)t(r,o,{get:e[o],enumerable:!0})},n=(r,e,o,i)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of P(e))!l.call(r,s)&&s!==o&&t(r,s,{get:()=>e[s],enumerable:!(i=y(e,s))||i.enumerable});return r};var R=(r,e,o)=>(o=r!=null?I(g(r)):{},n(e||!r||!r.__esModule?t(o,"default",{value:r,enumerable:!0}):o,r)),S=r=>n(t({},"__esModule",{value:!0}),r);var k={};G(k,{handler:()=>f});module.exports=S(k);var a=R(require("@aws-sdk/client-ec2")),u=new a.EC2({});function c(r,e){return{GroupId:r,IpPermissions:[{UserIdGroupPairs:[{GroupId:r,UserId:e}],IpProtocol:"-1"}]}}function d(r){return{GroupId:r,IpPermissions:[{IpRanges:[{CidrIp:"0.0.0.0/0"}],IpProtocol:"-1"}]}}async function f(r){let e=r.ResourceProperties.DefaultSecurityGroupId,o=r.ResourceProperties.Account;switch(r.RequestType){case"Create":return p(e,o);case"Update":return h(r);case"Delete":return m(e,o)}}async function h(r){let e=r.OldResourceProperties.DefaultSecurityGroupId,o=r.ResourceProperties.DefaultSecurityGroupId;e!==o&&(await m(e,r.ResourceProperties.Account),await p(o,r.ResourceProperties.Account))}async function p(r,e){try{await u.revokeSecurityGroupEgress(d(r))}catch(o){if(o.name!=="InvalidPermission.NotFound")throw o}try{await u.revokeSecurityGroupIngress(c(r,e))}catch(o){if(o.name!=="InvalidPermission.NotFound")throw o}}async function m(r,e){await u.authorizeSecurityGroupIngress(c(r,e)),await u.authorizeSecurityGroupEgress(d(r))}0&&(module.exports={handler}); diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/cdk.out new file mode 100644 index 0000000000000..1f0068d32659a --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/cdk.out @@ -0,0 +1 @@ +{"version":"36.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/integ.json new file mode 100644 index 0000000000000..a0a7b84c46c06 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/integ.json @@ -0,0 +1,12 @@ +{ + "version": "36.0.0", + "testCases": { + "DualStackTesting/DefaultTest": { + "stacks": [ + "DualStackVpc" + ], + "assertionStack": "DualStackTesting/DefaultTest/DeployAssert", + "assertionStackName": "DualStackTestingDefaultTestDeployAssert8ACBFB2C" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/manifest.json new file mode 100644 index 0000000000000..aebdd6491ea1f --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/manifest.json @@ -0,0 +1,383 @@ +{ + "version": "36.0.0", + "artifacts": { + "DualStackVpc.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "DualStackVpc.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "DualStackVpc": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "DualStackVpc.template.json", + "terminationProtection": false, + "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}/225ebf0ceea059c584f3011672077deab41d93a6383af8a75ea4fb479f44b37d.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "DualStackVpc.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": [ + "DualStackVpc.assets" + ], + "metadata": { + "/DualStackVpc/DualStackProtocolVpc/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpc85768F2C" + } + ], + "/DualStackVpc/DualStackProtocolVpc/ipv6cidr": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcipv6cidr449C49CD" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet1Subnet74CA4B8A" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet1RouteTable67D20294" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet1RouteTableAssociation047F9491" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/DefaultRoute": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet1DefaultRoute95ED74BD" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/DefaultRoute6": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet1DefaultRoute6C01F89FD" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/EIP": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet1EIP12EDF1FD" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/NATGateway": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet1NATGateway241D9A98" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet2Subnet8B1A85E2" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet2RouteTable63549985" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet2RouteTableAssociation12736FE3" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/DefaultRoute": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet2DefaultRoute293C2941" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/DefaultRoute6": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet2DefaultRoute67E6A8DC8" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/EIP": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet2EIP149FAFF5" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/NATGateway": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet2NATGateway64DC713B" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet1Subnet483B9827" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet1RouteTable95379836" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet1RouteTableAssociation24FAAE7F" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/DefaultRoute": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet1DefaultRouteB99615CA" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/DefaultRoute6": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet1DefaultRoute670D1366F" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet2SubnetCA5962A0" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet2RouteTable1300ACEE" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet2RouteTableAssociation7E1F73B5" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/DefaultRoute": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet2DefaultRoute6B98C127" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/DefaultRoute6": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet2DefaultRoute60CFFE651" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet1Subnet6E77EDE7" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet1RouteTableAssociation9D52852A" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/DefaultRoute": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet1DefaultRouteEC60BBD4" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/DefaultRoute6": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet1DefaultRoute65CC26492" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/Nat64": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet1Nat649573F0A7" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/Subnet": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet2SubnetBC65773F" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/RouteTable": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet2RouteTableC8DC5D06" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/RouteTableAssociation": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet2RouteTableAssociation0F224C80" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/DefaultRoute": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet2DefaultRouteD01D04E1" + } + ], + "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/DefaultRoute6": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet2DefaultRoute63F529AA9" + } + ], + "/DualStackVpc/DualStackProtocolVpc/IGW": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcIGW0F74732B" + } + ], + "/DualStackVpc/DualStackProtocolVpc/VPCGW": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcVPCGWADE48B7D" + } + ], + "/DualStackVpc/DualStackProtocolVpc/EIGW6": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcEIGW64BED696A" + } + ], + "/DualStackVpc/DualStackProtocolVpc/RestrictDefaultSecurityGroupCustomResource/Default": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcRestrictDefaultSecurityGroupCustomResource592699C8" + } + ], + "/DualStackVpc/Custom::VpcRestrictDefaultSGCustomResourceProvider/Role": [ + { + "type": "aws:cdk:logicalId", + "data": "CustomVpcRestrictDefaultSGCustomResourceProviderRole26592FE0" + } + ], + "/DualStackVpc/Custom::VpcRestrictDefaultSGCustomResourceProvider/Handler": [ + { + "type": "aws:cdk:logicalId", + "data": "CustomVpcRestrictDefaultSGCustomResourceProviderHandlerDC833E5E" + } + ], + "/DualStackVpc/Lambda_with_IPv6_VPC/ServiceRole/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "LambdawithIPv6VPCServiceRoleC3866C85" + } + ], + "/DualStackVpc/Lambda_with_IPv6_VPC/SecurityGroup/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "LambdawithIPv6VPCSecurityGroup1BC5651B" + } + ], + "/DualStackVpc/Lambda_with_IPv6_VPC/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "LambdawithIPv6VPCF50054B3" + } + ], + "/DualStackVpc/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/DualStackVpc/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "DualStackVpc" + }, + "DualStackTestingDefaultTestDeployAssert8ACBFB2C.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "DualStackTestingDefaultTestDeployAssert8ACBFB2C.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "DualStackTestingDefaultTestDeployAssert8ACBFB2C": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "DualStackTestingDefaultTestDeployAssert8ACBFB2C.template.json", + "terminationProtection": false, + "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}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "DualStackTestingDefaultTestDeployAssert8ACBFB2C.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": [ + "DualStackTestingDefaultTestDeployAssert8ACBFB2C.assets" + ], + "metadata": { + "/DualStackTesting/DefaultTest/DeployAssert/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/DualStackTesting/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "DualStackTesting/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-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/tree.json new file mode 100644 index 0000000000000..09ccd9f90224c --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/tree.json @@ -0,0 +1,1501 @@ +{ + "version": "tree-0.1", + "tree": { + "id": "App", + "path": "", + "children": { + "DualStackVpc": { + "id": "DualStackVpc", + "path": "DualStackVpc", + "children": { + "DualStackProtocolVpc": { + "id": "DualStackProtocolVpc", + "path": "DualStackVpc/DualStackProtocolVpc", + "children": { + "Resource": { + "id": "Resource", + "path": "DualStackVpc/DualStackProtocolVpc/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::VPC", + "aws:cdk:cloudformation:props": { + "cidrBlock": "10.0.0.0/16", + "enableDnsHostnames": true, + "enableDnsSupport": true, + "instanceTenancy": "default", + "tags": [ + { + "key": "Name", + "value": "DualStackVpc/DualStackProtocolVpc" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnVPC", + "version": "0.0.0" + } + }, + "ipv6cidr": { + "id": "ipv6cidr", + "path": "DualStackVpc/DualStackProtocolVpc/ipv6cidr", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::VPCCidrBlock", + "aws:cdk:cloudformation:props": { + "amazonProvidedIpv6CidrBlock": true, + "vpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnVPCCidrBlock", + "version": "0.0.0" + } + }, + "Pub1Subnet1": { + "id": "Pub1Subnet1", + "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1", + "children": { + "Subnet": { + "id": "Subnet", + "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "assignIpv6AddressOnCreation": true, + "availabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, + "cidrBlock": "10.0.0.0/19", + "ipv6CidrBlock": { + "Fn::Select": [ + 0, + { + "Fn::Cidr": [ + { + "Fn::Select": [ + 0, + { + "Fn::GetAtt": [ + "DualStackProtocolVpc85768F2C", + "Ipv6CidrBlocks" + ] + } + ] + }, + 6, + "64" + ] + } + ] + }, + "mapPublicIpOnLaunch": false, + "tags": [ + { + "key": "aws-cdk:subnet-name", + "value": "Pub1" + }, + { + "key": "aws-cdk:subnet-type", + "value": "Public" + }, + { + "key": "Name", + "value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1" + } + ], + "vpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/Acl", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "tags": [ + { + "key": "Name", + "value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1" + } + ], + "vpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/RouteTableAssociation", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "DualStackProtocolVpcPub1Subnet1RouteTable67D20294" + }, + "subnetId": { + "Ref": "DualStackProtocolVpcPub1Subnet1Subnet74CA4B8A" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + }, + "DefaultRoute": { + "id": "DefaultRoute", + "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/DefaultRoute", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationCidrBlock": "0.0.0.0/0", + "gatewayId": { + "Ref": "DualStackProtocolVpcIGW0F74732B" + }, + "routeTableId": { + "Ref": "DualStackProtocolVpcPub1Subnet1RouteTable67D20294" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + }, + "DefaultRoute6": { + "id": "DefaultRoute6", + "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/DefaultRoute6", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationIpv6CidrBlock": "::/0", + "gatewayId": { + "Ref": "DualStackProtocolVpcIGW0F74732B" + }, + "routeTableId": { + "Ref": "DualStackProtocolVpcPub1Subnet1RouteTable67D20294" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + }, + "EIP": { + "id": "EIP", + "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/EIP", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::EIP", + "aws:cdk:cloudformation:props": { + "domain": "vpc", + "tags": [ + { + "key": "Name", + "value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnEIP", + "version": "0.0.0" + } + }, + "NATGateway": { + "id": "NATGateway", + "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/NATGateway", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", + "aws:cdk:cloudformation:props": { + "allocationId": { + "Fn::GetAtt": [ + "DualStackProtocolVpcPub1Subnet1EIP12EDF1FD", + "AllocationId" + ] + }, + "subnetId": { + "Ref": "DualStackProtocolVpcPub1Subnet1Subnet74CA4B8A" + }, + "tags": [ + { + "key": "Name", + "value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnNatGateway", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", + "version": "0.0.0" + } + }, + "Pub1Subnet2": { + "id": "Pub1Subnet2", + "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2", + "children": { + "Subnet": { + "id": "Subnet", + "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "assignIpv6AddressOnCreation": true, + "availabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, + "cidrBlock": "10.0.32.0/19", + "ipv6CidrBlock": { + "Fn::Select": [ + 1, + { + "Fn::Cidr": [ + { + "Fn::Select": [ + 0, + { + "Fn::GetAtt": [ + "DualStackProtocolVpc85768F2C", + "Ipv6CidrBlocks" + ] + } + ] + }, + 6, + "64" + ] + } + ] + }, + "mapPublicIpOnLaunch": false, + "tags": [ + { + "key": "aws-cdk:subnet-name", + "value": "Pub1" + }, + { + "key": "aws-cdk:subnet-type", + "value": "Public" + }, + { + "key": "Name", + "value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2" + } + ], + "vpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/Acl", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "tags": [ + { + "key": "Name", + "value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2" + } + ], + "vpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/RouteTableAssociation", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "DualStackProtocolVpcPub1Subnet2RouteTable63549985" + }, + "subnetId": { + "Ref": "DualStackProtocolVpcPub1Subnet2Subnet8B1A85E2" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + }, + "DefaultRoute": { + "id": "DefaultRoute", + "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/DefaultRoute", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationCidrBlock": "0.0.0.0/0", + "gatewayId": { + "Ref": "DualStackProtocolVpcIGW0F74732B" + }, + "routeTableId": { + "Ref": "DualStackProtocolVpcPub1Subnet2RouteTable63549985" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + }, + "DefaultRoute6": { + "id": "DefaultRoute6", + "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/DefaultRoute6", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationIpv6CidrBlock": "::/0", + "gatewayId": { + "Ref": "DualStackProtocolVpcIGW0F74732B" + }, + "routeTableId": { + "Ref": "DualStackProtocolVpcPub1Subnet2RouteTable63549985" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + }, + "EIP": { + "id": "EIP", + "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/EIP", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::EIP", + "aws:cdk:cloudformation:props": { + "domain": "vpc", + "tags": [ + { + "key": "Name", + "value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnEIP", + "version": "0.0.0" + } + }, + "NATGateway": { + "id": "NATGateway", + "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/NATGateway", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", + "aws:cdk:cloudformation:props": { + "allocationId": { + "Fn::GetAtt": [ + "DualStackProtocolVpcPub1Subnet2EIP149FAFF5", + "AllocationId" + ] + }, + "subnetId": { + "Ref": "DualStackProtocolVpcPub1Subnet2Subnet8B1A85E2" + }, + "tags": [ + { + "key": "Name", + "value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnNatGateway", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", + "version": "0.0.0" + } + }, + "Pub2Subnet1": { + "id": "Pub2Subnet1", + "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1", + "children": { + "Subnet": { + "id": "Subnet", + "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "assignIpv6AddressOnCreation": true, + "availabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, + "cidrBlock": "10.0.64.0/19", + "ipv6CidrBlock": { + "Fn::Select": [ + 2, + { + "Fn::Cidr": [ + { + "Fn::Select": [ + 0, + { + "Fn::GetAtt": [ + "DualStackProtocolVpc85768F2C", + "Ipv6CidrBlocks" + ] + } + ] + }, + 6, + "64" + ] + } + ] + }, + "mapPublicIpOnLaunch": false, + "tags": [ + { + "key": "aws-cdk:subnet-name", + "value": "Pub2" + }, + { + "key": "aws-cdk:subnet-type", + "value": "Public" + }, + { + "key": "Name", + "value": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1" + } + ], + "vpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/Acl", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "tags": [ + { + "key": "Name", + "value": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1" + } + ], + "vpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/RouteTableAssociation", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "DualStackProtocolVpcPub2Subnet1RouteTable95379836" + }, + "subnetId": { + "Ref": "DualStackProtocolVpcPub2Subnet1Subnet483B9827" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + }, + "DefaultRoute": { + "id": "DefaultRoute", + "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/DefaultRoute", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationCidrBlock": "0.0.0.0/0", + "gatewayId": { + "Ref": "DualStackProtocolVpcIGW0F74732B" + }, + "routeTableId": { + "Ref": "DualStackProtocolVpcPub2Subnet1RouteTable95379836" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + }, + "DefaultRoute6": { + "id": "DefaultRoute6", + "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/DefaultRoute6", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationIpv6CidrBlock": "::/0", + "gatewayId": { + "Ref": "DualStackProtocolVpcIGW0F74732B" + }, + "routeTableId": { + "Ref": "DualStackProtocolVpcPub2Subnet1RouteTable95379836" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", + "version": "0.0.0" + } + }, + "Pub2Subnet2": { + "id": "Pub2Subnet2", + "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2", + "children": { + "Subnet": { + "id": "Subnet", + "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "assignIpv6AddressOnCreation": true, + "availabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, + "cidrBlock": "10.0.96.0/19", + "ipv6CidrBlock": { + "Fn::Select": [ + 3, + { + "Fn::Cidr": [ + { + "Fn::Select": [ + 0, + { + "Fn::GetAtt": [ + "DualStackProtocolVpc85768F2C", + "Ipv6CidrBlocks" + ] + } + ] + }, + 6, + "64" + ] + } + ] + }, + "mapPublicIpOnLaunch": false, + "tags": [ + { + "key": "aws-cdk:subnet-name", + "value": "Pub2" + }, + { + "key": "aws-cdk:subnet-type", + "value": "Public" + }, + { + "key": "Name", + "value": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2" + } + ], + "vpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/Acl", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "tags": [ + { + "key": "Name", + "value": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2" + } + ], + "vpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/RouteTableAssociation", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "DualStackProtocolVpcPub2Subnet2RouteTable1300ACEE" + }, + "subnetId": { + "Ref": "DualStackProtocolVpcPub2Subnet2SubnetCA5962A0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + }, + "DefaultRoute": { + "id": "DefaultRoute", + "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/DefaultRoute", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationCidrBlock": "0.0.0.0/0", + "gatewayId": { + "Ref": "DualStackProtocolVpcIGW0F74732B" + }, + "routeTableId": { + "Ref": "DualStackProtocolVpcPub2Subnet2RouteTable1300ACEE" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + }, + "DefaultRoute6": { + "id": "DefaultRoute6", + "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/DefaultRoute6", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationIpv6CidrBlock": "::/0", + "gatewayId": { + "Ref": "DualStackProtocolVpcIGW0F74732B" + }, + "routeTableId": { + "Ref": "DualStackProtocolVpcPub2Subnet2RouteTable1300ACEE" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.PublicSubnet", + "version": "0.0.0" + } + }, + "Priv1Subnet1": { + "id": "Priv1Subnet1", + "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1", + "children": { + "Subnet": { + "id": "Subnet", + "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "assignIpv6AddressOnCreation": true, + "availabilityZone": { + "Fn::Select": [ + 0, + { + "Fn::GetAZs": "" + } + ] + }, + "cidrBlock": "10.0.128.0/19", + "ipv6CidrBlock": { + "Fn::Select": [ + 4, + { + "Fn::Cidr": [ + { + "Fn::Select": [ + 0, + { + "Fn::GetAtt": [ + "DualStackProtocolVpc85768F2C", + "Ipv6CidrBlocks" + ] + } + ] + }, + 6, + "64" + ] + } + ] + }, + "mapPublicIpOnLaunch": false, + "tags": [ + { + "key": "aws-cdk:subnet-name", + "value": "Priv1" + }, + { + "key": "aws-cdk:subnet-type", + "value": "Private" + }, + { + "key": "Name", + "value": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1" + } + ], + "vpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/Acl", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "tags": [ + { + "key": "Name", + "value": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1" + } + ], + "vpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/RouteTableAssociation", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11" + }, + "subnetId": { + "Ref": "DualStackProtocolVpcPriv1Subnet1Subnet6E77EDE7" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + }, + "DefaultRoute": { + "id": "DefaultRoute", + "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/DefaultRoute", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationCidrBlock": "0.0.0.0/0", + "natGatewayId": { + "Ref": "DualStackProtocolVpcPub1Subnet1NATGateway241D9A98" + }, + "routeTableId": { + "Ref": "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + }, + "DefaultRoute6": { + "id": "DefaultRoute6", + "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/DefaultRoute6", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationIpv6CidrBlock": "::/0", + "egressOnlyInternetGatewayId": { + "Ref": "DualStackProtocolVpcEIGW64BED696A" + }, + "routeTableId": { + "Ref": "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + }, + "Nat64": { + "id": "Nat64", + "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/Nat64", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationIpv6CidrBlock": "64:ff9b::/96", + "natGatewayId": { + "Ref": "DualStackProtocolVpcPub1Subnet1NATGateway241D9A98" + }, + "routeTableId": { + "Ref": "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", + "version": "0.0.0" + } + }, + "Priv1Subnet2": { + "id": "Priv1Subnet2", + "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2", + "children": { + "Subnet": { + "id": "Subnet", + "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/Subnet", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", + "aws:cdk:cloudformation:props": { + "assignIpv6AddressOnCreation": true, + "availabilityZone": { + "Fn::Select": [ + 1, + { + "Fn::GetAZs": "" + } + ] + }, + "cidrBlock": "10.0.160.0/19", + "ipv6CidrBlock": { + "Fn::Select": [ + 5, + { + "Fn::Cidr": [ + { + "Fn::Select": [ + 0, + { + "Fn::GetAtt": [ + "DualStackProtocolVpc85768F2C", + "Ipv6CidrBlocks" + ] + } + ] + }, + 6, + "64" + ] + } + ] + }, + "mapPublicIpOnLaunch": false, + "tags": [ + { + "key": "aws-cdk:subnet-name", + "value": "Priv1" + }, + { + "key": "aws-cdk:subnet-type", + "value": "Private" + }, + { + "key": "Name", + "value": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2" + } + ], + "vpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnet", + "version": "0.0.0" + } + }, + "Acl": { + "id": "Acl", + "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/Acl", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "RouteTable": { + "id": "RouteTable", + "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/RouteTable", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", + "aws:cdk:cloudformation:props": { + "tags": [ + { + "key": "Name", + "value": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2" + } + ], + "vpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRouteTable", + "version": "0.0.0" + } + }, + "RouteTableAssociation": { + "id": "RouteTableAssociation", + "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/RouteTableAssociation", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", + "aws:cdk:cloudformation:props": { + "routeTableId": { + "Ref": "DualStackProtocolVpcPriv1Subnet2RouteTableC8DC5D06" + }, + "subnetId": { + "Ref": "DualStackProtocolVpcPriv1Subnet2SubnetBC65773F" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSubnetRouteTableAssociation", + "version": "0.0.0" + } + }, + "DefaultRoute": { + "id": "DefaultRoute", + "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/DefaultRoute", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationCidrBlock": "0.0.0.0/0", + "natGatewayId": { + "Ref": "DualStackProtocolVpcPub1Subnet2NATGateway64DC713B" + }, + "routeTableId": { + "Ref": "DualStackProtocolVpcPriv1Subnet2RouteTableC8DC5D06" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + }, + "DefaultRoute6": { + "id": "DefaultRoute6", + "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/DefaultRoute6", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::Route", + "aws:cdk:cloudformation:props": { + "destinationIpv6CidrBlock": "::/0", + "egressOnlyInternetGatewayId": { + "Ref": "DualStackProtocolVpcEIGW64BED696A" + }, + "routeTableId": { + "Ref": "DualStackProtocolVpcPriv1Subnet2RouteTableC8DC5D06" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnRoute", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.PrivateSubnet", + "version": "0.0.0" + } + }, + "IGW": { + "id": "IGW", + "path": "DualStackVpc/DualStackProtocolVpc/IGW", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::InternetGateway", + "aws:cdk:cloudformation:props": { + "tags": [ + { + "key": "Name", + "value": "DualStackVpc/DualStackProtocolVpc" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnInternetGateway", + "version": "0.0.0" + } + }, + "VPCGW": { + "id": "VPCGW", + "path": "DualStackVpc/DualStackProtocolVpc/VPCGW", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", + "aws:cdk:cloudformation:props": { + "internetGatewayId": { + "Ref": "DualStackProtocolVpcIGW0F74732B" + }, + "vpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnVPCGatewayAttachment", + "version": "0.0.0" + } + }, + "EIGW6": { + "id": "EIGW6", + "path": "DualStackVpc/DualStackProtocolVpc/EIGW6", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::EgressOnlyInternetGateway", + "aws:cdk:cloudformation:props": { + "vpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnEgressOnlyInternetGateway", + "version": "0.0.0" + } + }, + "RestrictDefaultSecurityGroupCustomResource": { + "id": "RestrictDefaultSecurityGroupCustomResource", + "path": "DualStackVpc/DualStackProtocolVpc/RestrictDefaultSecurityGroupCustomResource", + "children": { + "Default": { + "id": "Default", + "path": "DualStackVpc/DualStackProtocolVpc/RestrictDefaultSecurityGroupCustomResource/Default", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnResource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.CustomResource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.Vpc", + "version": "0.0.0" + } + }, + "Custom::VpcRestrictDefaultSGCustomResourceProvider": { + "id": "Custom::VpcRestrictDefaultSGCustomResourceProvider", + "path": "DualStackVpc/Custom::VpcRestrictDefaultSGCustomResourceProvider", + "children": { + "Staging": { + "id": "Staging", + "path": "DualStackVpc/Custom::VpcRestrictDefaultSGCustomResourceProvider/Staging", + "constructInfo": { + "fqn": "aws-cdk-lib.AssetStaging", + "version": "0.0.0" + } + }, + "Role": { + "id": "Role", + "path": "DualStackVpc/Custom::VpcRestrictDefaultSGCustomResourceProvider/Role", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnResource", + "version": "0.0.0" + } + }, + "Handler": { + "id": "Handler", + "path": "DualStackVpc/Custom::VpcRestrictDefaultSGCustomResourceProvider/Handler", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnResource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.CustomResourceProviderBase", + "version": "0.0.0" + } + }, + "Lambda_with_IPv6_VPC": { + "id": "Lambda_with_IPv6_VPC", + "path": "DualStackVpc/Lambda_with_IPv6_VPC", + "children": { + "ServiceRole": { + "id": "ServiceRole", + "path": "DualStackVpc/Lambda_with_IPv6_VPC/ServiceRole", + "children": { + "ImportServiceRole": { + "id": "ImportServiceRole", + "path": "DualStackVpc/Lambda_with_IPv6_VPC/ServiceRole/ImportServiceRole", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "DualStackVpc/Lambda_with_IPv6_VPC/ServiceRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "managedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + }, + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole" + ] + ] + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_iam.CfnRole", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_iam.Role", + "version": "0.0.0" + } + }, + "SecurityGroup": { + "id": "SecurityGroup", + "path": "DualStackVpc/Lambda_with_IPv6_VPC/SecurityGroup", + "children": { + "Resource": { + "id": "Resource", + "path": "DualStackVpc/Lambda_with_IPv6_VPC/SecurityGroup/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::EC2::SecurityGroup", + "aws:cdk:cloudformation:props": { + "groupDescription": "Automatic security group for Lambda Function DualStackVpcLambdawithIPv6VPC4667BF31", + "securityGroupEgress": [ + { + "cidrIp": "0.0.0.0/0", + "description": "Allow all outbound traffic by default", + "ipProtocol": "-1" + } + ], + "vpcId": { + "Ref": "DualStackProtocolVpc85768F2C" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.CfnSecurityGroup", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_ec2.SecurityGroup", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "DualStackVpc/Lambda_with_IPv6_VPC/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Lambda::Function", + "aws:cdk:cloudformation:props": { + "code": { + "zipFile": "def main(event, context): pass" + }, + "handler": "index.main", + "role": { + "Fn::GetAtt": [ + "LambdawithIPv6VPCServiceRoleC3866C85", + "Arn" + ] + }, + "runtime": "python3.9", + "vpcConfig": { + "ipv6AllowedForDualStack": true, + "subnetIds": [ + { + "Ref": "DualStackProtocolVpcPriv1Subnet1Subnet6E77EDE7" + }, + { + "Ref": "DualStackProtocolVpcPriv1Subnet2SubnetBC65773F" + } + ], + "securityGroupIds": [ + { + "Fn::GetAtt": [ + "LambdawithIPv6VPCSecurityGroup1BC5651B", + "GroupId" + ] + } + ] + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_lambda.CfnFunction", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_lambda.Function", + "version": "0.0.0" + } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "DualStackVpc/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "DualStackVpc/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" + } + }, + "DualStackTesting": { + "id": "DualStackTesting", + "path": "DualStackTesting", + "children": { + "DefaultTest": { + "id": "DefaultTest", + "path": "DualStackTesting/DefaultTest", + "children": { + "Default": { + "id": "Default", + "path": "DualStackTesting/DefaultTest/Default", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" + } + }, + "DeployAssert": { + "id": "DeployAssert", + "path": "DualStackTesting/DefaultTest/DeployAssert", + "children": { + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "DualStackTesting/DefaultTest/DeployAssert/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "DualStackTesting/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-lib.App", + "version": "0.0.0" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.ts new file mode 100644 index 0000000000000..0f080ebd90004 --- /dev/null +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.ts @@ -0,0 +1,42 @@ +import { App, Stack } from 'aws-cdk-lib/core'; +import * as ec2 from 'aws-cdk-lib/aws-ec2'; +import { IntegTest } from '@aws-cdk/integ-tests-alpha'; +import * as lambda from 'aws-cdk-lib/aws-lambda'; + +const app = new App(); +const stack = new Stack(app, 'DualStackVpc'); + +const natProvider = ec2.NatProvider.gateway(); +const vpc = new ec2.Vpc(stack, 'DualStackProtocolVpc', { + ipProtocol: ec2.IpProtocol.DUAL_STACK, + subnetConfiguration: [ + { + name: 'Pub1', + subnetType: ec2.SubnetType.PUBLIC, + }, + { + name: 'Pub2', + subnetType: ec2.SubnetType.PUBLIC, + }, + { + name: 'Priv1', + subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS, + }, + ], + natGatewayProvider: natProvider, +}); + +const natGatewayId = natProvider.configuredGateways[0].gatewayId; +(vpc.privateSubnets[0] as ec2.PrivateSubnet).addIpv6Nat64Route(natGatewayId); + +new lambda.Function(stack, 'Lambda_with_IPv6_VPC', { + code: new lambda.InlineCode('def main(event, context): pass'), + handler: 'index.main', + runtime: lambda.Runtime.PYTHON_3_9, + vpc, + ipv6AllowedForDualStack: true, +}); + +new IntegTest(app, 'DualStackTesting', { + testCases: [stack], +}); \ No newline at end of file diff --git a/packages/aws-cdk-lib/aws-lambda/README.md b/packages/aws-cdk-lib/aws-lambda/README.md index 13b3c319ec7ff..26252c4ce2d8c 100644 --- a/packages/aws-cdk-lib/aws-lambda/README.md +++ b/packages/aws-cdk-lib/aws-lambda/README.md @@ -1075,6 +1075,49 @@ const fn = new lambda.Function(this, 'MyLambda', { }); ``` +## IPv6 support + +You can configure IPv6 connectivity for lambda function by setting `Ipv6AllowedForDualStack` to true. +It allows Lambda functions to specify whether the IPv6 traffic should be allowed when using dual-stack VPCs. +To access IPv6 network using Lambda, Dual-stack VPC is required. Using dual-stack VPC a function communicates with subnet over either of IPv4 or IPv6. + +```ts +import * as ec2 from 'aws-cdk-lib/aws-ec2'; + +const natProvider = ec2.NatProvider.gateway(); + +// create dual-stack VPC +const vpc = new ec2.Vpc(this, 'DualStackProtocolVpc', { + ipProtocol: ec2.IpProtocol.DUAL_STACK, + subnetConfiguration: [ + { + name: 'Pub1', + subnetType: ec2.SubnetType.PUBLIC, + }, + { + name: 'Pub2', + subnetType: ec2.SubnetType.PUBLIC, + }, + { + name: 'Priv1', + subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS, + }, + ], + natGatewayProvider: natProvider, +}); + +const natGatewayId = natProvider.configuredGateways[0].gatewayId; +(vpc.privateSubnets[0] as ec2.PrivateSubnet).addIpv6Nat64Route(natGatewayId); + +const fn = new lambda.Function(this, 'Lambda_with_IPv6_VPC', { + code: new lambda.InlineCode('def main(event, context): pass'), + handler: 'index.main', + runtime: lambda.Runtime.PYTHON_3_9, + vpc, + ipv6AllowedForDualStack: true, +}); +``` + ## Ephemeral Storage You can configure ephemeral storage on a function to control the amount of storage it gets for reading diff --git a/packages/aws-cdk-lib/aws-lambda/lib/function.ts b/packages/aws-cdk-lib/aws-lambda/lib/function.ts index 23c6e9b8ff2ef..31680a10e1031 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/function.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/function.ts @@ -232,6 +232,15 @@ export interface FunctionOptions extends EventInvokeConfigOptions { */ readonly vpc?: ec2.IVpc; + /** + * Allows outbound IPv6 traffic on VPC functions that are connected to dual-stack subnets. + * + * Only used if 'vpc' is supplied. + * + * @default false + */ + readonly ipv6AllowedForDualStack?: boolean; + /** * Where to place the network interfaces within the VPC. * @@ -1447,6 +1456,9 @@ Environment variables can be marked for removal when used in Lambda@Edge by sett if (props.vpcSubnets) { throw new Error('Cannot configure \'vpcSubnets\' without configuring a VPC'); } + if (props.ipv6AllowedForDualStack) { + throw new Error('Cannot configure \'ipv6AllowedForDualStack\' without configuring a VPC'); + } return undefined; } @@ -1483,6 +1495,7 @@ Environment variables can be marked for removal when used in Lambda@Edge by sett } } + const ipv6AllowedForDualStack = props.ipv6AllowedForDualStack ?? false; const allowPublicSubnet = props.allowPublicSubnet ?? false; const selectedSubnets = props.vpc.selectSubnets(props.vpcSubnets); const publicSubnetIds = new Set(props.vpc.publicSubnets.map(s => s.subnetId)); @@ -1497,10 +1510,17 @@ Environment variables can be marked for removal when used in Lambda@Edge by sett // List can't be empty here, if we got this far you intended to put your Lambda // in subnets. We're going to guarantee that we get the nice error message by // making VpcNetwork do the selection again. - - return { - subnetIds: selectedSubnets.subnetIds, - securityGroupIds: securityGroups.map(sg => sg.securityGroupId), + if (props.ipv6AllowedForDualStack) { + return { + ipv6AllowedForDualStack: ipv6AllowedForDualStack, + subnetIds: selectedSubnets.subnetIds, + securityGroupIds: securityGroups.map(sg => sg.securityGroupId), + }; + } else { + return { + subnetIds: selectedSubnets.subnetIds, + securityGroupIds: securityGroups.map(sg => sg.securityGroupId), + }; }; } diff --git a/packages/aws-cdk-lib/aws-lambda/test/function.test.ts b/packages/aws-cdk-lib/aws-lambda/test/function.test.ts index 46a79c32acbdd..d656bfb2bd964 100644 --- a/packages/aws-cdk-lib/aws-lambda/test/function.test.ts +++ b/packages/aws-cdk-lib/aws-lambda/test/function.test.ts @@ -3832,6 +3832,58 @@ describe('VPC configuration', () => { allowAllOutbound: false, })).not.toThrow(); }); + + test('with ipv6AllowedForDualStack and no VPC', () => { + const stack = new cdk.Stack(); + expect(() => new lambda.Function(stack, 'MyLambda', { + code: new lambda.InlineCode('foo'), + handler: 'index.handler', + runtime: lambda.Runtime.PYTHON_3_9, + ipv6AllowedForDualStack: true, + })).toThrow(/Cannot configure 'ipv6AllowedForDualStack' without configuring a VPC/); + }); + + test('set ipv6AllowedForDualStack with VPC', () => { + const stack = new cdk.Stack(); + const vpc = new ec2.Vpc(stack, 'Vpc', { + maxAzs: 3, + natGateways: 1, + }); + const securityGroup = new ec2.SecurityGroup(stack, 'LambdaSG', { + vpc, + allowAllOutbound: true, + allowAllIpv6Outbound: true, + }); + new lambda.Function(stack, 'MyLambda', { + vpc: vpc, + code: new lambda.InlineCode('foo'), + handler: 'index.handler', + runtime: lambda.Runtime.PYTHON_3_9, + ipv6AllowedForDualStack: true, + securityGroups: [securityGroup], + vpcSubnets: { subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS }, + }); + + Template.fromStack(stack).hasResource('AWS::Lambda::Function', { + Properties: + { + Code: { ZipFile: 'foo' }, + Handler: 'index.handler', + Runtime: 'python3.9', + Role: { 'Fn::GetAtt': ['MyLambdaServiceRole4539ECB6', 'Arn'] }, + VpcConfig: { + Ipv6AllowedForDualStack: true, + SecurityGroupIds: [ + { 'Fn::GetAtt': ['LambdaSG9DBFCFB7', 'GroupId'] }, + ], + SubnetIds: [ + { Ref: 'VpcPrivateSubnet1Subnet536B997A' }, + { Ref: 'VpcPrivateSubnet2Subnet3788AAA1' }, + ], + }, + }, + }); + }); }); function newTestLambda(scope: constructs.Construct) { From e225d9b79dae89636f27199392a5c51b4261571c Mon Sep 17 00:00:00 2001 From: Vandita2020 Date: Fri, 16 Feb 2024 12:24:36 -0800 Subject: [PATCH 2/2] Review Changes --- .../DualStackVpc.assets.json | 4 +- .../DualStackVpc.template.json | 400 ++++++------- .../manifest.json | 540 +++++++++++++++--- .../tree.json | 320 +++++------ .../test/integ.lambda_with_dualStack_vpc.ts | 8 +- packages/aws-cdk-lib/aws-lambda/README.md | 8 +- .../aws-cdk-lib/aws-lambda/lib/function.ts | 4 +- .../aws-lambda/test/function.test.ts | 42 ++ 8 files changed, 870 insertions(+), 456 deletions(-) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackVpc.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackVpc.assets.json index 338263e438f8d..5d59dc84428d2 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackVpc.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackVpc.assets.json @@ -14,7 +14,7 @@ } } }, - "225ebf0ceea059c584f3011672077deab41d93a6383af8a75ea4fb479f44b37d": { + "17bdcf840538818bd469e10cd17adc79eabe27fa42a55c094e2642ce192da977": { "source": { "path": "DualStackVpc.template.json", "packaging": "file" @@ -22,7 +22,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "225ebf0ceea059c584f3011672077deab41d93a6383af8a75ea4fb479f44b37d.json", + "objectKey": "17bdcf840538818bd469e10cd17adc79eabe27fa42a55c094e2642ce192da977.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-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackVpc.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackVpc.template.json index b98c91886b34d..93977bc4fe135 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackVpc.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/DualStackVpc.template.json @@ -1,6 +1,6 @@ { "Resources": { - "DualStackProtocolVpc85768F2C": { + "DualStackVpcE812233C": { "Type": "AWS::EC2::VPC", "Properties": { "CidrBlock": "10.0.0.0/16", @@ -10,21 +10,21 @@ "Tags": [ { "Key": "Name", - "Value": "DualStackVpc/DualStackProtocolVpc" + "Value": "DualStackVpc/DualStackVpc" } ] } }, - "DualStackProtocolVpcipv6cidr449C49CD": { + "DualStackVpcipv6cidr0D52F270": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, "VpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } } }, - "DualStackProtocolVpcPub1Subnet1Subnet74CA4B8A": { + "DualStackVpcIpv6Public1Subnet1SubnetC431B310": { "Type": "AWS::EC2::Subnet", "Properties": { "AssignIpv6AddressOnCreation": true, @@ -47,7 +47,7 @@ 0, { "Fn::GetAtt": [ - "DualStackProtocolVpc85768F2C", + "DualStackVpcE812233C", "Ipv6CidrBlocks" ] } @@ -63,7 +63,7 @@ "Tags": [ { "Key": "aws-cdk:subnet-name", - "Value": "Pub1" + "Value": "Ipv6Public1" }, { "Key": "aws-cdk:subnet-type", @@ -71,121 +71,121 @@ }, { "Key": "Name", - "Value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1" + "Value": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet1" } ], "VpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPub1Subnet1RouteTable67D20294": { + "DualStackVpcIpv6Public1Subnet1RouteTable73C65370": { "Type": "AWS::EC2::RouteTable", "Properties": { "Tags": [ { "Key": "Name", - "Value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1" + "Value": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet1" } ], "VpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPub1Subnet1RouteTableAssociation047F9491": { + "DualStackVpcIpv6Public1Subnet1RouteTableAssociation85711416": { "Type": "AWS::EC2::SubnetRouteTableAssociation", "Properties": { "RouteTableId": { - "Ref": "DualStackProtocolVpcPub1Subnet1RouteTable67D20294" + "Ref": "DualStackVpcIpv6Public1Subnet1RouteTable73C65370" }, "SubnetId": { - "Ref": "DualStackProtocolVpcPub1Subnet1Subnet74CA4B8A" + "Ref": "DualStackVpcIpv6Public1Subnet1SubnetC431B310" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPub1Subnet1DefaultRoute95ED74BD": { + "DualStackVpcIpv6Public1Subnet1DefaultRoute57B6CABF": { "Type": "AWS::EC2::Route", "Properties": { "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { - "Ref": "DualStackProtocolVpcIGW0F74732B" + "Ref": "DualStackVpcIGW08AC356D" }, "RouteTableId": { - "Ref": "DualStackProtocolVpcPub1Subnet1RouteTable67D20294" + "Ref": "DualStackVpcIpv6Public1Subnet1RouteTable73C65370" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD", - "DualStackProtocolVpcVPCGWADE48B7D" + "DualStackVpcipv6cidr0D52F270", + "DualStackVpcVPCGW7803C9BB" ] }, - "DualStackProtocolVpcPub1Subnet1DefaultRoute6C01F89FD": { + "DualStackVpcIpv6Public1Subnet1DefaultRoute63C453094": { "Type": "AWS::EC2::Route", "Properties": { "DestinationIpv6CidrBlock": "::/0", "GatewayId": { - "Ref": "DualStackProtocolVpcIGW0F74732B" + "Ref": "DualStackVpcIGW08AC356D" }, "RouteTableId": { - "Ref": "DualStackProtocolVpcPub1Subnet1RouteTable67D20294" + "Ref": "DualStackVpcIpv6Public1Subnet1RouteTable73C65370" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPub1Subnet1EIP12EDF1FD": { + "DualStackVpcIpv6Public1Subnet1EIP4E17F847": { "Type": "AWS::EC2::EIP", "Properties": { "Domain": "vpc", "Tags": [ { "Key": "Name", - "Value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1" + "Value": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet1" } ] }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPub1Subnet1NATGateway241D9A98": { + "DualStackVpcIpv6Public1Subnet1NATGateway7D2A0F59": { "Type": "AWS::EC2::NatGateway", "Properties": { "AllocationId": { "Fn::GetAtt": [ - "DualStackProtocolVpcPub1Subnet1EIP12EDF1FD", + "DualStackVpcIpv6Public1Subnet1EIP4E17F847", "AllocationId" ] }, "SubnetId": { - "Ref": "DualStackProtocolVpcPub1Subnet1Subnet74CA4B8A" + "Ref": "DualStackVpcIpv6Public1Subnet1SubnetC431B310" }, "Tags": [ { "Key": "Name", - "Value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1" + "Value": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet1" } ] }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD", - "DualStackProtocolVpcPub1Subnet1DefaultRoute95ED74BD", - "DualStackProtocolVpcPub1Subnet1DefaultRoute6C01F89FD", - "DualStackProtocolVpcPub1Subnet1RouteTableAssociation047F9491" + "DualStackVpcipv6cidr0D52F270", + "DualStackVpcIpv6Public1Subnet1DefaultRoute57B6CABF", + "DualStackVpcIpv6Public1Subnet1DefaultRoute63C453094", + "DualStackVpcIpv6Public1Subnet1RouteTableAssociation85711416" ] }, - "DualStackProtocolVpcPub1Subnet2Subnet8B1A85E2": { + "DualStackVpcIpv6Public1Subnet2Subnet9515A153": { "Type": "AWS::EC2::Subnet", "Properties": { "AssignIpv6AddressOnCreation": true, @@ -208,7 +208,7 @@ 0, { "Fn::GetAtt": [ - "DualStackProtocolVpc85768F2C", + "DualStackVpcE812233C", "Ipv6CidrBlocks" ] } @@ -224,7 +224,7 @@ "Tags": [ { "Key": "aws-cdk:subnet-name", - "Value": "Pub1" + "Value": "Ipv6Public1" }, { "Key": "aws-cdk:subnet-type", @@ -232,121 +232,121 @@ }, { "Key": "Name", - "Value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2" + "Value": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet2" } ], "VpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPub1Subnet2RouteTable63549985": { + "DualStackVpcIpv6Public1Subnet2RouteTableC119E52D": { "Type": "AWS::EC2::RouteTable", "Properties": { "Tags": [ { "Key": "Name", - "Value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2" + "Value": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet2" } ], "VpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPub1Subnet2RouteTableAssociation12736FE3": { + "DualStackVpcIpv6Public1Subnet2RouteTableAssociationC35EFFE6": { "Type": "AWS::EC2::SubnetRouteTableAssociation", "Properties": { "RouteTableId": { - "Ref": "DualStackProtocolVpcPub1Subnet2RouteTable63549985" + "Ref": "DualStackVpcIpv6Public1Subnet2RouteTableC119E52D" }, "SubnetId": { - "Ref": "DualStackProtocolVpcPub1Subnet2Subnet8B1A85E2" + "Ref": "DualStackVpcIpv6Public1Subnet2Subnet9515A153" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPub1Subnet2DefaultRoute293C2941": { + "DualStackVpcIpv6Public1Subnet2DefaultRoute5C081F90": { "Type": "AWS::EC2::Route", "Properties": { "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { - "Ref": "DualStackProtocolVpcIGW0F74732B" + "Ref": "DualStackVpcIGW08AC356D" }, "RouteTableId": { - "Ref": "DualStackProtocolVpcPub1Subnet2RouteTable63549985" + "Ref": "DualStackVpcIpv6Public1Subnet2RouteTableC119E52D" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD", - "DualStackProtocolVpcVPCGWADE48B7D" + "DualStackVpcipv6cidr0D52F270", + "DualStackVpcVPCGW7803C9BB" ] }, - "DualStackProtocolVpcPub1Subnet2DefaultRoute67E6A8DC8": { + "DualStackVpcIpv6Public1Subnet2DefaultRoute68F5F8AA5": { "Type": "AWS::EC2::Route", "Properties": { "DestinationIpv6CidrBlock": "::/0", "GatewayId": { - "Ref": "DualStackProtocolVpcIGW0F74732B" + "Ref": "DualStackVpcIGW08AC356D" }, "RouteTableId": { - "Ref": "DualStackProtocolVpcPub1Subnet2RouteTable63549985" + "Ref": "DualStackVpcIpv6Public1Subnet2RouteTableC119E52D" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPub1Subnet2EIP149FAFF5": { + "DualStackVpcIpv6Public1Subnet2EIP45B7D0DE": { "Type": "AWS::EC2::EIP", "Properties": { "Domain": "vpc", "Tags": [ { "Key": "Name", - "Value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2" + "Value": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet2" } ] }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPub1Subnet2NATGateway64DC713B": { + "DualStackVpcIpv6Public1Subnet2NATGateway76C3674B": { "Type": "AWS::EC2::NatGateway", "Properties": { "AllocationId": { "Fn::GetAtt": [ - "DualStackProtocolVpcPub1Subnet2EIP149FAFF5", + "DualStackVpcIpv6Public1Subnet2EIP45B7D0DE", "AllocationId" ] }, "SubnetId": { - "Ref": "DualStackProtocolVpcPub1Subnet2Subnet8B1A85E2" + "Ref": "DualStackVpcIpv6Public1Subnet2Subnet9515A153" }, "Tags": [ { "Key": "Name", - "Value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2" + "Value": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet2" } ] }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD", - "DualStackProtocolVpcPub1Subnet2DefaultRoute293C2941", - "DualStackProtocolVpcPub1Subnet2DefaultRoute67E6A8DC8", - "DualStackProtocolVpcPub1Subnet2RouteTableAssociation12736FE3" + "DualStackVpcipv6cidr0D52F270", + "DualStackVpcIpv6Public1Subnet2DefaultRoute5C081F90", + "DualStackVpcIpv6Public1Subnet2DefaultRoute68F5F8AA5", + "DualStackVpcIpv6Public1Subnet2RouteTableAssociationC35EFFE6" ] }, - "DualStackProtocolVpcPub2Subnet1Subnet483B9827": { + "DualStackVpcIpv6Public2Subnet1Subnet314CDCFE": { "Type": "AWS::EC2::Subnet", "Properties": { "AssignIpv6AddressOnCreation": true, @@ -369,7 +369,7 @@ 0, { "Fn::GetAtt": [ - "DualStackProtocolVpc85768F2C", + "DualStackVpcE812233C", "Ipv6CidrBlocks" ] } @@ -385,7 +385,7 @@ "Tags": [ { "Key": "aws-cdk:subnet-name", - "Value": "Pub2" + "Value": "Ipv6Public2" }, { "Key": "aws-cdk:subnet-type", @@ -393,80 +393,80 @@ }, { "Key": "Name", - "Value": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1" + "Value": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet1" } ], "VpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPub2Subnet1RouteTable95379836": { + "DualStackVpcIpv6Public2Subnet1RouteTableAFB7D529": { "Type": "AWS::EC2::RouteTable", "Properties": { "Tags": [ { "Key": "Name", - "Value": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1" + "Value": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet1" } ], "VpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPub2Subnet1RouteTableAssociation24FAAE7F": { + "DualStackVpcIpv6Public2Subnet1RouteTableAssociation14B446E0": { "Type": "AWS::EC2::SubnetRouteTableAssociation", "Properties": { "RouteTableId": { - "Ref": "DualStackProtocolVpcPub2Subnet1RouteTable95379836" + "Ref": "DualStackVpcIpv6Public2Subnet1RouteTableAFB7D529" }, "SubnetId": { - "Ref": "DualStackProtocolVpcPub2Subnet1Subnet483B9827" + "Ref": "DualStackVpcIpv6Public2Subnet1Subnet314CDCFE" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPub2Subnet1DefaultRouteB99615CA": { + "DualStackVpcIpv6Public2Subnet1DefaultRouteD48C6F58": { "Type": "AWS::EC2::Route", "Properties": { "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { - "Ref": "DualStackProtocolVpcIGW0F74732B" + "Ref": "DualStackVpcIGW08AC356D" }, "RouteTableId": { - "Ref": "DualStackProtocolVpcPub2Subnet1RouteTable95379836" + "Ref": "DualStackVpcIpv6Public2Subnet1RouteTableAFB7D529" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD", - "DualStackProtocolVpcVPCGWADE48B7D" + "DualStackVpcipv6cidr0D52F270", + "DualStackVpcVPCGW7803C9BB" ] }, - "DualStackProtocolVpcPub2Subnet1DefaultRoute670D1366F": { + "DualStackVpcIpv6Public2Subnet1DefaultRoute6DFD01A58": { "Type": "AWS::EC2::Route", "Properties": { "DestinationIpv6CidrBlock": "::/0", "GatewayId": { - "Ref": "DualStackProtocolVpcIGW0F74732B" + "Ref": "DualStackVpcIGW08AC356D" }, "RouteTableId": { - "Ref": "DualStackProtocolVpcPub2Subnet1RouteTable95379836" + "Ref": "DualStackVpcIpv6Public2Subnet1RouteTableAFB7D529" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPub2Subnet2SubnetCA5962A0": { + "DualStackVpcIpv6Public2Subnet2Subnet509DD3CC": { "Type": "AWS::EC2::Subnet", "Properties": { "AssignIpv6AddressOnCreation": true, @@ -489,7 +489,7 @@ 0, { "Fn::GetAtt": [ - "DualStackProtocolVpc85768F2C", + "DualStackVpcE812233C", "Ipv6CidrBlocks" ] } @@ -505,7 +505,7 @@ "Tags": [ { "Key": "aws-cdk:subnet-name", - "Value": "Pub2" + "Value": "Ipv6Public2" }, { "Key": "aws-cdk:subnet-type", @@ -513,80 +513,80 @@ }, { "Key": "Name", - "Value": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2" + "Value": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet2" } ], "VpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPub2Subnet2RouteTable1300ACEE": { + "DualStackVpcIpv6Public2Subnet2RouteTable2D5742D9": { "Type": "AWS::EC2::RouteTable", "Properties": { "Tags": [ { "Key": "Name", - "Value": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2" + "Value": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet2" } ], "VpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPub2Subnet2RouteTableAssociation7E1F73B5": { + "DualStackVpcIpv6Public2Subnet2RouteTableAssociation7399CA29": { "Type": "AWS::EC2::SubnetRouteTableAssociation", "Properties": { "RouteTableId": { - "Ref": "DualStackProtocolVpcPub2Subnet2RouteTable1300ACEE" + "Ref": "DualStackVpcIpv6Public2Subnet2RouteTable2D5742D9" }, "SubnetId": { - "Ref": "DualStackProtocolVpcPub2Subnet2SubnetCA5962A0" + "Ref": "DualStackVpcIpv6Public2Subnet2Subnet509DD3CC" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPub2Subnet2DefaultRoute6B98C127": { + "DualStackVpcIpv6Public2Subnet2DefaultRoute3D636DA7": { "Type": "AWS::EC2::Route", "Properties": { "DestinationCidrBlock": "0.0.0.0/0", "GatewayId": { - "Ref": "DualStackProtocolVpcIGW0F74732B" + "Ref": "DualStackVpcIGW08AC356D" }, "RouteTableId": { - "Ref": "DualStackProtocolVpcPub2Subnet2RouteTable1300ACEE" + "Ref": "DualStackVpcIpv6Public2Subnet2RouteTable2D5742D9" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD", - "DualStackProtocolVpcVPCGWADE48B7D" + "DualStackVpcipv6cidr0D52F270", + "DualStackVpcVPCGW7803C9BB" ] }, - "DualStackProtocolVpcPub2Subnet2DefaultRoute60CFFE651": { + "DualStackVpcIpv6Public2Subnet2DefaultRoute630FBEA19": { "Type": "AWS::EC2::Route", "Properties": { "DestinationIpv6CidrBlock": "::/0", "GatewayId": { - "Ref": "DualStackProtocolVpcIGW0F74732B" + "Ref": "DualStackVpcIGW08AC356D" }, "RouteTableId": { - "Ref": "DualStackProtocolVpcPub2Subnet2RouteTable1300ACEE" + "Ref": "DualStackVpcIpv6Public2Subnet2RouteTable2D5742D9" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPriv1Subnet1Subnet6E77EDE7": { + "DualStackVpcIpv6Private1Subnet1Subnet2C527D85": { "Type": "AWS::EC2::Subnet", "Properties": { "AssignIpv6AddressOnCreation": true, @@ -609,7 +609,7 @@ 0, { "Fn::GetAtt": [ - "DualStackProtocolVpc85768F2C", + "DualStackVpcE812233C", "Ipv6CidrBlocks" ] } @@ -625,7 +625,7 @@ "Tags": [ { "Key": "aws-cdk:subnet-name", - "Value": "Priv1" + "Value": "Ipv6Private1" }, { "Key": "aws-cdk:subnet-type", @@ -633,94 +633,94 @@ }, { "Key": "Name", - "Value": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1" + "Value": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet1" } ], "VpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11": { + "DualStackVpcIpv6Private1Subnet1RouteTable9CCA0D06": { "Type": "AWS::EC2::RouteTable", "Properties": { "Tags": [ { "Key": "Name", - "Value": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1" + "Value": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet1" } ], "VpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPriv1Subnet1RouteTableAssociation9D52852A": { + "DualStackVpcIpv6Private1Subnet1RouteTableAssociation0B2158D5": { "Type": "AWS::EC2::SubnetRouteTableAssociation", "Properties": { "RouteTableId": { - "Ref": "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11" + "Ref": "DualStackVpcIpv6Private1Subnet1RouteTable9CCA0D06" }, "SubnetId": { - "Ref": "DualStackProtocolVpcPriv1Subnet1Subnet6E77EDE7" + "Ref": "DualStackVpcIpv6Private1Subnet1Subnet2C527D85" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPriv1Subnet1DefaultRouteEC60BBD4": { + "DualStackVpcIpv6Private1Subnet1DefaultRoute0F84EAB9": { "Type": "AWS::EC2::Route", "Properties": { "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { - "Ref": "DualStackProtocolVpcPub1Subnet1NATGateway241D9A98" + "Ref": "DualStackVpcIpv6Public1Subnet1NATGateway7D2A0F59" }, "RouteTableId": { - "Ref": "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11" + "Ref": "DualStackVpcIpv6Private1Subnet1RouteTable9CCA0D06" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPriv1Subnet1DefaultRoute65CC26492": { + "DualStackVpcIpv6Private1Subnet1DefaultRoute6D3F9C454": { "Type": "AWS::EC2::Route", "Properties": { "DestinationIpv6CidrBlock": "::/0", "EgressOnlyInternetGatewayId": { - "Ref": "DualStackProtocolVpcEIGW64BED696A" + "Ref": "DualStackVpcEIGW64639A9F2" }, "RouteTableId": { - "Ref": "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11" + "Ref": "DualStackVpcIpv6Private1Subnet1RouteTable9CCA0D06" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPriv1Subnet1Nat649573F0A7": { + "DualStackVpcIpv6Private1Subnet1Nat649907016D": { "Type": "AWS::EC2::Route", "Properties": { "DestinationIpv6CidrBlock": "64:ff9b::/96", "NatGatewayId": { - "Ref": "DualStackProtocolVpcPub1Subnet1NATGateway241D9A98" + "Ref": "DualStackVpcIpv6Public1Subnet1NATGateway7D2A0F59" }, "RouteTableId": { - "Ref": "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11" + "Ref": "DualStackVpcIpv6Private1Subnet1RouteTable9CCA0D06" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPriv1Subnet2SubnetBC65773F": { + "DualStackVpcIpv6Private1Subnet2Subnet0F013554": { "Type": "AWS::EC2::Subnet", "Properties": { "AssignIpv6AddressOnCreation": true, @@ -743,7 +743,7 @@ 0, { "Fn::GetAtt": [ - "DualStackProtocolVpc85768F2C", + "DualStackVpcE812233C", "Ipv6CidrBlocks" ] } @@ -759,7 +759,7 @@ "Tags": [ { "Key": "aws-cdk:subnet-name", - "Value": "Priv1" + "Value": "Ipv6Private1" }, { "Key": "aws-cdk:subnet-type", @@ -767,109 +767,109 @@ }, { "Key": "Name", - "Value": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2" + "Value": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet2" } ], "VpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPriv1Subnet2RouteTableC8DC5D06": { + "DualStackVpcIpv6Private1Subnet2RouteTable18BA0241": { "Type": "AWS::EC2::RouteTable", "Properties": { "Tags": [ { "Key": "Name", - "Value": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2" + "Value": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet2" } ], "VpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPriv1Subnet2RouteTableAssociation0F224C80": { + "DualStackVpcIpv6Private1Subnet2RouteTableAssociationC5571008": { "Type": "AWS::EC2::SubnetRouteTableAssociation", "Properties": { "RouteTableId": { - "Ref": "DualStackProtocolVpcPriv1Subnet2RouteTableC8DC5D06" + "Ref": "DualStackVpcIpv6Private1Subnet2RouteTable18BA0241" }, "SubnetId": { - "Ref": "DualStackProtocolVpcPriv1Subnet2SubnetBC65773F" + "Ref": "DualStackVpcIpv6Private1Subnet2Subnet0F013554" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPriv1Subnet2DefaultRouteD01D04E1": { + "DualStackVpcIpv6Private1Subnet2DefaultRouteBADA4821": { "Type": "AWS::EC2::Route", "Properties": { "DestinationCidrBlock": "0.0.0.0/0", "NatGatewayId": { - "Ref": "DualStackProtocolVpcPub1Subnet2NATGateway64DC713B" + "Ref": "DualStackVpcIpv6Public1Subnet2NATGateway76C3674B" }, "RouteTableId": { - "Ref": "DualStackProtocolVpcPriv1Subnet2RouteTableC8DC5D06" + "Ref": "DualStackVpcIpv6Private1Subnet2RouteTable18BA0241" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcPriv1Subnet2DefaultRoute63F529AA9": { + "DualStackVpcIpv6Private1Subnet2DefaultRoute68619C7A8": { "Type": "AWS::EC2::Route", "Properties": { "DestinationIpv6CidrBlock": "::/0", "EgressOnlyInternetGatewayId": { - "Ref": "DualStackProtocolVpcEIGW64BED696A" + "Ref": "DualStackVpcEIGW64639A9F2" }, "RouteTableId": { - "Ref": "DualStackProtocolVpcPriv1Subnet2RouteTableC8DC5D06" + "Ref": "DualStackVpcIpv6Private1Subnet2RouteTable18BA0241" } }, "DependsOn": [ - "DualStackProtocolVpcipv6cidr449C49CD" + "DualStackVpcipv6cidr0D52F270" ] }, - "DualStackProtocolVpcIGW0F74732B": { + "DualStackVpcIGW08AC356D": { "Type": "AWS::EC2::InternetGateway", "Properties": { "Tags": [ { "Key": "Name", - "Value": "DualStackVpc/DualStackProtocolVpc" + "Value": "DualStackVpc/DualStackVpc" } ] } }, - "DualStackProtocolVpcVPCGWADE48B7D": { + "DualStackVpcVPCGW7803C9BB": { "Type": "AWS::EC2::VPCGatewayAttachment", "Properties": { "InternetGatewayId": { - "Ref": "DualStackProtocolVpcIGW0F74732B" + "Ref": "DualStackVpcIGW08AC356D" }, "VpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } } }, - "DualStackProtocolVpcEIGW64BED696A": { + "DualStackVpcEIGW64639A9F2": { "Type": "AWS::EC2::EgressOnlyInternetGateway", "Properties": { "VpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } } }, - "DualStackProtocolVpcRestrictDefaultSecurityGroupCustomResource592699C8": { + "DualStackVpcRestrictDefaultSecurityGroupCustomResource5AA79B96": { "Type": "Custom::VpcRestrictDefaultSG", "Properties": { "ServiceToken": { @@ -880,7 +880,7 @@ }, "DefaultSecurityGroupId": { "Fn::GetAtt": [ - "DualStackProtocolVpc85768F2C", + "DualStackVpcE812233C", "DefaultSecurityGroup" ] }, @@ -945,7 +945,7 @@ ":security-group/", { "Fn::GetAtt": [ - "DualStackProtocolVpc85768F2C", + "DualStackVpcE812233C", "DefaultSecurityGroup" ] } @@ -1028,13 +1028,13 @@ ] }, "DependsOn": [ - "DualStackProtocolVpcPriv1Subnet1DefaultRouteEC60BBD4", - "DualStackProtocolVpcPriv1Subnet1DefaultRoute65CC26492", - "DualStackProtocolVpcPriv1Subnet1Nat649573F0A7", - "DualStackProtocolVpcPriv1Subnet1RouteTableAssociation9D52852A", - "DualStackProtocolVpcPriv1Subnet2DefaultRouteD01D04E1", - "DualStackProtocolVpcPriv1Subnet2DefaultRoute63F529AA9", - "DualStackProtocolVpcPriv1Subnet2RouteTableAssociation0F224C80" + "DualStackVpcIpv6Private1Subnet1DefaultRoute0F84EAB9", + "DualStackVpcIpv6Private1Subnet1DefaultRoute6D3F9C454", + "DualStackVpcIpv6Private1Subnet1Nat649907016D", + "DualStackVpcIpv6Private1Subnet1RouteTableAssociation0B2158D5", + "DualStackVpcIpv6Private1Subnet2DefaultRouteBADA4821", + "DualStackVpcIpv6Private1Subnet2DefaultRoute68619C7A8", + "DualStackVpcIpv6Private1Subnet2RouteTableAssociationC5571008" ] }, "LambdawithIPv6VPCSecurityGroup1BC5651B": { @@ -1049,17 +1049,17 @@ } ], "VpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } }, "DependsOn": [ - "DualStackProtocolVpcPriv1Subnet1DefaultRouteEC60BBD4", - "DualStackProtocolVpcPriv1Subnet1DefaultRoute65CC26492", - "DualStackProtocolVpcPriv1Subnet1Nat649573F0A7", - "DualStackProtocolVpcPriv1Subnet1RouteTableAssociation9D52852A", - "DualStackProtocolVpcPriv1Subnet2DefaultRouteD01D04E1", - "DualStackProtocolVpcPriv1Subnet2DefaultRoute63F529AA9", - "DualStackProtocolVpcPriv1Subnet2RouteTableAssociation0F224C80" + "DualStackVpcIpv6Private1Subnet1DefaultRoute0F84EAB9", + "DualStackVpcIpv6Private1Subnet1DefaultRoute6D3F9C454", + "DualStackVpcIpv6Private1Subnet1Nat649907016D", + "DualStackVpcIpv6Private1Subnet1RouteTableAssociation0B2158D5", + "DualStackVpcIpv6Private1Subnet2DefaultRouteBADA4821", + "DualStackVpcIpv6Private1Subnet2DefaultRoute68619C7A8", + "DualStackVpcIpv6Private1Subnet2RouteTableAssociationC5571008" ] }, "LambdawithIPv6VPCF50054B3": { @@ -1088,22 +1088,22 @@ ], "SubnetIds": [ { - "Ref": "DualStackProtocolVpcPriv1Subnet1Subnet6E77EDE7" + "Ref": "DualStackVpcIpv6Private1Subnet1Subnet2C527D85" }, { - "Ref": "DualStackProtocolVpcPriv1Subnet2SubnetBC65773F" + "Ref": "DualStackVpcIpv6Private1Subnet2Subnet0F013554" } ] } }, "DependsOn": [ - "DualStackProtocolVpcPriv1Subnet1DefaultRouteEC60BBD4", - "DualStackProtocolVpcPriv1Subnet1DefaultRoute65CC26492", - "DualStackProtocolVpcPriv1Subnet1Nat649573F0A7", - "DualStackProtocolVpcPriv1Subnet1RouteTableAssociation9D52852A", - "DualStackProtocolVpcPriv1Subnet2DefaultRouteD01D04E1", - "DualStackProtocolVpcPriv1Subnet2DefaultRoute63F529AA9", - "DualStackProtocolVpcPriv1Subnet2RouteTableAssociation0F224C80", + "DualStackVpcIpv6Private1Subnet1DefaultRoute0F84EAB9", + "DualStackVpcIpv6Private1Subnet1DefaultRoute6D3F9C454", + "DualStackVpcIpv6Private1Subnet1Nat649907016D", + "DualStackVpcIpv6Private1Subnet1RouteTableAssociation0B2158D5", + "DualStackVpcIpv6Private1Subnet2DefaultRouteBADA4821", + "DualStackVpcIpv6Private1Subnet2DefaultRoute68619C7A8", + "DualStackVpcIpv6Private1Subnet2RouteTableAssociationC5571008", "LambdawithIPv6VPCServiceRoleC3866C85" ] } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/manifest.json index aebdd6491ea1f..32d6529b29210 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/manifest.json @@ -18,7 +18,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}/225ebf0ceea059c584f3011672077deab41d93a6383af8a75ea4fb479f44b37d.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/17bdcf840538818bd469e10cd17adc79eabe27fa42a55c094e2642ce192da977.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -34,250 +34,250 @@ "DualStackVpc.assets" ], "metadata": { - "/DualStackVpc/DualStackProtocolVpc/Resource": [ + "/DualStackVpc/DualStackVpc/Resource": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpc85768F2C" + "data": "DualStackVpcE812233C" } ], - "/DualStackVpc/DualStackProtocolVpc/ipv6cidr": [ + "/DualStackVpc/DualStackVpc/ipv6cidr": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcipv6cidr449C49CD" + "data": "DualStackVpcipv6cidr0D52F270" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/Subnet": [ + "/DualStackVpc/DualStackVpc/Ipv6Public1Subnet1/Subnet": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub1Subnet1Subnet74CA4B8A" + "data": "DualStackVpcIpv6Public1Subnet1SubnetC431B310" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/RouteTable": [ + "/DualStackVpc/DualStackVpc/Ipv6Public1Subnet1/RouteTable": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub1Subnet1RouteTable67D20294" + "data": "DualStackVpcIpv6Public1Subnet1RouteTable73C65370" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/RouteTableAssociation": [ + "/DualStackVpc/DualStackVpc/Ipv6Public1Subnet1/RouteTableAssociation": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub1Subnet1RouteTableAssociation047F9491" + "data": "DualStackVpcIpv6Public1Subnet1RouteTableAssociation85711416" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/DefaultRoute": [ + "/DualStackVpc/DualStackVpc/Ipv6Public1Subnet1/DefaultRoute": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub1Subnet1DefaultRoute95ED74BD" + "data": "DualStackVpcIpv6Public1Subnet1DefaultRoute57B6CABF" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/DefaultRoute6": [ + "/DualStackVpc/DualStackVpc/Ipv6Public1Subnet1/DefaultRoute6": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub1Subnet1DefaultRoute6C01F89FD" + "data": "DualStackVpcIpv6Public1Subnet1DefaultRoute63C453094" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/EIP": [ + "/DualStackVpc/DualStackVpc/Ipv6Public1Subnet1/EIP": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub1Subnet1EIP12EDF1FD" + "data": "DualStackVpcIpv6Public1Subnet1EIP4E17F847" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/NATGateway": [ + "/DualStackVpc/DualStackVpc/Ipv6Public1Subnet1/NATGateway": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub1Subnet1NATGateway241D9A98" + "data": "DualStackVpcIpv6Public1Subnet1NATGateway7D2A0F59" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/Subnet": [ + "/DualStackVpc/DualStackVpc/Ipv6Public1Subnet2/Subnet": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub1Subnet2Subnet8B1A85E2" + "data": "DualStackVpcIpv6Public1Subnet2Subnet9515A153" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/RouteTable": [ + "/DualStackVpc/DualStackVpc/Ipv6Public1Subnet2/RouteTable": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub1Subnet2RouteTable63549985" + "data": "DualStackVpcIpv6Public1Subnet2RouteTableC119E52D" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/RouteTableAssociation": [ + "/DualStackVpc/DualStackVpc/Ipv6Public1Subnet2/RouteTableAssociation": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub1Subnet2RouteTableAssociation12736FE3" + "data": "DualStackVpcIpv6Public1Subnet2RouteTableAssociationC35EFFE6" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/DefaultRoute": [ + "/DualStackVpc/DualStackVpc/Ipv6Public1Subnet2/DefaultRoute": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub1Subnet2DefaultRoute293C2941" + "data": "DualStackVpcIpv6Public1Subnet2DefaultRoute5C081F90" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/DefaultRoute6": [ + "/DualStackVpc/DualStackVpc/Ipv6Public1Subnet2/DefaultRoute6": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub1Subnet2DefaultRoute67E6A8DC8" + "data": "DualStackVpcIpv6Public1Subnet2DefaultRoute68F5F8AA5" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/EIP": [ + "/DualStackVpc/DualStackVpc/Ipv6Public1Subnet2/EIP": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub1Subnet2EIP149FAFF5" + "data": "DualStackVpcIpv6Public1Subnet2EIP45B7D0DE" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/NATGateway": [ + "/DualStackVpc/DualStackVpc/Ipv6Public1Subnet2/NATGateway": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub1Subnet2NATGateway64DC713B" + "data": "DualStackVpcIpv6Public1Subnet2NATGateway76C3674B" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/Subnet": [ + "/DualStackVpc/DualStackVpc/Ipv6Public2Subnet1/Subnet": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub2Subnet1Subnet483B9827" + "data": "DualStackVpcIpv6Public2Subnet1Subnet314CDCFE" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/RouteTable": [ + "/DualStackVpc/DualStackVpc/Ipv6Public2Subnet1/RouteTable": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub2Subnet1RouteTable95379836" + "data": "DualStackVpcIpv6Public2Subnet1RouteTableAFB7D529" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/RouteTableAssociation": [ + "/DualStackVpc/DualStackVpc/Ipv6Public2Subnet1/RouteTableAssociation": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub2Subnet1RouteTableAssociation24FAAE7F" + "data": "DualStackVpcIpv6Public2Subnet1RouteTableAssociation14B446E0" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/DefaultRoute": [ + "/DualStackVpc/DualStackVpc/Ipv6Public2Subnet1/DefaultRoute": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub2Subnet1DefaultRouteB99615CA" + "data": "DualStackVpcIpv6Public2Subnet1DefaultRouteD48C6F58" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/DefaultRoute6": [ + "/DualStackVpc/DualStackVpc/Ipv6Public2Subnet1/DefaultRoute6": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub2Subnet1DefaultRoute670D1366F" + "data": "DualStackVpcIpv6Public2Subnet1DefaultRoute6DFD01A58" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/Subnet": [ + "/DualStackVpc/DualStackVpc/Ipv6Public2Subnet2/Subnet": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub2Subnet2SubnetCA5962A0" + "data": "DualStackVpcIpv6Public2Subnet2Subnet509DD3CC" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/RouteTable": [ + "/DualStackVpc/DualStackVpc/Ipv6Public2Subnet2/RouteTable": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub2Subnet2RouteTable1300ACEE" + "data": "DualStackVpcIpv6Public2Subnet2RouteTable2D5742D9" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/RouteTableAssociation": [ + "/DualStackVpc/DualStackVpc/Ipv6Public2Subnet2/RouteTableAssociation": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub2Subnet2RouteTableAssociation7E1F73B5" + "data": "DualStackVpcIpv6Public2Subnet2RouteTableAssociation7399CA29" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/DefaultRoute": [ + "/DualStackVpc/DualStackVpc/Ipv6Public2Subnet2/DefaultRoute": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub2Subnet2DefaultRoute6B98C127" + "data": "DualStackVpcIpv6Public2Subnet2DefaultRoute3D636DA7" } ], - "/DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/DefaultRoute6": [ + "/DualStackVpc/DualStackVpc/Ipv6Public2Subnet2/DefaultRoute6": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPub2Subnet2DefaultRoute60CFFE651" + "data": "DualStackVpcIpv6Public2Subnet2DefaultRoute630FBEA19" } ], - "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/Subnet": [ + "/DualStackVpc/DualStackVpc/Ipv6Private1Subnet1/Subnet": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPriv1Subnet1Subnet6E77EDE7" + "data": "DualStackVpcIpv6Private1Subnet1Subnet2C527D85" } ], - "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/RouteTable": [ + "/DualStackVpc/DualStackVpc/Ipv6Private1Subnet1/RouteTable": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11" + "data": "DualStackVpcIpv6Private1Subnet1RouteTable9CCA0D06" } ], - "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/RouteTableAssociation": [ + "/DualStackVpc/DualStackVpc/Ipv6Private1Subnet1/RouteTableAssociation": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPriv1Subnet1RouteTableAssociation9D52852A" + "data": "DualStackVpcIpv6Private1Subnet1RouteTableAssociation0B2158D5" } ], - "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/DefaultRoute": [ + "/DualStackVpc/DualStackVpc/Ipv6Private1Subnet1/DefaultRoute": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPriv1Subnet1DefaultRouteEC60BBD4" + "data": "DualStackVpcIpv6Private1Subnet1DefaultRoute0F84EAB9" } ], - "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/DefaultRoute6": [ + "/DualStackVpc/DualStackVpc/Ipv6Private1Subnet1/DefaultRoute6": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPriv1Subnet1DefaultRoute65CC26492" + "data": "DualStackVpcIpv6Private1Subnet1DefaultRoute6D3F9C454" } ], - "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/Nat64": [ + "/DualStackVpc/DualStackVpc/Ipv6Private1Subnet1/Nat64": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPriv1Subnet1Nat649573F0A7" + "data": "DualStackVpcIpv6Private1Subnet1Nat649907016D" } ], - "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/Subnet": [ + "/DualStackVpc/DualStackVpc/Ipv6Private1Subnet2/Subnet": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPriv1Subnet2SubnetBC65773F" + "data": "DualStackVpcIpv6Private1Subnet2Subnet0F013554" } ], - "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/RouteTable": [ + "/DualStackVpc/DualStackVpc/Ipv6Private1Subnet2/RouteTable": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPriv1Subnet2RouteTableC8DC5D06" + "data": "DualStackVpcIpv6Private1Subnet2RouteTable18BA0241" } ], - "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/RouteTableAssociation": [ + "/DualStackVpc/DualStackVpc/Ipv6Private1Subnet2/RouteTableAssociation": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPriv1Subnet2RouteTableAssociation0F224C80" + "data": "DualStackVpcIpv6Private1Subnet2RouteTableAssociationC5571008" } ], - "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/DefaultRoute": [ + "/DualStackVpc/DualStackVpc/Ipv6Private1Subnet2/DefaultRoute": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPriv1Subnet2DefaultRouteD01D04E1" + "data": "DualStackVpcIpv6Private1Subnet2DefaultRouteBADA4821" } ], - "/DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/DefaultRoute6": [ + "/DualStackVpc/DualStackVpc/Ipv6Private1Subnet2/DefaultRoute6": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcPriv1Subnet2DefaultRoute63F529AA9" + "data": "DualStackVpcIpv6Private1Subnet2DefaultRoute68619C7A8" } ], - "/DualStackVpc/DualStackProtocolVpc/IGW": [ + "/DualStackVpc/DualStackVpc/IGW": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcIGW0F74732B" + "data": "DualStackVpcIGW08AC356D" } ], - "/DualStackVpc/DualStackProtocolVpc/VPCGW": [ + "/DualStackVpc/DualStackVpc/VPCGW": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcVPCGWADE48B7D" + "data": "DualStackVpcVPCGW7803C9BB" } ], - "/DualStackVpc/DualStackProtocolVpc/EIGW6": [ + "/DualStackVpc/DualStackVpc/EIGW6": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcEIGW64BED696A" + "data": "DualStackVpcEIGW64639A9F2" } ], - "/DualStackVpc/DualStackProtocolVpc/RestrictDefaultSecurityGroupCustomResource/Default": [ + "/DualStackVpc/DualStackVpc/RestrictDefaultSecurityGroupCustomResource/Default": [ { "type": "aws:cdk:logicalId", - "data": "DualStackProtocolVpcRestrictDefaultSecurityGroupCustomResource592699C8" + "data": "DualStackVpcRestrictDefaultSecurityGroupCustomResource5AA79B96" } ], "/DualStackVpc/Custom::VpcRestrictDefaultSGCustomResourceProvider/Role": [ @@ -301,7 +301,10 @@ "/DualStackVpc/Lambda_with_IPv6_VPC/SecurityGroup/Resource": [ { "type": "aws:cdk:logicalId", - "data": "LambdawithIPv6VPCSecurityGroup1BC5651B" + "data": "LambdawithIPv6VPCSecurityGroup1BC5651B", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_REPLACE" + ] } ], "/DualStackVpc/Lambda_with_IPv6_VPC/Resource": [ @@ -321,6 +324,375 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion" } + ], + "DualStackProtocolVpc85768F2C": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpc85768F2C", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcipv6cidr449C49CD": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcipv6cidr449C49CD", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub1Subnet1Subnet74CA4B8A": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet1Subnet74CA4B8A", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub1Subnet1RouteTable67D20294": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet1RouteTable67D20294", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub1Subnet1RouteTableAssociation047F9491": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet1RouteTableAssociation047F9491", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub1Subnet1DefaultRoute95ED74BD": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet1DefaultRoute95ED74BD", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub1Subnet1DefaultRoute6C01F89FD": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet1DefaultRoute6C01F89FD", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub1Subnet1EIP12EDF1FD": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet1EIP12EDF1FD", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub1Subnet1NATGateway241D9A98": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet1NATGateway241D9A98", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub1Subnet2Subnet8B1A85E2": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet2Subnet8B1A85E2", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub1Subnet2RouteTable63549985": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet2RouteTable63549985", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub1Subnet2RouteTableAssociation12736FE3": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet2RouteTableAssociation12736FE3", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub1Subnet2DefaultRoute293C2941": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet2DefaultRoute293C2941", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub1Subnet2DefaultRoute67E6A8DC8": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet2DefaultRoute67E6A8DC8", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub1Subnet2EIP149FAFF5": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet2EIP149FAFF5", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub1Subnet2NATGateway64DC713B": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub1Subnet2NATGateway64DC713B", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub2Subnet1Subnet483B9827": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet1Subnet483B9827", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub2Subnet1RouteTable95379836": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet1RouteTable95379836", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub2Subnet1RouteTableAssociation24FAAE7F": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet1RouteTableAssociation24FAAE7F", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub2Subnet1DefaultRouteB99615CA": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet1DefaultRouteB99615CA", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub2Subnet1DefaultRoute670D1366F": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet1DefaultRoute670D1366F", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub2Subnet2SubnetCA5962A0": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet2SubnetCA5962A0", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub2Subnet2RouteTable1300ACEE": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet2RouteTable1300ACEE", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub2Subnet2RouteTableAssociation7E1F73B5": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet2RouteTableAssociation7E1F73B5", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub2Subnet2DefaultRoute6B98C127": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet2DefaultRoute6B98C127", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPub2Subnet2DefaultRoute60CFFE651": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPub2Subnet2DefaultRoute60CFFE651", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPriv1Subnet1Subnet6E77EDE7": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet1Subnet6E77EDE7", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPriv1Subnet1RouteTableAssociation9D52852A": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet1RouteTableAssociation9D52852A", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPriv1Subnet1DefaultRouteEC60BBD4": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet1DefaultRouteEC60BBD4", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPriv1Subnet1DefaultRoute65CC26492": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet1DefaultRoute65CC26492", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPriv1Subnet1Nat649573F0A7": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet1Nat649573F0A7", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPriv1Subnet2SubnetBC65773F": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet2SubnetBC65773F", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPriv1Subnet2RouteTableC8DC5D06": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet2RouteTableC8DC5D06", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPriv1Subnet2RouteTableAssociation0F224C80": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet2RouteTableAssociation0F224C80", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPriv1Subnet2DefaultRouteD01D04E1": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet2DefaultRouteD01D04E1", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcPriv1Subnet2DefaultRoute63F529AA9": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcPriv1Subnet2DefaultRoute63F529AA9", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcIGW0F74732B": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcIGW0F74732B", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcVPCGWADE48B7D": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcVPCGWADE48B7D", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcEIGW64BED696A": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcEIGW64BED696A", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "DualStackProtocolVpcRestrictDefaultSecurityGroupCustomResource592699C8": [ + { + "type": "aws:cdk:logicalId", + "data": "DualStackProtocolVpcRestrictDefaultSecurityGroupCustomResource592699C8", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } ] }, "displayName": "DualStackVpc" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/tree.json index 09ccd9f90224c..28308dac0be67 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.js.snapshot/tree.json @@ -8,13 +8,13 @@ "id": "DualStackVpc", "path": "DualStackVpc", "children": { - "DualStackProtocolVpc": { - "id": "DualStackProtocolVpc", - "path": "DualStackVpc/DualStackProtocolVpc", + "DualStackVpc": { + "id": "DualStackVpc", + "path": "DualStackVpc/DualStackVpc", "children": { "Resource": { "id": "Resource", - "path": "DualStackVpc/DualStackProtocolVpc/Resource", + "path": "DualStackVpc/DualStackVpc/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPC", "aws:cdk:cloudformation:props": { @@ -25,7 +25,7 @@ "tags": [ { "key": "Name", - "value": "DualStackVpc/DualStackProtocolVpc" + "value": "DualStackVpc/DualStackVpc" } ] } @@ -37,13 +37,13 @@ }, "ipv6cidr": { "id": "ipv6cidr", - "path": "DualStackVpc/DualStackProtocolVpc/ipv6cidr", + "path": "DualStackVpc/DualStackVpc/ipv6cidr", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCCidrBlock", "aws:cdk:cloudformation:props": { "amazonProvidedIpv6CidrBlock": true, "vpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } } }, @@ -52,13 +52,13 @@ "version": "0.0.0" } }, - "Pub1Subnet1": { - "id": "Pub1Subnet1", - "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1", + "Ipv6Public1Subnet1": { + "id": "Ipv6Public1Subnet1", + "path": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet1", "children": { "Subnet": { "id": "Subnet", - "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/Subnet", + "path": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet1/Subnet", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { @@ -82,7 +82,7 @@ 0, { "Fn::GetAtt": [ - "DualStackProtocolVpc85768F2C", + "DualStackVpcE812233C", "Ipv6CidrBlocks" ] } @@ -98,7 +98,7 @@ "tags": [ { "key": "aws-cdk:subnet-name", - "value": "Pub1" + "value": "Ipv6Public1" }, { "key": "aws-cdk:subnet-type", @@ -106,11 +106,11 @@ }, { "key": "Name", - "value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1" + "value": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet1" } ], "vpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } } }, @@ -121,7 +121,7 @@ }, "Acl": { "id": "Acl", - "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/Acl", + "path": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet1/Acl", "constructInfo": { "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" @@ -129,18 +129,18 @@ }, "RouteTable": { "id": "RouteTable", - "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/RouteTable", + "path": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet1/RouteTable", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { "tags": [ { "key": "Name", - "value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1" + "value": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet1" } ], "vpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } } }, @@ -151,15 +151,15 @@ }, "RouteTableAssociation": { "id": "RouteTableAssociation", - "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/RouteTableAssociation", + "path": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet1/RouteTableAssociation", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", "aws:cdk:cloudformation:props": { "routeTableId": { - "Ref": "DualStackProtocolVpcPub1Subnet1RouteTable67D20294" + "Ref": "DualStackVpcIpv6Public1Subnet1RouteTable73C65370" }, "subnetId": { - "Ref": "DualStackProtocolVpcPub1Subnet1Subnet74CA4B8A" + "Ref": "DualStackVpcIpv6Public1Subnet1SubnetC431B310" } } }, @@ -170,16 +170,16 @@ }, "DefaultRoute": { "id": "DefaultRoute", - "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/DefaultRoute", + "path": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet1/DefaultRoute", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { - "Ref": "DualStackProtocolVpcIGW0F74732B" + "Ref": "DualStackVpcIGW08AC356D" }, "routeTableId": { - "Ref": "DualStackProtocolVpcPub1Subnet1RouteTable67D20294" + "Ref": "DualStackVpcIpv6Public1Subnet1RouteTable73C65370" } } }, @@ -190,16 +190,16 @@ }, "DefaultRoute6": { "id": "DefaultRoute6", - "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/DefaultRoute6", + "path": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet1/DefaultRoute6", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { "destinationIpv6CidrBlock": "::/0", "gatewayId": { - "Ref": "DualStackProtocolVpcIGW0F74732B" + "Ref": "DualStackVpcIGW08AC356D" }, "routeTableId": { - "Ref": "DualStackProtocolVpcPub1Subnet1RouteTable67D20294" + "Ref": "DualStackVpcIpv6Public1Subnet1RouteTable73C65370" } } }, @@ -210,7 +210,7 @@ }, "EIP": { "id": "EIP", - "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/EIP", + "path": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet1/EIP", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::EIP", "aws:cdk:cloudformation:props": { @@ -218,7 +218,7 @@ "tags": [ { "key": "Name", - "value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1" + "value": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet1" } ] } @@ -230,23 +230,23 @@ }, "NATGateway": { "id": "NATGateway", - "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1/NATGateway", + "path": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet1/NATGateway", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { "allocationId": { "Fn::GetAtt": [ - "DualStackProtocolVpcPub1Subnet1EIP12EDF1FD", + "DualStackVpcIpv6Public1Subnet1EIP4E17F847", "AllocationId" ] }, "subnetId": { - "Ref": "DualStackProtocolVpcPub1Subnet1Subnet74CA4B8A" + "Ref": "DualStackVpcIpv6Public1Subnet1SubnetC431B310" }, "tags": [ { "key": "Name", - "value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet1" + "value": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet1" } ] } @@ -262,13 +262,13 @@ "version": "0.0.0" } }, - "Pub1Subnet2": { - "id": "Pub1Subnet2", - "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2", + "Ipv6Public1Subnet2": { + "id": "Ipv6Public1Subnet2", + "path": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet2", "children": { "Subnet": { "id": "Subnet", - "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/Subnet", + "path": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet2/Subnet", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { @@ -292,7 +292,7 @@ 0, { "Fn::GetAtt": [ - "DualStackProtocolVpc85768F2C", + "DualStackVpcE812233C", "Ipv6CidrBlocks" ] } @@ -308,7 +308,7 @@ "tags": [ { "key": "aws-cdk:subnet-name", - "value": "Pub1" + "value": "Ipv6Public1" }, { "key": "aws-cdk:subnet-type", @@ -316,11 +316,11 @@ }, { "key": "Name", - "value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2" + "value": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet2" } ], "vpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } } }, @@ -331,7 +331,7 @@ }, "Acl": { "id": "Acl", - "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/Acl", + "path": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet2/Acl", "constructInfo": { "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" @@ -339,18 +339,18 @@ }, "RouteTable": { "id": "RouteTable", - "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/RouteTable", + "path": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet2/RouteTable", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { "tags": [ { "key": "Name", - "value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2" + "value": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet2" } ], "vpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } } }, @@ -361,15 +361,15 @@ }, "RouteTableAssociation": { "id": "RouteTableAssociation", - "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/RouteTableAssociation", + "path": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet2/RouteTableAssociation", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", "aws:cdk:cloudformation:props": { "routeTableId": { - "Ref": "DualStackProtocolVpcPub1Subnet2RouteTable63549985" + "Ref": "DualStackVpcIpv6Public1Subnet2RouteTableC119E52D" }, "subnetId": { - "Ref": "DualStackProtocolVpcPub1Subnet2Subnet8B1A85E2" + "Ref": "DualStackVpcIpv6Public1Subnet2Subnet9515A153" } } }, @@ -380,16 +380,16 @@ }, "DefaultRoute": { "id": "DefaultRoute", - "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/DefaultRoute", + "path": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet2/DefaultRoute", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { - "Ref": "DualStackProtocolVpcIGW0F74732B" + "Ref": "DualStackVpcIGW08AC356D" }, "routeTableId": { - "Ref": "DualStackProtocolVpcPub1Subnet2RouteTable63549985" + "Ref": "DualStackVpcIpv6Public1Subnet2RouteTableC119E52D" } } }, @@ -400,16 +400,16 @@ }, "DefaultRoute6": { "id": "DefaultRoute6", - "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/DefaultRoute6", + "path": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet2/DefaultRoute6", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { "destinationIpv6CidrBlock": "::/0", "gatewayId": { - "Ref": "DualStackProtocolVpcIGW0F74732B" + "Ref": "DualStackVpcIGW08AC356D" }, "routeTableId": { - "Ref": "DualStackProtocolVpcPub1Subnet2RouteTable63549985" + "Ref": "DualStackVpcIpv6Public1Subnet2RouteTableC119E52D" } } }, @@ -420,7 +420,7 @@ }, "EIP": { "id": "EIP", - "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/EIP", + "path": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet2/EIP", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::EIP", "aws:cdk:cloudformation:props": { @@ -428,7 +428,7 @@ "tags": [ { "key": "Name", - "value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2" + "value": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet2" } ] } @@ -440,23 +440,23 @@ }, "NATGateway": { "id": "NATGateway", - "path": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2/NATGateway", + "path": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet2/NATGateway", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway", "aws:cdk:cloudformation:props": { "allocationId": { "Fn::GetAtt": [ - "DualStackProtocolVpcPub1Subnet2EIP149FAFF5", + "DualStackVpcIpv6Public1Subnet2EIP45B7D0DE", "AllocationId" ] }, "subnetId": { - "Ref": "DualStackProtocolVpcPub1Subnet2Subnet8B1A85E2" + "Ref": "DualStackVpcIpv6Public1Subnet2Subnet9515A153" }, "tags": [ { "key": "Name", - "value": "DualStackVpc/DualStackProtocolVpc/Pub1Subnet2" + "value": "DualStackVpc/DualStackVpc/Ipv6Public1Subnet2" } ] } @@ -472,13 +472,13 @@ "version": "0.0.0" } }, - "Pub2Subnet1": { - "id": "Pub2Subnet1", - "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1", + "Ipv6Public2Subnet1": { + "id": "Ipv6Public2Subnet1", + "path": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet1", "children": { "Subnet": { "id": "Subnet", - "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/Subnet", + "path": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet1/Subnet", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { @@ -502,7 +502,7 @@ 0, { "Fn::GetAtt": [ - "DualStackProtocolVpc85768F2C", + "DualStackVpcE812233C", "Ipv6CidrBlocks" ] } @@ -518,7 +518,7 @@ "tags": [ { "key": "aws-cdk:subnet-name", - "value": "Pub2" + "value": "Ipv6Public2" }, { "key": "aws-cdk:subnet-type", @@ -526,11 +526,11 @@ }, { "key": "Name", - "value": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1" + "value": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet1" } ], "vpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } } }, @@ -541,7 +541,7 @@ }, "Acl": { "id": "Acl", - "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/Acl", + "path": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet1/Acl", "constructInfo": { "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" @@ -549,18 +549,18 @@ }, "RouteTable": { "id": "RouteTable", - "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/RouteTable", + "path": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet1/RouteTable", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { "tags": [ { "key": "Name", - "value": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1" + "value": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet1" } ], "vpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } } }, @@ -571,15 +571,15 @@ }, "RouteTableAssociation": { "id": "RouteTableAssociation", - "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/RouteTableAssociation", + "path": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet1/RouteTableAssociation", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", "aws:cdk:cloudformation:props": { "routeTableId": { - "Ref": "DualStackProtocolVpcPub2Subnet1RouteTable95379836" + "Ref": "DualStackVpcIpv6Public2Subnet1RouteTableAFB7D529" }, "subnetId": { - "Ref": "DualStackProtocolVpcPub2Subnet1Subnet483B9827" + "Ref": "DualStackVpcIpv6Public2Subnet1Subnet314CDCFE" } } }, @@ -590,16 +590,16 @@ }, "DefaultRoute": { "id": "DefaultRoute", - "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/DefaultRoute", + "path": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet1/DefaultRoute", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { - "Ref": "DualStackProtocolVpcIGW0F74732B" + "Ref": "DualStackVpcIGW08AC356D" }, "routeTableId": { - "Ref": "DualStackProtocolVpcPub2Subnet1RouteTable95379836" + "Ref": "DualStackVpcIpv6Public2Subnet1RouteTableAFB7D529" } } }, @@ -610,16 +610,16 @@ }, "DefaultRoute6": { "id": "DefaultRoute6", - "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet1/DefaultRoute6", + "path": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet1/DefaultRoute6", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { "destinationIpv6CidrBlock": "::/0", "gatewayId": { - "Ref": "DualStackProtocolVpcIGW0F74732B" + "Ref": "DualStackVpcIGW08AC356D" }, "routeTableId": { - "Ref": "DualStackProtocolVpcPub2Subnet1RouteTable95379836" + "Ref": "DualStackVpcIpv6Public2Subnet1RouteTableAFB7D529" } } }, @@ -634,13 +634,13 @@ "version": "0.0.0" } }, - "Pub2Subnet2": { - "id": "Pub2Subnet2", - "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2", + "Ipv6Public2Subnet2": { + "id": "Ipv6Public2Subnet2", + "path": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet2", "children": { "Subnet": { "id": "Subnet", - "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/Subnet", + "path": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet2/Subnet", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { @@ -664,7 +664,7 @@ 0, { "Fn::GetAtt": [ - "DualStackProtocolVpc85768F2C", + "DualStackVpcE812233C", "Ipv6CidrBlocks" ] } @@ -680,7 +680,7 @@ "tags": [ { "key": "aws-cdk:subnet-name", - "value": "Pub2" + "value": "Ipv6Public2" }, { "key": "aws-cdk:subnet-type", @@ -688,11 +688,11 @@ }, { "key": "Name", - "value": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2" + "value": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet2" } ], "vpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } } }, @@ -703,7 +703,7 @@ }, "Acl": { "id": "Acl", - "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/Acl", + "path": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet2/Acl", "constructInfo": { "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" @@ -711,18 +711,18 @@ }, "RouteTable": { "id": "RouteTable", - "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/RouteTable", + "path": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet2/RouteTable", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { "tags": [ { "key": "Name", - "value": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2" + "value": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet2" } ], "vpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } } }, @@ -733,15 +733,15 @@ }, "RouteTableAssociation": { "id": "RouteTableAssociation", - "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/RouteTableAssociation", + "path": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet2/RouteTableAssociation", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", "aws:cdk:cloudformation:props": { "routeTableId": { - "Ref": "DualStackProtocolVpcPub2Subnet2RouteTable1300ACEE" + "Ref": "DualStackVpcIpv6Public2Subnet2RouteTable2D5742D9" }, "subnetId": { - "Ref": "DualStackProtocolVpcPub2Subnet2SubnetCA5962A0" + "Ref": "DualStackVpcIpv6Public2Subnet2Subnet509DD3CC" } } }, @@ -752,16 +752,16 @@ }, "DefaultRoute": { "id": "DefaultRoute", - "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/DefaultRoute", + "path": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet2/DefaultRoute", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { "destinationCidrBlock": "0.0.0.0/0", "gatewayId": { - "Ref": "DualStackProtocolVpcIGW0F74732B" + "Ref": "DualStackVpcIGW08AC356D" }, "routeTableId": { - "Ref": "DualStackProtocolVpcPub2Subnet2RouteTable1300ACEE" + "Ref": "DualStackVpcIpv6Public2Subnet2RouteTable2D5742D9" } } }, @@ -772,16 +772,16 @@ }, "DefaultRoute6": { "id": "DefaultRoute6", - "path": "DualStackVpc/DualStackProtocolVpc/Pub2Subnet2/DefaultRoute6", + "path": "DualStackVpc/DualStackVpc/Ipv6Public2Subnet2/DefaultRoute6", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { "destinationIpv6CidrBlock": "::/0", "gatewayId": { - "Ref": "DualStackProtocolVpcIGW0F74732B" + "Ref": "DualStackVpcIGW08AC356D" }, "routeTableId": { - "Ref": "DualStackProtocolVpcPub2Subnet2RouteTable1300ACEE" + "Ref": "DualStackVpcIpv6Public2Subnet2RouteTable2D5742D9" } } }, @@ -796,13 +796,13 @@ "version": "0.0.0" } }, - "Priv1Subnet1": { - "id": "Priv1Subnet1", - "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1", + "Ipv6Private1Subnet1": { + "id": "Ipv6Private1Subnet1", + "path": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet1", "children": { "Subnet": { "id": "Subnet", - "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/Subnet", + "path": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet1/Subnet", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { @@ -826,7 +826,7 @@ 0, { "Fn::GetAtt": [ - "DualStackProtocolVpc85768F2C", + "DualStackVpcE812233C", "Ipv6CidrBlocks" ] } @@ -842,7 +842,7 @@ "tags": [ { "key": "aws-cdk:subnet-name", - "value": "Priv1" + "value": "Ipv6Private1" }, { "key": "aws-cdk:subnet-type", @@ -850,11 +850,11 @@ }, { "key": "Name", - "value": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1" + "value": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet1" } ], "vpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } } }, @@ -865,7 +865,7 @@ }, "Acl": { "id": "Acl", - "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/Acl", + "path": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet1/Acl", "constructInfo": { "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" @@ -873,18 +873,18 @@ }, "RouteTable": { "id": "RouteTable", - "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/RouteTable", + "path": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet1/RouteTable", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { "tags": [ { "key": "Name", - "value": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1" + "value": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet1" } ], "vpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } } }, @@ -895,15 +895,15 @@ }, "RouteTableAssociation": { "id": "RouteTableAssociation", - "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/RouteTableAssociation", + "path": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet1/RouteTableAssociation", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", "aws:cdk:cloudformation:props": { "routeTableId": { - "Ref": "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11" + "Ref": "DualStackVpcIpv6Private1Subnet1RouteTable9CCA0D06" }, "subnetId": { - "Ref": "DualStackProtocolVpcPriv1Subnet1Subnet6E77EDE7" + "Ref": "DualStackVpcIpv6Private1Subnet1Subnet2C527D85" } } }, @@ -914,16 +914,16 @@ }, "DefaultRoute": { "id": "DefaultRoute", - "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/DefaultRoute", + "path": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet1/DefaultRoute", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { - "Ref": "DualStackProtocolVpcPub1Subnet1NATGateway241D9A98" + "Ref": "DualStackVpcIpv6Public1Subnet1NATGateway7D2A0F59" }, "routeTableId": { - "Ref": "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11" + "Ref": "DualStackVpcIpv6Private1Subnet1RouteTable9CCA0D06" } } }, @@ -934,16 +934,16 @@ }, "DefaultRoute6": { "id": "DefaultRoute6", - "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/DefaultRoute6", + "path": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet1/DefaultRoute6", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { "destinationIpv6CidrBlock": "::/0", "egressOnlyInternetGatewayId": { - "Ref": "DualStackProtocolVpcEIGW64BED696A" + "Ref": "DualStackVpcEIGW64639A9F2" }, "routeTableId": { - "Ref": "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11" + "Ref": "DualStackVpcIpv6Private1Subnet1RouteTable9CCA0D06" } } }, @@ -954,16 +954,16 @@ }, "Nat64": { "id": "Nat64", - "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet1/Nat64", + "path": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet1/Nat64", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { "destinationIpv6CidrBlock": "64:ff9b::/96", "natGatewayId": { - "Ref": "DualStackProtocolVpcPub1Subnet1NATGateway241D9A98" + "Ref": "DualStackVpcIpv6Public1Subnet1NATGateway7D2A0F59" }, "routeTableId": { - "Ref": "DualStackProtocolVpcPriv1Subnet1RouteTableB9D9FD11" + "Ref": "DualStackVpcIpv6Private1Subnet1RouteTable9CCA0D06" } } }, @@ -978,13 +978,13 @@ "version": "0.0.0" } }, - "Priv1Subnet2": { - "id": "Priv1Subnet2", - "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2", + "Ipv6Private1Subnet2": { + "id": "Ipv6Private1Subnet2", + "path": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet2", "children": { "Subnet": { "id": "Subnet", - "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/Subnet", + "path": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet2/Subnet", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Subnet", "aws:cdk:cloudformation:props": { @@ -1008,7 +1008,7 @@ 0, { "Fn::GetAtt": [ - "DualStackProtocolVpc85768F2C", + "DualStackVpcE812233C", "Ipv6CidrBlocks" ] } @@ -1024,7 +1024,7 @@ "tags": [ { "key": "aws-cdk:subnet-name", - "value": "Priv1" + "value": "Ipv6Private1" }, { "key": "aws-cdk:subnet-type", @@ -1032,11 +1032,11 @@ }, { "key": "Name", - "value": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2" + "value": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet2" } ], "vpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } } }, @@ -1047,7 +1047,7 @@ }, "Acl": { "id": "Acl", - "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/Acl", + "path": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet2/Acl", "constructInfo": { "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" @@ -1055,18 +1055,18 @@ }, "RouteTable": { "id": "RouteTable", - "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/RouteTable", + "path": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet2/RouteTable", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable", "aws:cdk:cloudformation:props": { "tags": [ { "key": "Name", - "value": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2" + "value": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet2" } ], "vpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } } }, @@ -1077,15 +1077,15 @@ }, "RouteTableAssociation": { "id": "RouteTableAssociation", - "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/RouteTableAssociation", + "path": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet2/RouteTableAssociation", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation", "aws:cdk:cloudformation:props": { "routeTableId": { - "Ref": "DualStackProtocolVpcPriv1Subnet2RouteTableC8DC5D06" + "Ref": "DualStackVpcIpv6Private1Subnet2RouteTable18BA0241" }, "subnetId": { - "Ref": "DualStackProtocolVpcPriv1Subnet2SubnetBC65773F" + "Ref": "DualStackVpcIpv6Private1Subnet2Subnet0F013554" } } }, @@ -1096,16 +1096,16 @@ }, "DefaultRoute": { "id": "DefaultRoute", - "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/DefaultRoute", + "path": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet2/DefaultRoute", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { "destinationCidrBlock": "0.0.0.0/0", "natGatewayId": { - "Ref": "DualStackProtocolVpcPub1Subnet2NATGateway64DC713B" + "Ref": "DualStackVpcIpv6Public1Subnet2NATGateway76C3674B" }, "routeTableId": { - "Ref": "DualStackProtocolVpcPriv1Subnet2RouteTableC8DC5D06" + "Ref": "DualStackVpcIpv6Private1Subnet2RouteTable18BA0241" } } }, @@ -1116,16 +1116,16 @@ }, "DefaultRoute6": { "id": "DefaultRoute6", - "path": "DualStackVpc/DualStackProtocolVpc/Priv1Subnet2/DefaultRoute6", + "path": "DualStackVpc/DualStackVpc/Ipv6Private1Subnet2/DefaultRoute6", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::Route", "aws:cdk:cloudformation:props": { "destinationIpv6CidrBlock": "::/0", "egressOnlyInternetGatewayId": { - "Ref": "DualStackProtocolVpcEIGW64BED696A" + "Ref": "DualStackVpcEIGW64639A9F2" }, "routeTableId": { - "Ref": "DualStackProtocolVpcPriv1Subnet2RouteTableC8DC5D06" + "Ref": "DualStackVpcIpv6Private1Subnet2RouteTable18BA0241" } } }, @@ -1142,14 +1142,14 @@ }, "IGW": { "id": "IGW", - "path": "DualStackVpc/DualStackProtocolVpc/IGW", + "path": "DualStackVpc/DualStackVpc/IGW", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::InternetGateway", "aws:cdk:cloudformation:props": { "tags": [ { "key": "Name", - "value": "DualStackVpc/DualStackProtocolVpc" + "value": "DualStackVpc/DualStackVpc" } ] } @@ -1161,15 +1161,15 @@ }, "VPCGW": { "id": "VPCGW", - "path": "DualStackVpc/DualStackProtocolVpc/VPCGW", + "path": "DualStackVpc/DualStackVpc/VPCGW", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCGatewayAttachment", "aws:cdk:cloudformation:props": { "internetGatewayId": { - "Ref": "DualStackProtocolVpcIGW0F74732B" + "Ref": "DualStackVpcIGW08AC356D" }, "vpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } } }, @@ -1180,12 +1180,12 @@ }, "EIGW6": { "id": "EIGW6", - "path": "DualStackVpc/DualStackProtocolVpc/EIGW6", + "path": "DualStackVpc/DualStackVpc/EIGW6", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::EgressOnlyInternetGateway", "aws:cdk:cloudformation:props": { "vpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } } }, @@ -1196,11 +1196,11 @@ }, "RestrictDefaultSecurityGroupCustomResource": { "id": "RestrictDefaultSecurityGroupCustomResource", - "path": "DualStackVpc/DualStackProtocolVpc/RestrictDefaultSecurityGroupCustomResource", + "path": "DualStackVpc/DualStackVpc/RestrictDefaultSecurityGroupCustomResource", "children": { "Default": { "id": "Default", - "path": "DualStackVpc/DualStackProtocolVpc/RestrictDefaultSecurityGroupCustomResource/Default", + "path": "DualStackVpc/DualStackVpc/RestrictDefaultSecurityGroupCustomResource/Default", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -1344,7 +1344,7 @@ } ], "vpcId": { - "Ref": "DualStackProtocolVpc85768F2C" + "Ref": "DualStackVpcE812233C" } } }, @@ -1380,10 +1380,10 @@ "ipv6AllowedForDualStack": true, "subnetIds": [ { - "Ref": "DualStackProtocolVpcPriv1Subnet1Subnet6E77EDE7" + "Ref": "DualStackVpcIpv6Private1Subnet1Subnet2C527D85" }, { - "Ref": "DualStackProtocolVpcPriv1Subnet2SubnetBC65773F" + "Ref": "DualStackVpcIpv6Private1Subnet2Subnet0F013554" } ], "securityGroupIds": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.ts index 0f080ebd90004..58b627f907f0b 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.ts +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda_with_dualStack_vpc.ts @@ -7,19 +7,19 @@ const app = new App(); const stack = new Stack(app, 'DualStackVpc'); const natProvider = ec2.NatProvider.gateway(); -const vpc = new ec2.Vpc(stack, 'DualStackProtocolVpc', { +const vpc = new ec2.Vpc(stack, 'DualStackVpc', { ipProtocol: ec2.IpProtocol.DUAL_STACK, subnetConfiguration: [ { - name: 'Pub1', + name: 'Ipv6Public1', subnetType: ec2.SubnetType.PUBLIC, }, { - name: 'Pub2', + name: 'Ipv6Public2', subnetType: ec2.SubnetType.PUBLIC, }, { - name: 'Priv1', + name: 'Ipv6Private1', subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS, }, ], diff --git a/packages/aws-cdk-lib/aws-lambda/README.md b/packages/aws-cdk-lib/aws-lambda/README.md index 26252c4ce2d8c..5a876c8ae68eb 100644 --- a/packages/aws-cdk-lib/aws-lambda/README.md +++ b/packages/aws-cdk-lib/aws-lambda/README.md @@ -1087,19 +1087,19 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'; const natProvider = ec2.NatProvider.gateway(); // create dual-stack VPC -const vpc = new ec2.Vpc(this, 'DualStackProtocolVpc', { +const vpc = new ec2.Vpc(this, 'DualStackVpc', { ipProtocol: ec2.IpProtocol.DUAL_STACK, subnetConfiguration: [ { - name: 'Pub1', + name: 'Ipv6Public1', subnetType: ec2.SubnetType.PUBLIC, }, { - name: 'Pub2', + name: 'Ipv6Public2', subnetType: ec2.SubnetType.PUBLIC, }, { - name: 'Priv1', + name: 'Ipv6Private1', subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS, }, ], diff --git a/packages/aws-cdk-lib/aws-lambda/lib/function.ts b/packages/aws-cdk-lib/aws-lambda/lib/function.ts index 31680a10e1031..dba046f447513 100644 --- a/packages/aws-cdk-lib/aws-lambda/lib/function.ts +++ b/packages/aws-cdk-lib/aws-lambda/lib/function.ts @@ -1495,7 +1495,7 @@ Environment variables can be marked for removal when used in Lambda@Edge by sett } } - const ipv6AllowedForDualStack = props.ipv6AllowedForDualStack ?? false; + const ipv6AllowedForDualStack = props.ipv6AllowedForDualStack; const allowPublicSubnet = props.allowPublicSubnet ?? false; const selectedSubnets = props.vpc.selectSubnets(props.vpcSubnets); const publicSubnetIds = new Set(props.vpc.publicSubnets.map(s => s.subnetId)); @@ -1510,7 +1510,7 @@ Environment variables can be marked for removal when used in Lambda@Edge by sett // List can't be empty here, if we got this far you intended to put your Lambda // in subnets. We're going to guarantee that we get the nice error message by // making VpcNetwork do the selection again. - if (props.ipv6AllowedForDualStack) { + if (props.ipv6AllowedForDualStack !== undefined) { return { ipv6AllowedForDualStack: ipv6AllowedForDualStack, subnetIds: selectedSubnets.subnetIds, diff --git a/packages/aws-cdk-lib/aws-lambda/test/function.test.ts b/packages/aws-cdk-lib/aws-lambda/test/function.test.ts index d656bfb2bd964..f4c5382707641 100644 --- a/packages/aws-cdk-lib/aws-lambda/test/function.test.ts +++ b/packages/aws-cdk-lib/aws-lambda/test/function.test.ts @@ -3884,6 +3884,48 @@ describe('VPC configuration', () => { }, }); }); + + test('set ipv6AllowedForDualStack to False with VPC', () => { + const stack = new cdk.Stack(); + const vpc = new ec2.Vpc(stack, 'Vpc', { + maxAzs: 3, + natGateways: 1, + }); + const securityGroup = new ec2.SecurityGroup(stack, 'LambdaSG', { + vpc, + allowAllOutbound: true, + allowAllIpv6Outbound: true, + }); + new lambda.Function(stack, 'MyLambda', { + vpc: vpc, + code: new lambda.InlineCode('foo'), + handler: 'index.handler', + runtime: lambda.Runtime.PYTHON_3_9, + ipv6AllowedForDualStack: false, + securityGroups: [securityGroup], + vpcSubnets: { subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS }, + }); + + Template.fromStack(stack).hasResource('AWS::Lambda::Function', { + Properties: + { + Code: { ZipFile: 'foo' }, + Handler: 'index.handler', + Runtime: 'python3.9', + Role: { 'Fn::GetAtt': ['MyLambdaServiceRole4539ECB6', 'Arn'] }, + VpcConfig: { + Ipv6AllowedForDualStack: false, + SecurityGroupIds: [ + { 'Fn::GetAtt': ['LambdaSG9DBFCFB7', 'GroupId'] }, + ], + SubnetIds: [ + { Ref: 'VpcPrivateSubnet1Subnet536B997A' }, + { Ref: 'VpcPrivateSubnet2Subnet3788AAA1' }, + ], + }, + }, + }); + }); }); function newTestLambda(scope: constructs.Construct) {