diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/awslint.json b/packages/@aws-cdk/aws-vpcv2-alpha/awslint.json index d1e81e5ca9b5d..fff10c5f9b000 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/awslint.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/awslint.json @@ -1,6 +1,7 @@ { "exclude": [ "from-method:@aws-cdk/aws-vpcv2-alpha.VpcV2", - "attribute-tag:@aws-cdk/aws-vpcv2-alpha.RouteTable.routeTableId" + "attribute-tag:@aws-cdk/aws-vpcv2-alpha.RouteTable.routeTableId", + "from-method:@aws-cdk/aws-vpcv2-alpha.SubnetV2" ] } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/jest.config.js b/packages/@aws-cdk/aws-vpcv2-alpha/jest.config.js index 8c38942789199..4995208baf512 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/jest.config.js +++ b/packages/@aws-cdk/aws-vpcv2-alpha/jest.config.js @@ -4,7 +4,7 @@ module.exports = { coverageThreshold: { global: { statements: 75, - branches: 64, + branches: 63, }, }, };; diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/lib/subnet-v2.ts b/packages/@aws-cdk/aws-vpcv2-alpha/lib/subnet-v2.ts index 1c687b7d29bfb..a71277d441cbc 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/lib/subnet-v2.ts +++ b/packages/@aws-cdk/aws-vpcv2-alpha/lib/subnet-v2.ts @@ -85,6 +85,18 @@ export interface SubnetV2Props { } +/** + * Interface with additional properties for SubnetV2 + */ +export interface ISubnetV2 extends ISubnet { + + /** + * The IPv6 CIDR block for this subnet + */ + readonly ipv6CidrBlock?: string; + +} + /** * The SubnetV2 class represents a subnet within a VPC (Virtual Private Cloud) in AWS. * It extends the Resource class and implements the ISubnet interface. @@ -96,7 +108,7 @@ export interface SubnetV2Props { * @resource AWS::EC2::Subnet * */ -export class SubnetV2 extends Resource implements ISubnet { +export class SubnetV2 extends Resource implements ISubnetV2 { /** * The Availability Zone the subnet is located in @@ -334,7 +346,7 @@ function checkCidrRanges(vpc: IVpcV2, cidrRange: string) { function validateOverlappingCidrRanges(vpc: IVpcV2, ipv4CidrBlock: string): boolean { - let allSubnets: ISubnet[]; + let allSubnets: ISubnetV2[]; try { allSubnets = vpc.selectSubnets().subnets; } catch (e) { @@ -373,7 +385,7 @@ function validateOverlappingCidrRanges(vpc: IVpcV2, ipv4CidrBlock: string): bool */ function validateOverlappingCidrRangesipv6(vpc: IVpcV2, ipv6CidrBlock: string): boolean { - let allSubnets: ISubnet[]; + let allSubnets: ISubnetV2[]; try { allSubnets = vpc.selectSubnets().subnets; } catch (e) { diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/lib/vpc-v2.ts b/packages/@aws-cdk/aws-vpcv2-alpha/lib/vpc-v2.ts index b8ca3cbaa44df..07c6a757f585e 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/lib/vpc-v2.ts +++ b/packages/@aws-cdk/aws-vpcv2-alpha/lib/vpc-v2.ts @@ -3,7 +3,7 @@ import { Arn, CfnResource, Lazy, Names } from 'aws-cdk-lib/core'; import { Construct, DependencyGroup, IDependable } from 'constructs'; import { IpamOptions, IIpamPool } from './ipam'; import { VpcV2Base } from './vpc-v2-base'; -import { md5hash } from 'aws-cdk-lib/core/lib/helpers-internal'; + /** * IpAddress options to define VPC V2 */ @@ -12,29 +12,29 @@ export class IpAddresses { /** * An IPv4 CIDR Range */ - public static ipv4(ipv4Cidr: string): IIpAddresses { - return new ipv4CidrAllocation(ipv4Cidr); + public static ipv4(ipv4Cidr: string, cidrBlockName?: string): IIpAddresses { + return new ipv4CidrAllocation(ipv4Cidr, cidrBlockName); } /** * An Ipv4 Ipam Pool */ - public static ipv4Ipam(ipv4IpamOptions: IpamOptions): IIpAddresses { - return new IpamIpv4(ipv4IpamOptions); + public static ipv4Ipam(ipv4IpamOptions: IpamOptions, cidrBlockName?: string): IIpAddresses { + return new IpamIpv4(ipv4IpamOptions, cidrBlockName); } /** * An Ipv6 Ipam Pool */ - public static ipv6Ipam(ipv6IpamOptions: IpamOptions): IIpAddresses { - return new IpamIpv6(ipv6IpamOptions); + public static ipv6Ipam(ipv6IpamOptions: IpamOptions, cidrBlockName: string): IIpAddresses { + return new IpamIpv6(ipv6IpamOptions, cidrBlockName); } /** * Amazon Provided Ipv6 range */ - public static amazonProvidedIpv6() : IIpAddresses { - return new AmazonProvided(); + public static amazonProvidedIpv6(cidrBlockName: string) : IIpAddresses { + return new AmazonProvided(cidrBlockName); } } @@ -95,6 +95,13 @@ export interface VpcCidrOptions { * @default - No dependency */ readonly dependencies?: CfnResource[]; + + /** + * Required to set Secondary cidr block resource name + * in order to generate unique logical id for the resource. + * @default : no name for primary addresses + */ + readonly cidrBlockName?: string; } /** @@ -289,13 +296,12 @@ export class VpcV2 extends VpcV2Base { if (props.secondaryAddressBlocks) { const secondaryAddressBlocks: IIpAddresses[] = props.secondaryAddressBlocks; - let ipCount = 0; for (const secondaryAddressBlock of secondaryAddressBlocks) { - //Counter to generate a random string for input to hash function - ipCount+=1; - const hash = pathHash('Secondary'+ipCount); const secondaryVpcOptions: VpcCidrOptions = secondaryAddressBlock.allocateVpcCidr(); + if (!secondaryVpcOptions.cidrBlockName) { + throw new Error('Cidr Block Name is required to create secondary IP address'); + } if (secondaryVpcOptions.amazonProvided || secondaryVpcOptions.ipv6IpamPool) { this.useIpv6 = true; @@ -307,7 +313,7 @@ export class VpcV2 extends VpcV2Base { throw new Error('CIDR block should be in the same RFC 1918 range in the VPC'); } } - const cfnVpcCidrBlock = new CfnVPCCidrBlock(this, `SecondaryIp${hash}`, { + const cfnVpcCidrBlock = new CfnVPCCidrBlock(this, secondaryVpcOptions.cidrBlockName, { vpcId: this.vpcId, cidrBlock: secondaryVpcOptions.ipv4CidrBlock, ipv4IpamPoolId: secondaryVpcOptions.ipv4IpamPool?.ipamPoolId, @@ -353,8 +359,7 @@ export class VpcV2 extends VpcV2Base { */ class ipv4CidrAllocation implements IIpAddresses { - constructor(private readonly cidrBlock: string) { - + constructor(private readonly cidrBlock: string, private readonly cidrBlockName?: string) { } /** @@ -363,6 +368,7 @@ class ipv4CidrAllocation implements IIpAddresses { allocateVpcCidr(): VpcCidrOptions { return { ipv4CidrBlock: this.cidrBlock, + cidrBlockName: this.cidrBlockName, }; } } @@ -379,11 +385,12 @@ class AmazonProvided implements IIpAddresses { * Amazon will automatically assign an IPv6 CIDR range from its pool of available addresses. */ - constructor() {}; + constructor(private readonly cidrBlockName?: string) {}; allocateVpcCidr(): VpcCidrOptions { return { amazonProvided: true, + cidrBlockName: this.cidrBlockName, }; } @@ -395,7 +402,7 @@ class AmazonProvided implements IIpAddresses { */ class IpamIpv6 implements IIpAddresses { - constructor(private readonly props: IpamOptions) { + constructor(private readonly props: IpamOptions, private readonly cidrBlockName?: string) { } allocateVpcCidr(): VpcCidrOptions { @@ -403,6 +410,7 @@ class IpamIpv6 implements IIpAddresses { ipv6NetmaskLength: this.props.netmaskLength, ipv6IpamPool: this.props.ipamPool, dependencies: this.props.ipamPool?.ipamCidrs.map(c => c as CfnResource), + cidrBlockName: this.cidrBlockName, }; } } @@ -413,13 +421,14 @@ class IpamIpv6 implements IIpAddresses { */ class IpamIpv4 implements IIpAddresses { - constructor(private readonly props: IpamOptions) { + constructor(private readonly props: IpamOptions, private readonly cidrBlockName?: string) { } allocateVpcCidr(): VpcCidrOptions { return { ipv4NetmaskLength: this.props.netmaskLength, ipv4IpamPool: this.props.ipamPool, + cidrBlockName: this.cidrBlockName, }; } } @@ -464,24 +473,4 @@ function validateIpv4address(cidr1?: string, cidr2?: string): boolean { return (ip1.octet1 === 10 && ip2.octet1 === 10) || (ip1.octet1 === 192 && ip1.octet2 === 168 && ip2.octet1 === 192 && ip2.octet2 === 168) || (ip1.octet1 === 172 && ip1.octet2 === 16 && ip2.octet1 === 172 && ip2.octet2 === 16); // CIDR ranges belong to same private IP address ranges -} - -/** - * Take a hash of the given path. - * - * The hash is limited in size. - */ -function pathHash(path: string): string { - const md5 = md5hash(path); - return md5.slice(0, 4).toUpperCase(); -} - -// function generateRandomString(length: number): string { -// const pattern = /[a-zA-Z0-9]/; -// const characters = pattern.source.replace(/\\/g, '');; -// let result = ''; -// for (let i = 0; i < length; i++) { -// result += characters.charAt(Math.floor(Math.random() * characters.length)); -// } -// return result; -// } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-alpha.assets.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-alpha.assets.json index b1c154d25bf7a..f61a2717f93a6 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-alpha.assets.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-alpha.assets.json @@ -1,7 +1,7 @@ { "version": "36.0.0", "files": { - "1cff7bb2bc10e1d285a197bf63b03909c3c767c2f9db33c95f4abb57ddff746d": { + "b3d06cef480a17aaf78379d18a13893141f2d689a23bcbbcf34b284e77752b0f": { "source": { "path": "aws-cdk-routev2-alpha.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "1cff7bb2bc10e1d285a197bf63b03909c3c767c2f9db33c95f4abb57ddff746d.json", + "objectKey": "b3d06cef480a17aaf78379d18a13893141f2d689a23bcbbcf34b284e77752b0f.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-alpha.template.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-alpha.template.json index 7fd6a2bd2b4dd..140f9ebf102e0 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-alpha.template.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-alpha.template.json @@ -9,7 +9,7 @@ "InstanceTenancy": "default" } }, - "defaultSecondaryIp47C3A8F96659": { + "defaultAmazonIpv6C7A4D665": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -57,7 +57,7 @@ } }, "DependsOn": [ - "defaultSecondaryIp47C3A8F96659" + "defaultAmazonIpv6C7A4D665" ] }, "defaultSubnetRouteTableAssociationF1D85D29": { @@ -74,7 +74,7 @@ } }, "DependsOn": [ - "defaultSecondaryIp47C3A8F96659" + "defaultAmazonIpv6C7A4D665" ] } }, diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-dynamodbendpoint-alpha.assets.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-dynamodbendpoint-alpha.assets.json index eab7936460126..b9734dc366438 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-dynamodbendpoint-alpha.assets.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-dynamodbendpoint-alpha.assets.json @@ -1,7 +1,7 @@ { "version": "36.0.0", "files": { - "2ebb15857908b26b86850f9dbdedfc9b3e1ad8a446d65fa07db0eadb1cac100d": { + "7711ae87a96bcf4e738e5904b6071f21ac59ee14247c420b0bf33d20a87348a3": { "source": { "path": "aws-cdk-routev2-dynamodbendpoint-alpha.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "2ebb15857908b26b86850f9dbdedfc9b3e1ad8a446d65fa07db0eadb1cac100d.json", + "objectKey": "7711ae87a96bcf4e738e5904b6071f21ac59ee14247c420b0bf33d20a87348a3.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-dynamodbendpoint-alpha.template.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-dynamodbendpoint-alpha.template.json index 63e0d044de308..1fc8a4ff1bbe3 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-dynamodbendpoint-alpha.template.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-dynamodbendpoint-alpha.template.json @@ -9,7 +9,7 @@ "InstanceTenancy": "default" } }, - "dynamodbSecondaryIp47C3D307DC85": { + "dynamodbAmazonIpv6698EF571": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -57,7 +57,7 @@ } }, "DependsOn": [ - "dynamodbSecondaryIp47C3D307DC85" + "dynamodbAmazonIpv6698EF571" ] }, "dynamodbSubnetRouteTableAssociationC38B30F3": { @@ -74,7 +74,7 @@ } }, "DependsOn": [ - "dynamodbSecondaryIp47C3D307DC85" + "dynamodbAmazonIpv6698EF571" ] }, "testDynamoEndpoint03D5BDE5": { diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-egressonlyigw-alpha.assets.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-egressonlyigw-alpha.assets.json index d93f682a8718c..b27c0c57931d5 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-egressonlyigw-alpha.assets.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-egressonlyigw-alpha.assets.json @@ -1,7 +1,7 @@ { "version": "36.0.0", "files": { - "d9069f1c66888bb1b4b224635e4485aa16511b21c719c6cbdfa24c59f9effda0": { + "6cd56bb964ed1f90f0206d705f085aef381173834b50d5ba372fa2185156d51d": { "source": { "path": "aws-cdk-routev2-egressonlyigw-alpha.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "d9069f1c66888bb1b4b224635e4485aa16511b21c719c6cbdfa24c59f9effda0.json", + "objectKey": "6cd56bb964ed1f90f0206d705f085aef381173834b50d5ba372fa2185156d51d.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-egressonlyigw-alpha.template.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-egressonlyigw-alpha.template.json index 76868f90f2422..1c4d9adad8e08 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-egressonlyigw-alpha.template.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-egressonlyigw-alpha.template.json @@ -9,7 +9,7 @@ "InstanceTenancy": "default" } }, - "eigwSecondaryIp47C35F6F8767": { + "eigwAmazonIpv69E78211F": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -46,7 +46,7 @@ } }, "DependsOn": [ - "eigwSecondaryIp47C35F6F8767" + "eigwAmazonIpv69E78211F" ] }, "eigwSubnetRouteTableAssociation887F4A97": { @@ -63,7 +63,7 @@ } }, "DependsOn": [ - "eigwSecondaryIp47C35F6F8767" + "eigwAmazonIpv69E78211F" ] }, "testEOIGWEIGW54CCAD37": { diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-igw-alpha.assets.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-igw-alpha.assets.json index 28630a7bb1173..677f15417b1ed 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-igw-alpha.assets.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-igw-alpha.assets.json @@ -1,7 +1,7 @@ { "version": "36.0.0", "files": { - "bacfeac57f60b09a218eca7392feb994e3af35e4be594ca1288badf12410e247": { + "44c69eec973961e184209d04e6e45c230320a2f7a110f0275431dc0587273038": { "source": { "path": "aws-cdk-routev2-igw-alpha.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "bacfeac57f60b09a218eca7392feb994e3af35e4be594ca1288badf12410e247.json", + "objectKey": "44c69eec973961e184209d04e6e45c230320a2f7a110f0275431dc0587273038.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-igw-alpha.template.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-igw-alpha.template.json index 171f21b17f3a5..1ddb6c3cc40d9 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-igw-alpha.template.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-igw-alpha.template.json @@ -9,7 +9,7 @@ "InstanceTenancy": "default" } }, - "igwSecondaryIp47C345C8DF7D": { + "igwAmazonIpv64026617C": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -57,7 +57,7 @@ } }, "DependsOn": [ - "igwSecondaryIp47C345C8DF7D" + "igwAmazonIpv64026617C" ] }, "igwSubnetRouteTableAssociationA48C27F3": { @@ -74,7 +74,7 @@ } }, "DependsOn": [ - "igwSecondaryIp47C345C8DF7D" + "igwAmazonIpv64026617C" ] }, "testIGW8D947AF2": { diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-networkif-alpha.assets.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-networkif-alpha.assets.json index a3a7b727611ac..733952daae63f 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-networkif-alpha.assets.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-networkif-alpha.assets.json @@ -1,7 +1,7 @@ { "version": "36.0.0", "files": { - "3d6df82cdbe221494115aea9c998726f407e8f103d3bb0ac1cf1c3b3eeaa82a3": { + "087e3b456bae228983dc7a31eea1570bfeccfd6b4f163b7e10a2af07dc31291f": { "source": { "path": "aws-cdk-routev2-networkif-alpha.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "3d6df82cdbe221494115aea9c998726f407e8f103d3bb0ac1cf1c3b3eeaa82a3.json", + "objectKey": "087e3b456bae228983dc7a31eea1570bfeccfd6b4f163b7e10a2af07dc31291f.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-networkif-alpha.template.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-networkif-alpha.template.json index fa07e0d0d9be0..d796497fc5388 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-networkif-alpha.template.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-networkif-alpha.template.json @@ -9,7 +9,7 @@ "InstanceTenancy": "default" } }, - "nifSecondaryIp47C3A7BC99CF": { + "nifAmazonIpv6CF4BF46B": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -57,7 +57,7 @@ } }, "DependsOn": [ - "nifSecondaryIp47C3A7BC99CF" + "nifAmazonIpv6CF4BF46B" ] }, "nifSubnetRouteTableAssociationE4036B9F": { @@ -74,7 +74,7 @@ } }, "DependsOn": [ - "nifSecondaryIp47C3A7BC99CF" + "nifAmazonIpv6CF4BF46B" ] } }, diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-privatenatgw-alpha.assets.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-privatenatgw-alpha.assets.json index 91f5cc172be38..591ec9e8d3066 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-privatenatgw-alpha.assets.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-privatenatgw-alpha.assets.json @@ -1,7 +1,7 @@ { "version": "36.0.0", "files": { - "963fa2692d9bfeb3595a93fafa4b8e22fb193f53b0a75cb9752fcd700a1fd7b1": { + "89c945d2b4cb2aa79cca0e52ea8fa68849a586495b0a27b7de229ae44b3c5239": { "source": { "path": "aws-cdk-routev2-privatenatgw-alpha.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "963fa2692d9bfeb3595a93fafa4b8e22fb193f53b0a75cb9752fcd700a1fd7b1.json", + "objectKey": "89c945d2b4cb2aa79cca0e52ea8fa68849a586495b0a27b7de229ae44b3c5239.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-privatenatgw-alpha.template.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-privatenatgw-alpha.template.json index 79c67d6fdd495..f2ed7e0d44c03 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-privatenatgw-alpha.template.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-privatenatgw-alpha.template.json @@ -9,7 +9,7 @@ "InstanceTenancy": "default" } }, - "natgwprivSecondaryIp47C30543A584": { + "natgwprivAmazonIpv6915E8E4F": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -57,7 +57,7 @@ } }, "DependsOn": [ - "natgwprivSecondaryIp47C30543A584" + "natgwprivAmazonIpv6915E8E4F" ] }, "natgwprivSubnetRouteTableAssociation9E115869": { @@ -74,7 +74,7 @@ } }, "DependsOn": [ - "natgwprivSecondaryIp47C30543A584" + "natgwprivAmazonIpv6915E8E4F" ] }, "testNATgwNATGateway1533420D": { diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-publicnatgw-alpha.assets.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-publicnatgw-alpha.assets.json index 91957fc3287d7..29398ffe76faa 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-publicnatgw-alpha.assets.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-publicnatgw-alpha.assets.json @@ -1,7 +1,7 @@ { "version": "36.0.0", "files": { - "c2d5a78ed2546b0ff5a150742236b70cda2cb5c258fe5c96bbe74401bb6ac679": { + "6592172436ea6af85dd73663ffd81cc1342c29574aa00f4dacf5179cf3054441": { "source": { "path": "aws-cdk-routev2-publicnatgw-alpha.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "c2d5a78ed2546b0ff5a150742236b70cda2cb5c258fe5c96bbe74401bb6ac679.json", + "objectKey": "6592172436ea6af85dd73663ffd81cc1342c29574aa00f4dacf5179cf3054441.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-publicnatgw-alpha.template.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-publicnatgw-alpha.template.json index 270723f84fd05..5f80cf56a0aa5 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-publicnatgw-alpha.template.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-publicnatgw-alpha.template.json @@ -9,7 +9,7 @@ "InstanceTenancy": "default" } }, - "natgwpubSecondaryIp47C3D6600620": { + "natgwpubAmazonIpv625B947F8": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -57,7 +57,7 @@ } }, "DependsOn": [ - "natgwpubSecondaryIp47C3D6600620" + "natgwpubAmazonIpv625B947F8" ] }, "natgwpubSubnetRouteTableAssociation019CE26A": { @@ -74,7 +74,7 @@ } }, "DependsOn": [ - "natgwpubSecondaryIp47C3D6600620" + "natgwpubAmazonIpv625B947F8" ] }, "testNATgwIGW6AC97E9A": { diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-virtualprivategw-alpha.assets.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-virtualprivategw-alpha.assets.json index 408b55a7302cd..601d17d534bb8 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-virtualprivategw-alpha.assets.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-virtualprivategw-alpha.assets.json @@ -1,7 +1,7 @@ { "version": "36.0.0", "files": { - "d85cba6c0d8658e6a4a10fac2983d38103f90b023325d158df109e69a39a2907": { + "2318541485e9424ef1bba0f0bb0e0e91e2759dc53597436fb250a8605e5e0107": { "source": { "path": "aws-cdk-routev2-virtualprivategw-alpha.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "d85cba6c0d8658e6a4a10fac2983d38103f90b023325d158df109e69a39a2907.json", + "objectKey": "2318541485e9424ef1bba0f0bb0e0e91e2759dc53597436fb250a8605e5e0107.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-virtualprivategw-alpha.template.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-virtualprivategw-alpha.template.json index 2fec9ac90b0e3..f96743310fabe 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-virtualprivategw-alpha.template.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-virtualprivategw-alpha.template.json @@ -9,7 +9,7 @@ "InstanceTenancy": "default" } }, - "vpgwSecondaryIp47C3513204E5": { + "vpgwAmazonIpv6C872FF1E": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -57,7 +57,7 @@ } }, "DependsOn": [ - "vpgwSecondaryIp47C3513204E5" + "vpgwAmazonIpv6C872FF1E" ] }, "vpgwSubnetRouteTableAssociation49921F90": { @@ -74,7 +74,7 @@ } }, "DependsOn": [ - "vpgwSecondaryIp47C3513204E5" + "vpgwAmazonIpv6C872FF1E" ] }, "testVPGWIGW816C7C4F": { diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-vpcpeerconnection-alpha.assets.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-vpcpeerconnection-alpha.assets.json index 4e1502743ab68..fa96e660e9d19 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-vpcpeerconnection-alpha.assets.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-vpcpeerconnection-alpha.assets.json @@ -1,7 +1,7 @@ { "version": "36.0.0", "files": { - "68ff5eee32682360957b1ce12813b2accd132272c336dde9ee4306d092fa51a3": { + "7b04eb9c84a61a91a957fceb96a85b38336f8b5999d1c0b5b972cd191926c473": { "source": { "path": "aws-cdk-routev2-vpcpeerconnection-alpha.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "68ff5eee32682360957b1ce12813b2accd132272c336dde9ee4306d092fa51a3.json", + "objectKey": "7b04eb9c84a61a91a957fceb96a85b38336f8b5999d1c0b5b972cd191926c473.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-vpcpeerconnection-alpha.template.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-vpcpeerconnection-alpha.template.json index e618cb816e0ca..804f7b179ac91 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-vpcpeerconnection-alpha.template.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/aws-cdk-routev2-vpcpeerconnection-alpha.template.json @@ -9,7 +9,7 @@ "InstanceTenancy": "default" } }, - "vpcpcSecondaryIp47C3DD1C0245": { + "vpcpcAmazonIpv66504EEB2": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -57,7 +57,7 @@ } }, "DependsOn": [ - "vpcpcSecondaryIp47C3DD1C0245" + "vpcpcAmazonIpv66504EEB2" ] }, "vpcpcSubnetRouteTableAssociation8531BF5C": { @@ -74,7 +74,7 @@ } }, "DependsOn": [ - "vpcpcSecondaryIp47C3DD1C0245" + "vpcpcAmazonIpv66504EEB2" ] } }, diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/manifest.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/manifest.json index a2fa29be325dc..2dec0815f28b0 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.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}/1cff7bb2bc10e1d285a197bf63b03909c3c767c2f9db33c95f4abb57ddff746d.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/b3d06cef480a17aaf78379d18a13893141f2d689a23bcbbcf34b284e77752b0f.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -41,10 +41,10 @@ "data": "defaultC974F9E3" } ], - "/aws-cdk-routev2-alpha/default/SecondaryIp47C3": [ + "/aws-cdk-routev2-alpha/default/AmazonIpv6": [ { "type": "aws:cdk:logicalId", - "data": "defaultSecondaryIp47C3A8F96659" + "data": "defaultAmazonIpv6C7A4D665" } ], "/aws-cdk-routev2-alpha/TestRoottable/RouteTable": [ @@ -97,7 +97,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}/d9069f1c66888bb1b4b224635e4485aa16511b21c719c6cbdfa24c59f9effda0.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6cd56bb964ed1f90f0206d705f085aef381173834b50d5ba372fa2185156d51d.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -120,10 +120,10 @@ "data": "eigwC0F094EF" } ], - "/aws-cdk-routev2-egressonlyigw-alpha/eigw/SecondaryIp47C3": [ + "/aws-cdk-routev2-egressonlyigw-alpha/eigw/AmazonIpv6": [ { "type": "aws:cdk:logicalId", - "data": "eigwSecondaryIp47C35F6F8767" + "data": "eigwAmazonIpv69E78211F" } ], "/aws-cdk-routev2-egressonlyigw-alpha/TestRoottable/RouteTable": [ @@ -188,7 +188,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}/bacfeac57f60b09a218eca7392feb994e3af35e4be594ca1288badf12410e247.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/44c69eec973961e184209d04e6e45c230320a2f7a110f0275431dc0587273038.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -211,10 +211,10 @@ "data": "igw127F1970" } ], - "/aws-cdk-routev2-igw-alpha/igw/SecondaryIp47C3": [ + "/aws-cdk-routev2-igw-alpha/igw/AmazonIpv6": [ { "type": "aws:cdk:logicalId", - "data": "igwSecondaryIp47C345C8DF7D" + "data": "igwAmazonIpv64026617C" } ], "/aws-cdk-routev2-igw-alpha/TestRoottable/RouteTable": [ @@ -285,7 +285,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}/d85cba6c0d8658e6a4a10fac2983d38103f90b023325d158df109e69a39a2907.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/2318541485e9424ef1bba0f0bb0e0e91e2759dc53597436fb250a8605e5e0107.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -308,10 +308,10 @@ "data": "vpgw2AB64B6B" } ], - "/aws-cdk-routev2-virtualprivategw-alpha/vpgw/SecondaryIp47C3": [ + "/aws-cdk-routev2-virtualprivategw-alpha/vpgw/AmazonIpv6": [ { "type": "aws:cdk:logicalId", - "data": "vpgwSecondaryIp47C3513204E5" + "data": "vpgwAmazonIpv6C872FF1E" } ], "/aws-cdk-routev2-virtualprivategw-alpha/TestRoottable/RouteTable": [ @@ -382,7 +382,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}/c2d5a78ed2546b0ff5a150742236b70cda2cb5c258fe5c96bbe74401bb6ac679.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6592172436ea6af85dd73663ffd81cc1342c29574aa00f4dacf5179cf3054441.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -405,10 +405,10 @@ "data": "natgwpub2FB85986" } ], - "/aws-cdk-routev2-publicnatgw-alpha/natgw_pub/SecondaryIp47C3": [ + "/aws-cdk-routev2-publicnatgw-alpha/natgw_pub/AmazonIpv6": [ { "type": "aws:cdk:logicalId", - "data": "natgwpubSecondaryIp47C3D6600620" + "data": "natgwpubAmazonIpv625B947F8" } ], "/aws-cdk-routev2-publicnatgw-alpha/TestRoottable/RouteTable": [ @@ -497,7 +497,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}/963fa2692d9bfeb3595a93fafa4b8e22fb193f53b0a75cb9752fcd700a1fd7b1.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/89c945d2b4cb2aa79cca0e52ea8fa68849a586495b0a27b7de229ae44b3c5239.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -520,10 +520,10 @@ "data": "natgwpriv081A7D93" } ], - "/aws-cdk-routev2-privatenatgw-alpha/natgw_priv/SecondaryIp47C3": [ + "/aws-cdk-routev2-privatenatgw-alpha/natgw_priv/AmazonIpv6": [ { "type": "aws:cdk:logicalId", - "data": "natgwprivSecondaryIp47C30543A584" + "data": "natgwprivAmazonIpv6915E8E4F" } ], "/aws-cdk-routev2-privatenatgw-alpha/TestRoottable/RouteTable": [ @@ -588,7 +588,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}/3d6df82cdbe221494115aea9c998726f407e8f103d3bb0ac1cf1c3b3eeaa82a3.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/087e3b456bae228983dc7a31eea1570bfeccfd6b4f163b7e10a2af07dc31291f.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -611,10 +611,10 @@ "data": "nif44200315" } ], - "/aws-cdk-routev2-networkif-alpha/nif/SecondaryIp47C3": [ + "/aws-cdk-routev2-networkif-alpha/nif/AmazonIpv6": [ { "type": "aws:cdk:logicalId", - "data": "nifSecondaryIp47C3A7BC99CF" + "data": "nifAmazonIpv6CF4BF46B" } ], "/aws-cdk-routev2-networkif-alpha/TestRoottable/RouteTable": [ @@ -667,7 +667,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}/68ff5eee32682360957b1ce12813b2accd132272c336dde9ee4306d092fa51a3.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/7b04eb9c84a61a91a957fceb96a85b38336f8b5999d1c0b5b972cd191926c473.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -690,10 +690,10 @@ "data": "vpcpc6CAE1A04" } ], - "/aws-cdk-routev2-vpcpeerconnection-alpha/vpcpc/SecondaryIp47C3": [ + "/aws-cdk-routev2-vpcpeerconnection-alpha/vpcpc/AmazonIpv6": [ { "type": "aws:cdk:logicalId", - "data": "vpcpcSecondaryIp47C3DD1C0245" + "data": "vpcpcAmazonIpv66504EEB2" } ], "/aws-cdk-routev2-vpcpeerconnection-alpha/TestRoottable/RouteTable": [ @@ -746,7 +746,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}/2ebb15857908b26b86850f9dbdedfc9b3e1ad8a446d65fa07db0eadb1cac100d.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/7711ae87a96bcf4e738e5904b6071f21ac59ee14247c420b0bf33d20a87348a3.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -769,10 +769,10 @@ "data": "dynamodbC0A56799" } ], - "/aws-cdk-routev2-dynamodbendpoint-alpha/dynamodb/SecondaryIp47C3": [ + "/aws-cdk-routev2-dynamodbendpoint-alpha/dynamodb/AmazonIpv6": [ { "type": "aws:cdk:logicalId", - "data": "dynamodbSecondaryIp47C3D307DC85" + "data": "dynamodbAmazonIpv6698EF571" } ], "/aws-cdk-routev2-dynamodbendpoint-alpha/TestRoottable/RouteTable": [ @@ -811,10 +811,10 @@ "data": "CheckBootstrapVersion" } ], - "dynamodbSecondaryIp1747F9BD8": [ + "dynamodbSecondaryIp4EEF58BFBEFB": [ { "type": "aws:cdk:logicalId", - "data": "dynamodbSecondaryIp1747F9BD8", + "data": "dynamodbSecondaryIp4EEF58BFBEFB", "trace": [ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" ] diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/tree.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/tree.json index 974e092f9ec13..7adf7f1621505 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/tree.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.js.snapshot/tree.json @@ -29,9 +29,9 @@ "version": "0.0.0" } }, - "SecondaryIp47C3": { - "id": "SecondaryIp47C3", - "path": "aws-cdk-routev2-alpha/default/SecondaryIp47C3", + "AmazonIpv6": { + "id": "AmazonIpv6", + "path": "aws-cdk-routev2-alpha/default/AmazonIpv6", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCCidrBlock", "aws:cdk:cloudformation:props": { @@ -204,9 +204,9 @@ "version": "0.0.0" } }, - "SecondaryIp47C3": { - "id": "SecondaryIp47C3", - "path": "aws-cdk-routev2-egressonlyigw-alpha/eigw/SecondaryIp47C3", + "AmazonIpv6": { + "id": "AmazonIpv6", + "path": "aws-cdk-routev2-egressonlyigw-alpha/eigw/AmazonIpv6", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCCidrBlock", "aws:cdk:cloudformation:props": { @@ -434,9 +434,9 @@ "version": "0.0.0" } }, - "SecondaryIp47C3": { - "id": "SecondaryIp47C3", - "path": "aws-cdk-routev2-igw-alpha/igw/SecondaryIp47C3", + "AmazonIpv6": { + "id": "AmazonIpv6", + "path": "aws-cdk-routev2-igw-alpha/igw/AmazonIpv6", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCCidrBlock", "aws:cdk:cloudformation:props": { @@ -693,9 +693,9 @@ "version": "0.0.0" } }, - "SecondaryIp47C3": { - "id": "SecondaryIp47C3", - "path": "aws-cdk-routev2-virtualprivategw-alpha/vpgw/SecondaryIp47C3", + "AmazonIpv6": { + "id": "AmazonIpv6", + "path": "aws-cdk-routev2-virtualprivategw-alpha/vpgw/AmazonIpv6", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCCidrBlock", "aws:cdk:cloudformation:props": { @@ -954,9 +954,9 @@ "version": "0.0.0" } }, - "SecondaryIp47C3": { - "id": "SecondaryIp47C3", - "path": "aws-cdk-routev2-publicnatgw-alpha/natgw_pub/SecondaryIp47C3", + "AmazonIpv6": { + "id": "AmazonIpv6", + "path": "aws-cdk-routev2-publicnatgw-alpha/natgw_pub/AmazonIpv6", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCCidrBlock", "aws:cdk:cloudformation:props": { @@ -1301,9 +1301,9 @@ "version": "0.0.0" } }, - "SecondaryIp47C3": { - "id": "SecondaryIp47C3", - "path": "aws-cdk-routev2-privatenatgw-alpha/natgw_priv/SecondaryIp47C3", + "AmazonIpv6": { + "id": "AmazonIpv6", + "path": "aws-cdk-routev2-privatenatgw-alpha/natgw_priv/AmazonIpv6", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCCidrBlock", "aws:cdk:cloudformation:props": { @@ -1546,9 +1546,9 @@ "version": "0.0.0" } }, - "SecondaryIp47C3": { - "id": "SecondaryIp47C3", - "path": "aws-cdk-routev2-networkif-alpha/nif/SecondaryIp47C3", + "AmazonIpv6": { + "id": "AmazonIpv6", + "path": "aws-cdk-routev2-networkif-alpha/nif/AmazonIpv6", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCCidrBlock", "aws:cdk:cloudformation:props": { @@ -1721,9 +1721,9 @@ "version": "0.0.0" } }, - "SecondaryIp47C3": { - "id": "SecondaryIp47C3", - "path": "aws-cdk-routev2-vpcpeerconnection-alpha/vpcpc/SecondaryIp47C3", + "AmazonIpv6": { + "id": "AmazonIpv6", + "path": "aws-cdk-routev2-vpcpeerconnection-alpha/vpcpc/AmazonIpv6", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCCidrBlock", "aws:cdk:cloudformation:props": { @@ -1896,9 +1896,9 @@ "version": "0.0.0" } }, - "SecondaryIp47C3": { - "id": "SecondaryIp47C3", - "path": "aws-cdk-routev2-dynamodbendpoint-alpha/dynamodb/SecondaryIp47C3", + "AmazonIpv6": { + "id": "AmazonIpv6", + "path": "aws-cdk-routev2-dynamodbendpoint-alpha/dynamodb/AmazonIpv6", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCCidrBlock", "aws:cdk:cloudformation:props": { diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.ts b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.ts index 98ba6e90bc4d5..9da3998298e47 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.ts +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.route-v2.ts @@ -45,7 +45,7 @@ var routeTables: {[id: string]: RouteTable} = {}; for (const stackName in stacks) { const vpc = new vpc_v2.VpcV2(stacks[stackName], stackName, { primaryAddressBlock: vpc_v2.IpAddresses.ipv4('10.0.0.0/16'), - secondaryAddressBlocks: [vpc_v2.IpAddresses.amazonProvidedIpv6()], + secondaryAddressBlocks: [vpc_v2.IpAddresses.amazonProvidedIpv6('AmazonIpv6')], enableDnsHostnames: true, enableDnsSupport: true, }); diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.js.snapshot/aws-cdk-vpcv2-alpha-new.assets.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.js.snapshot/aws-cdk-vpcv2-alpha-new.assets.json index 358420c8e3b7a..21b01be95b3c6 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.js.snapshot/aws-cdk-vpcv2-alpha-new.assets.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.js.snapshot/aws-cdk-vpcv2-alpha-new.assets.json @@ -1,7 +1,7 @@ { "version": "36.0.0", "files": { - "db8dec9d0860eb3409a7631d94032f75c1b2e4d02d23a53213a2e943f9b077f4": { + "ccdbd85132bedf38aeb99e5b0c700f48494d3b7c344a96232f29b48a5279b6ef": { "source": { "path": "aws-cdk-vpcv2-alpha-new.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "db8dec9d0860eb3409a7631d94032f75c1b2e4d02d23a53213a2e943f9b077f4.json", + "objectKey": "ccdbd85132bedf38aeb99e5b0c700f48494d3b7c344a96232f29b48a5279b6ef.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.js.snapshot/aws-cdk-vpcv2-alpha-new.template.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.js.snapshot/aws-cdk-vpcv2-alpha-new.template.json index 3266eed369f39..575219310d27f 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.js.snapshot/aws-cdk-vpcv2-alpha-new.template.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.js.snapshot/aws-cdk-vpcv2-alpha-new.template.json @@ -41,7 +41,7 @@ "InstanceTenancy": "default" } }, - "VPCTestSecondaryIp47C3DC5611C4": { + "VPCTestIpv6IpamCidrD5C271DD": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "Ipv6IpamPoolId": { @@ -112,7 +112,7 @@ } }, "DependsOn": [ - "VPCTestSecondaryIp47C3DC5611C4" + "VPCTestIpv6IpamCidrD5C271DD" ] }, "testsbubnetRouteTableF40F025B": { @@ -126,7 +126,7 @@ } }, "DependsOn": [ - "VPCTestSecondaryIp47C3DC5611C4" + "VPCTestIpv6IpamCidrD5C271DD" ] }, "testsbubnetRouteTableAssociationD6D083FA": { @@ -140,7 +140,7 @@ } }, "DependsOn": [ - "VPCTestSecondaryIp47C3DC5611C4" + "VPCTestIpv6IpamCidrD5C271DD" ] }, "InstanceInstanceSecurityGroupF0E2D5BE": { diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.js.snapshot/manifest.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.js.snapshot/manifest.json index d9d463c5eb8b2..5979efcf9a0da 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.js.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.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}/db8dec9d0860eb3409a7631d94032f75c1b2e4d02d23a53213a2e943f9b077f4.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/ccdbd85132bedf38aeb99e5b0c700f48494d3b7c344a96232f29b48a5279b6ef.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -58,10 +58,10 @@ "data": "VPCTestFB735C86" } ], - "/aws-cdk-vpcv2-alpha-new/VPCTest/SecondaryIp47C3": [ + "/aws-cdk-vpcv2-alpha-new/VPCTest/Ipv6IpamCidr": [ { "type": "aws:cdk:logicalId", - "data": "VPCTestSecondaryIp47C3DC5611C4" + "data": "VPCTestIpv6IpamCidrD5C271DD" } ], "/aws-cdk-vpcv2-alpha-new/VPCTest/VpnGateway/Default": [ @@ -142,10 +142,10 @@ "data": "CheckBootstrapVersion" } ], - "VPCTestSecondaryIp1BB4FC62E": [ + "VPCTestSecondaryIp48408C993194": [ { "type": "aws:cdk:logicalId", - "data": "VPCTestSecondaryIp1BB4FC62E", + "data": "VPCTestSecondaryIp48408C993194", "trace": [ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" ] diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.js.snapshot/tree.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.js.snapshot/tree.json index 9407066144526..c1ff499051b89 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.js.snapshot/tree.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.js.snapshot/tree.json @@ -105,9 +105,9 @@ "version": "0.0.0" } }, - "SecondaryIp47C3": { - "id": "SecondaryIp47C3", - "path": "aws-cdk-vpcv2-alpha-new/VPCTest/SecondaryIp47C3", + "Ipv6IpamCidr": { + "id": "Ipv6IpamCidr", + "path": "aws-cdk-vpcv2-alpha-new/VPCTest/Ipv6IpamCidr", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCCidrBlock", "aws:cdk:cloudformation:props": { diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.ts b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.ts index 14312f1184483..eae6833695d45 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.ts +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.subnet-v2.ts @@ -41,7 +41,7 @@ const vpc = new vpc_v2.VpcV2(stack, 'VPCTest', { secondaryAddressBlocks: [vpc_v2.IpAddresses.ipv6Ipam({ ipamPool: pool2, netmaskLength: 56, - })], + }, 'Ipv6IpamCidr')], enableDnsHostnames: true, enableDnsSupport: true, }); diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.js.snapshot/aws-cdk-vpcv2-alpha.assets.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.js.snapshot/aws-cdk-vpcv2-alpha.assets.json index 6c330334d41d4..073423dd71829 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.js.snapshot/aws-cdk-vpcv2-alpha.assets.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.js.snapshot/aws-cdk-vpcv2-alpha.assets.json @@ -1,7 +1,7 @@ { "version": "36.0.0", "files": { - "87b8738b01f024f304ffe295884621f69e23d0070f2a86b6420e36ccab65e5e2": { + "6af0c32b7b4dcf4566eda1afa97ddb6dc00a4597f5633e0d826df8642bc069f4": { "source": { "path": "aws-cdk-vpcv2-alpha.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "87b8738b01f024f304ffe295884621f69e23d0070f2a86b6420e36ccab65e5e2.json", + "objectKey": "6af0c32b7b4dcf4566eda1afa97ddb6dc00a4597f5633e0d826df8642bc069f4.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.js.snapshot/aws-cdk-vpcv2-alpha.template.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.js.snapshot/aws-cdk-vpcv2-alpha.template.json index 341d341e7103d..e1962661d5118 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.js.snapshot/aws-cdk-vpcv2-alpha.template.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.js.snapshot/aws-cdk-vpcv2-alpha.template.json @@ -54,7 +54,7 @@ "InstanceTenancy": "default" } }, - "VPCintegtest1SecondaryIp47C313EA741A": { + "VPCintegtest1ipv4IpamCidr8105B4E4": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "Ipv4IpamPoolId": { @@ -72,7 +72,7 @@ } } }, - "VPCintegtest1SecondaryIp3C84D6CF0FF1": { + "VPCintegtest1AmazonProvidedE0445E5C": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -93,7 +93,7 @@ "InstanceTenancy": "default" } }, - "Vpcintegtest2SecondaryIp47C3B19EFDA1": { + "Vpcintegtest2Ipv6IpamCidrFF84EC2B": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "Ipv6IpamPoolId": { @@ -114,7 +114,7 @@ "IpamTestPublicPool0PublicPool0CidrC57CE00C" ] }, - "Vpcintegtest2SecondaryIp3C84B5D8E500": { + "Vpcintegtest2SecondaryAddress2A96C0AF8": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "CidrBlock": "10.2.0.0/16", @@ -126,7 +126,7 @@ } } }, - "Vpcintegtest2SecondaryIpA930968EA798": { + "Vpcintegtest2SecondaryAddress36FC60BBC": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "CidrBlock": "10.3.0.0/16", @@ -152,9 +152,9 @@ } }, "DependsOn": [ - "Vpcintegtest2SecondaryIp3C84B5D8E500", - "Vpcintegtest2SecondaryIp47C3B19EFDA1", - "Vpcintegtest2SecondaryIpA930968EA798" + "Vpcintegtest2Ipv6IpamCidrFF84EC2B", + "Vpcintegtest2SecondaryAddress2A96C0AF8", + "Vpcintegtest2SecondaryAddress36FC60BBC" ] }, "testsbubnetRouteTableF40F025B": { @@ -168,9 +168,9 @@ } }, "DependsOn": [ - "Vpcintegtest2SecondaryIp3C84B5D8E500", - "Vpcintegtest2SecondaryIp47C3B19EFDA1", - "Vpcintegtest2SecondaryIpA930968EA798" + "Vpcintegtest2Ipv6IpamCidrFF84EC2B", + "Vpcintegtest2SecondaryAddress2A96C0AF8", + "Vpcintegtest2SecondaryAddress36FC60BBC" ] }, "testsbubnetRouteTableAssociationD6D083FA": { @@ -184,9 +184,9 @@ } }, "DependsOn": [ - "Vpcintegtest2SecondaryIp3C84B5D8E500", - "Vpcintegtest2SecondaryIp47C3B19EFDA1", - "Vpcintegtest2SecondaryIpA930968EA798" + "Vpcintegtest2Ipv6IpamCidrFF84EC2B", + "Vpcintegtest2SecondaryAddress2A96C0AF8", + "Vpcintegtest2SecondaryAddress36FC60BBC" ] }, "testsubnetSubnetDD417829": { @@ -203,9 +203,9 @@ } }, "DependsOn": [ - "Vpcintegtest2SecondaryIp3C84B5D8E500", - "Vpcintegtest2SecondaryIp47C3B19EFDA1", - "Vpcintegtest2SecondaryIpA930968EA798" + "Vpcintegtest2Ipv6IpamCidrFF84EC2B", + "Vpcintegtest2SecondaryAddress2A96C0AF8", + "Vpcintegtest2SecondaryAddress36FC60BBC" ] }, "testsubnetRouteTable55223C61": { @@ -219,9 +219,9 @@ } }, "DependsOn": [ - "Vpcintegtest2SecondaryIp3C84B5D8E500", - "Vpcintegtest2SecondaryIp47C3B19EFDA1", - "Vpcintegtest2SecondaryIpA930968EA798" + "Vpcintegtest2Ipv6IpamCidrFF84EC2B", + "Vpcintegtest2SecondaryAddress2A96C0AF8", + "Vpcintegtest2SecondaryAddress36FC60BBC" ] }, "testsubnetRouteTableAssociationC106676D": { @@ -235,9 +235,9 @@ } }, "DependsOn": [ - "Vpcintegtest2SecondaryIp3C84B5D8E500", - "Vpcintegtest2SecondaryIp47C3B19EFDA1", - "Vpcintegtest2SecondaryIpA930968EA798" + "Vpcintegtest2Ipv6IpamCidrFF84EC2B", + "Vpcintegtest2SecondaryAddress2A96C0AF8", + "Vpcintegtest2SecondaryAddress36FC60BBC" ] }, "validateIpv6Subnet07BD40AE": { @@ -254,9 +254,9 @@ } }, "DependsOn": [ - "Vpcintegtest2SecondaryIp3C84B5D8E500", - "Vpcintegtest2SecondaryIp47C3B19EFDA1", - "Vpcintegtest2SecondaryIpA930968EA798" + "Vpcintegtest2Ipv6IpamCidrFF84EC2B", + "Vpcintegtest2SecondaryAddress2A96C0AF8", + "Vpcintegtest2SecondaryAddress36FC60BBC" ] }, "validateIpv6RouteTable10861B00": { @@ -270,9 +270,9 @@ } }, "DependsOn": [ - "Vpcintegtest2SecondaryIp3C84B5D8E500", - "Vpcintegtest2SecondaryIp47C3B19EFDA1", - "Vpcintegtest2SecondaryIpA930968EA798" + "Vpcintegtest2Ipv6IpamCidrFF84EC2B", + "Vpcintegtest2SecondaryAddress2A96C0AF8", + "Vpcintegtest2SecondaryAddress36FC60BBC" ] }, "validateIpv6RouteTableAssociationD6330457": { @@ -286,9 +286,9 @@ } }, "DependsOn": [ - "Vpcintegtest2SecondaryIp3C84B5D8E500", - "Vpcintegtest2SecondaryIp47C3B19EFDA1", - "Vpcintegtest2SecondaryIpA930968EA798" + "Vpcintegtest2Ipv6IpamCidrFF84EC2B", + "Vpcintegtest2SecondaryAddress2A96C0AF8", + "Vpcintegtest2SecondaryAddress36FC60BBC" ] } }, diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.js.snapshot/manifest.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.js.snapshot/manifest.json index f2b26b17c662f..bd084b1280480 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.js.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.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}/87b8738b01f024f304ffe295884621f69e23d0070f2a86b6420e36ccab65e5e2.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6af0c32b7b4dcf4566eda1afa97ddb6dc00a4597f5633e0d826df8642bc069f4.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -64,16 +64,16 @@ "data": "VPCintegtest1EBA1CB75" } ], - "/aws-cdk-vpcv2-alpha/VPC-integ-test-1/SecondaryIp47C3": [ + "/aws-cdk-vpcv2-alpha/VPC-integ-test-1/ipv4IpamCidr": [ { "type": "aws:cdk:logicalId", - "data": "VPCintegtest1SecondaryIp47C313EA741A" + "data": "VPCintegtest1ipv4IpamCidr8105B4E4" } ], - "/aws-cdk-vpcv2-alpha/VPC-integ-test-1/SecondaryIp3C84": [ + "/aws-cdk-vpcv2-alpha/VPC-integ-test-1/AmazonProvided": [ { "type": "aws:cdk:logicalId", - "data": "VPCintegtest1SecondaryIp3C84D6CF0FF1" + "data": "VPCintegtest1AmazonProvidedE0445E5C" } ], "/aws-cdk-vpcv2-alpha/Vpc-integ-test-2/Resource": [ @@ -82,22 +82,22 @@ "data": "Vpcintegtest20DAD8F9D" } ], - "/aws-cdk-vpcv2-alpha/Vpc-integ-test-2/SecondaryIp47C3": [ + "/aws-cdk-vpcv2-alpha/Vpc-integ-test-2/Ipv6IpamCidr": [ { "type": "aws:cdk:logicalId", - "data": "Vpcintegtest2SecondaryIp47C3B19EFDA1" + "data": "Vpcintegtest2Ipv6IpamCidrFF84EC2B" } ], - "/aws-cdk-vpcv2-alpha/Vpc-integ-test-2/SecondaryIp3C84": [ + "/aws-cdk-vpcv2-alpha/Vpc-integ-test-2/SecondaryAddress2": [ { "type": "aws:cdk:logicalId", - "data": "Vpcintegtest2SecondaryIp3C84B5D8E500" + "data": "Vpcintegtest2SecondaryAddress2A96C0AF8" } ], - "/aws-cdk-vpcv2-alpha/Vpc-integ-test-2/SecondaryIpA930": [ + "/aws-cdk-vpcv2-alpha/Vpc-integ-test-2/SecondaryAddress3": [ { "type": "aws:cdk:logicalId", - "data": "Vpcintegtest2SecondaryIpA930968EA798" + "data": "Vpcintegtest2SecondaryAddress36FC60BBC" } ], "/aws-cdk-vpcv2-alpha/testsbubnet/Subnet": [ @@ -166,46 +166,46 @@ "data": "CheckBootstrapVersion" } ], - "VPCintegtest1SecondaryIp435AC9D39D16": [ + "VPCintegtest1SecondaryIp684795D0A306": [ { "type": "aws:cdk:logicalId", - "data": "VPCintegtest1SecondaryIp435AC9D39D16", + "data": "VPCintegtest1SecondaryIp684795D0A306", "trace": [ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" ] } ], - "VPCintegtest1SecondaryIp297056C06FB9": [ + "VPCintegtest1SecondaryIp757851A2E166": [ { "type": "aws:cdk:logicalId", - "data": "VPCintegtest1SecondaryIp297056C06FB9", + "data": "VPCintegtest1SecondaryIp757851A2E166", "trace": [ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" ] } ], - "Vpcintegtest2SecondaryIp82662C67DA2B": [ + "Vpcintegtest2SecondaryIp4840275314DC": [ { "type": "aws:cdk:logicalId", - "data": "Vpcintegtest2SecondaryIp82662C67DA2B", + "data": "Vpcintegtest2SecondaryIp4840275314DC", "trace": [ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" ] } ], - "Vpcintegtest2SecondaryIp9CD8FBE8BBA9": [ + "Vpcintegtest2SecondaryIp58F23280A479": [ { "type": "aws:cdk:logicalId", - "data": "Vpcintegtest2SecondaryIp9CD8FBE8BBA9", + "data": "Vpcintegtest2SecondaryIp58F23280A479", "trace": [ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" ] } ], - "Vpcintegtest2SecondaryIpD49B95386374": [ + "Vpcintegtest2SecondaryIpD363CCF2FF57": [ { "type": "aws:cdk:logicalId", - "data": "Vpcintegtest2SecondaryIpD49B95386374", + "data": "Vpcintegtest2SecondaryIpD363CCF2FF57", "trace": [ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" ] diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.js.snapshot/tree.json b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.js.snapshot/tree.json index e26b4463b87f5..d8432677382f0 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.js.snapshot/tree.json +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.js.snapshot/tree.json @@ -136,9 +136,9 @@ "version": "0.0.0" } }, - "SecondaryIp47C3": { - "id": "SecondaryIp47C3", - "path": "aws-cdk-vpcv2-alpha/VPC-integ-test-1/SecondaryIp47C3", + "ipv4IpamCidr": { + "id": "ipv4IpamCidr", + "path": "aws-cdk-vpcv2-alpha/VPC-integ-test-1/ipv4IpamCidr", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCCidrBlock", "aws:cdk:cloudformation:props": { @@ -162,9 +162,9 @@ "version": "0.0.0" } }, - "SecondaryIp3C84": { - "id": "SecondaryIp3C84", - "path": "aws-cdk-vpcv2-alpha/VPC-integ-test-1/SecondaryIp3C84", + "AmazonProvided": { + "id": "AmazonProvided", + "path": "aws-cdk-vpcv2-alpha/VPC-integ-test-1/AmazonProvided", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCCidrBlock", "aws:cdk:cloudformation:props": { @@ -209,9 +209,9 @@ "version": "0.0.0" } }, - "SecondaryIp47C3": { - "id": "SecondaryIp47C3", - "path": "aws-cdk-vpcv2-alpha/Vpc-integ-test-2/SecondaryIp47C3", + "Ipv6IpamCidr": { + "id": "Ipv6IpamCidr", + "path": "aws-cdk-vpcv2-alpha/Vpc-integ-test-2/Ipv6IpamCidr", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCCidrBlock", "aws:cdk:cloudformation:props": { @@ -235,9 +235,9 @@ "version": "0.0.0" } }, - "SecondaryIp3C84": { - "id": "SecondaryIp3C84", - "path": "aws-cdk-vpcv2-alpha/Vpc-integ-test-2/SecondaryIp3C84", + "SecondaryAddress2": { + "id": "SecondaryAddress2", + "path": "aws-cdk-vpcv2-alpha/Vpc-integ-test-2/SecondaryAddress2", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCCidrBlock", "aws:cdk:cloudformation:props": { @@ -255,9 +255,9 @@ "version": "0.0.0" } }, - "SecondaryIpA930": { - "id": "SecondaryIpA930", - "path": "aws-cdk-vpcv2-alpha/Vpc-integ-test-2/SecondaryIpA930", + "SecondaryAddress3": { + "id": "SecondaryAddress3", + "path": "aws-cdk-vpcv2-alpha/Vpc-integ-test-2/SecondaryAddress3", "attributes": { "aws:cdk:cloudformation:type": "AWS::EC2::VPCCidrBlock", "aws:cdk:cloudformation:props": { diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.ts b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.ts index f2285c9f69d21..d5467855773ac 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.ts +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/integ.vpc-v2-alpha.ts @@ -46,9 +46,9 @@ new vpc_v2.VpcV2(stack, 'VPC-integ-test-1', { vpc_v2.IpAddresses.ipv4Ipam({ ipamPool: pool1, netmaskLength: 20, - }), + }, 'ipv4IpamCidr'), //Test secondary ipv6 address - vpc_v2.IpAddresses.amazonProvidedIpv6(), + vpc_v2.IpAddresses.amazonProvidedIpv6('AmazonProvided'), ], enableDnsHostnames: true, enableDnsSupport: true, @@ -62,9 +62,9 @@ const vpc = new vpc_v2.VpcV2(stack, 'Vpc-integ-test-2', { secondaryAddressBlocks: [vpc_v2.IpAddresses.ipv6Ipam({ ipamPool: pool2, netmaskLength: 60, - }), - vpc_v2.IpAddresses.ipv4('10.2.0.0/16'), - vpc_v2.IpAddresses.ipv4('10.3.0.0/16')], + }, 'Ipv6IpamCidr'), + vpc_v2.IpAddresses.ipv4('10.2.0.0/16', 'SecondaryAddress2'), + vpc_v2.IpAddresses.ipv4('10.3.0.0/16', 'SecondaryAddress3')], }); new SubnetV2(stack, 'testsbubnet', { diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/ipam.test.ts b/packages/@aws-cdk/aws-vpcv2-alpha/test/ipam.test.ts index de39fb3d195bb..fe8944cd42968 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/ipam.test.ts +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/ipam.test.ts @@ -36,7 +36,7 @@ describe('IPAM Test', () => { secondaryAddressBlocks: [vpc.IpAddresses.ipv6Ipam({ ipamPool: pool, netmaskLength: 52, - })], + }, 'Ipv6Ipam')], }); Template.fromStack(stack).hasResourceProperties( 'AWS::EC2::IPAMPool', @@ -61,7 +61,7 @@ describe('IPAM Test', () => { secondaryAddressBlocks: [vpc.IpAddresses.ipv4Ipam({ ipamPool: pool, netmaskLength: 20, - })], + }, 'SecondaryIpv4')], }); Template.fromStack(stack).hasResourceProperties( 'AWS::EC2::IPAMPool', diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/route.test.ts b/packages/@aws-cdk/aws-vpcv2-alpha/test/route.test.ts index 829313fab8cc2..30c3fb799aea6 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/route.test.ts +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/route.test.ts @@ -20,7 +20,7 @@ describe('EC2 Routing', () => { stack = new cdk.Stack(app); myVpc = new vpc.VpcV2(stack, 'TestVpc', { primaryAddressBlock: vpc.IpAddresses.ipv4('10.0.0.0/16'), - secondaryAddressBlocks: [vpc.IpAddresses.amazonProvidedIpv6()], + secondaryAddressBlocks: [vpc.IpAddresses.amazonProvidedIpv6('AmazonIpv6')], enableDnsHostnames: true, enableDnsSupport: true, }); @@ -46,7 +46,6 @@ describe('EC2 Routing', () => { destination: '0.0.0.0/0', target: { gateway: eigw }, }); - // console.log(Template.fromStack(stack).toJSON().Resources); Template.fromStack(stack).templateMatches({ Resources: { // EIGW should be in stack diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/subnet-v2.test.ts b/packages/@aws-cdk/aws-vpcv2-alpha/test/subnet-v2.test.ts index 30b42d676eb98..4523faa887012 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/subnet-v2.test.ts +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/subnet-v2.test.ts @@ -27,7 +27,7 @@ describe('Subnet V2 with custom IP and routing', () => { const testVpc = new vpc.VpcV2(stack, 'TestVPC', { primaryAddressBlock: vpc.IpAddresses.ipv4('10.1.0.0/16'), - secondaryAddressBlocks: [vpc.IpAddresses.ipv4('10.2.0.0/16')], + secondaryAddressBlocks: [vpc.IpAddresses.ipv4('10.2.0.0/16', 'Secondary1')], }); const subnetConfig = { @@ -68,7 +68,7 @@ describe('Subnet V2 with custom IP and routing', () => { test('Should throw error if overlapping CIDR block(IPv4) for the subnet', () => { const testVPC = new vpc.VpcV2(stack, 'TestVPC', { primaryAddressBlock: vpc.IpAddresses.ipv4('10.1.0.0/16'), - secondaryAddressBlocks: [vpc.IpAddresses.ipv4('10.2.0.0/16')], + secondaryAddressBlocks: [vpc.IpAddresses.ipv4('10.2.0.0/16', 'Secondary1')], }); const subnetConfig = { @@ -92,7 +92,7 @@ describe('Subnet V2 with custom IP and routing', () => { test('Should throw error if invalid CIDR block', () => { const testVPC = new vpc.VpcV2(stack, 'TestVPC', { primaryAddressBlock: vpc.IpAddresses.ipv4('10.1.0.0/16'), - secondaryAddressBlocks: [vpc.IpAddresses.ipv4('10.2.0.0/16')], + secondaryAddressBlocks: [vpc.IpAddresses.ipv4('10.2.0.0/16', 'Secondary1')], }); expect(() => new subnet.SubnetV2(stack, 'TestSubnet', { @@ -106,7 +106,7 @@ describe('Subnet V2 with custom IP and routing', () => { test('Should throw error if VPC does not support IPv6', () => { const TestVPC = new vpc.VpcV2(stack, 'TestVPC', { primaryAddressBlock: vpc.IpAddresses.ipv4('10.1.0.0/16'), - secondaryAddressBlocks: [vpc.IpAddresses.ipv4('10.2.0.0/16')], + secondaryAddressBlocks: [vpc.IpAddresses.ipv4('10.2.0.0/16', 'Secondary1')], }); expect(() => new subnet.SubnetV2(stack, 'TestSubnet', { vpc: TestVPC, @@ -120,7 +120,7 @@ describe('Subnet V2 with custom IP and routing', () => { test('Create Subnet with IPv6 if it is Amazon Provided Ipv6 is enabled on VPC', () => { const testVPC = new vpc.VpcV2(stack, 'TestVPC', { primaryAddressBlock: vpc.IpAddresses.ipv4('10.1.0.0/16'), - secondaryAddressBlocks: [vpc.IpAddresses.amazonProvidedIpv6()], + secondaryAddressBlocks: [vpc.IpAddresses.amazonProvidedIpv6('AmazonIpv6')], }); const subnetConfig = { @@ -172,7 +172,7 @@ describe('Subnet V2 with custom IP and routing', () => { secondaryAddressBlocks: [vpc.IpAddresses.ipv6Ipam({ ipamPool: pool, netmaskLength: 60, - })], + }, 'ipv6Ipam')], }); new subnet.SubnetV2(stack, 'IpamSubnet', { @@ -194,7 +194,7 @@ describe('Subnet V2 with custom IP and routing', () => { }, }, TestVPCD26570D8: { Type: 'AWS::EC2::VPC' }, - TestVPCSecondaryIp47C3DB4AF0F8: { Type: 'AWS::EC2::VPCCidrBlock' }, + TestVPCipv6Ipam6024F9EC: { Type: 'AWS::EC2::VPCCidrBlock' }, IpamSubnet78671F8A: { Type: 'AWS::EC2::Subnet', Properties: { @@ -223,7 +223,7 @@ describe('Subnet V2 with custom IP and routing', () => { secondaryAddressBlocks: [vpc.IpAddresses.ipv6Ipam({ ipamPool: pool, netmaskLength: 60, - })], + }, 'ipv6Ipam')], }); const subnetConfig = { diff --git a/packages/@aws-cdk/aws-vpcv2-alpha/test/vpc-v2.test.ts b/packages/@aws-cdk/aws-vpcv2-alpha/test/vpc-v2.test.ts index 5816073132cb4..0b0ce06be95fa 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/test/vpc-v2.test.ts +++ b/packages/@aws-cdk/aws-vpcv2-alpha/test/vpc-v2.test.ts @@ -2,6 +2,7 @@ import { Template } from 'aws-cdk-lib/assertions'; import * as cdk from 'aws-cdk-lib'; import * as vpc from '../lib/vpc-v2'; import { AddressFamily, AwsServiceName, Ipam, IpamPoolPublicIpSource } from '../lib'; + describe('Vpc V2 with full control', () => { let stack: cdk.Stack; @@ -38,7 +39,7 @@ describe('Vpc V2 with full control', () => { test('VPC with secondary IPv4 address', () => { new vpc.VpcV2(stack, 'TestVpc', { primaryAddressBlock: vpc.IpAddresses.ipv4('10.1.0.0/16'), - secondaryAddressBlocks: [vpc.IpAddresses.ipv4('10.2.0.0/16')], + secondaryAddressBlocks: [vpc.IpAddresses.ipv4('10.2.0.0/16', 'SecondaryAddress')], enableDnsHostnames: true, enableDnsSupport: true, }, @@ -53,7 +54,7 @@ describe('Vpc V2 with full control', () => { EnableDnsSupport: true, }, }, - TestVpcSecondaryIp47C3F121E45B: { + TestVpcSecondaryAddressD76FCD9C: { Type: 'AWS::EC2::VPCCidrBlock', Properties: { VpcId: { @@ -73,7 +74,7 @@ describe('Vpc V2 with full control', () => { expect(() => { new vpc.VpcV2(stack, 'TestVpc', { primaryAddressBlock: vpc.IpAddresses.ipv4('10.1.0.0/16'), - secondaryAddressBlocks: [vpc.IpAddresses.ipv4('192.168.0.0/16')], + secondaryAddressBlocks: [vpc.IpAddresses.ipv4('192.168.0.0/16', 'SecondaryIpv4')], enableDnsHostnames: true, enableDnsSupport: true, }, @@ -84,7 +85,7 @@ describe('Vpc V2 with full control', () => { test('VPC supports secondary Amazon Provided IPv6 address', () => { new vpc.VpcV2(stack, 'TestVpc', { primaryAddressBlock: vpc.IpAddresses.ipv4('10.1.0.0/16'), - secondaryAddressBlocks: [vpc.IpAddresses.amazonProvidedIpv6()], + secondaryAddressBlocks: [vpc.IpAddresses.amazonProvidedIpv6('AmazonProvided')], enableDnsHostnames: true, enableDnsSupport: true, }, @@ -99,7 +100,7 @@ describe('Vpc V2 with full control', () => { EnableDnsSupport: true, }, }, - TestVpcSecondaryIp47C3F121E45B: { + TestVpcAmazonProvided569F7097: { Type: 'AWS::EC2::VPCCidrBlock', Properties: { AmazonProvidedIpv6CidrBlock: true, //Amazon Provided IPv6 address @@ -190,7 +191,7 @@ describe('Vpc V2 with full control', () => { secondaryAddressBlocks: [vpc.IpAddresses.ipv6Ipam({ ipamPool: pool, netmaskLength: 64, - })], + }, 'IPv6Ipam')], enableDnsHostnames: true, enableDnsSupport: true, }, @@ -228,7 +229,7 @@ describe('Vpc V2 with full control', () => { EnableDnsSupport: true, }, }, - TestVpcSecondaryIp47C3F121E45B: { + TestVpcIPv6Ipam178145A5: { Type: 'AWS::EC2::VPCCidrBlock', Properties: { VpcId: { diff --git a/packages/aws-cdk-lib/aws-ec2/lib/vpc.ts b/packages/aws-cdk-lib/aws-ec2/lib/vpc.ts index 912f8202f2283..f466af74ce9d0 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/vpc.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/vpc.ts @@ -52,11 +52,6 @@ export interface ISubnet extends IResource { */ readonly routeTable: IRouteTable; - /** - * The IPv6 CIDR block for this subnet - */ - readonly ipv6CidrBlock?: string; - /** * Associate a Network ACL with this subnet *