From 6bcf8b7890e2cc4d5dc039429a191f1c567b3469 Mon Sep 17 00:00:00 2001 From: shikha372 Date: Tue, 6 Aug 2024 16:54:42 -0700 Subject: [PATCH] adding name property for secondary ip address --- .../@aws-cdk/aws-vpcv2-alpha/lib/subnet-v2.ts | 18 +++++- .../@aws-cdk/aws-vpcv2-alpha/lib/vpc-v2.ts | 54 ++++++++-------- .../aws-cdk-routev2-alpha.assets.json | 4 +- .../aws-cdk-routev2-alpha.template.json | 6 +- ...routev2-dynamodbendpoint-alpha.assets.json | 4 +- ...utev2-dynamodbendpoint-alpha.template.json | 6 +- ...dk-routev2-egressonlyigw-alpha.assets.json | 4 +- ...-routev2-egressonlyigw-alpha.template.json | 6 +- .../aws-cdk-routev2-igw-alpha.assets.json | 4 +- .../aws-cdk-routev2-igw-alpha.template.json | 6 +- ...ws-cdk-routev2-networkif-alpha.assets.json | 4 +- ...-cdk-routev2-networkif-alpha.template.json | 6 +- ...cdk-routev2-privatenatgw-alpha.assets.json | 4 +- ...k-routev2-privatenatgw-alpha.template.json | 6 +- ...-cdk-routev2-publicnatgw-alpha.assets.json | 4 +- ...dk-routev2-publicnatgw-alpha.template.json | 6 +- ...routev2-virtualprivategw-alpha.assets.json | 4 +- ...utev2-virtualprivategw-alpha.template.json | 6 +- ...outev2-vpcpeerconnection-alpha.assets.json | 4 +- ...tev2-vpcpeerconnection-alpha.template.json | 6 +- .../integ.route-v2.js.snapshot/manifest.json | 58 ++++++++--------- .../test/integ.route-v2.js.snapshot/tree.json | 54 ++++++++-------- .../aws-vpcv2-alpha/test/integ.route-v2.ts | 2 +- .../aws-cdk-vpcv2-alpha-new.assets.json | 4 +- .../aws-cdk-vpcv2-alpha-new.template.json | 8 +-- .../integ.subnet-v2.js.snapshot/manifest.json | 10 +-- .../integ.subnet-v2.js.snapshot/tree.json | 6 +- .../aws-vpcv2-alpha/test/integ.subnet-v2.ts | 2 +- .../aws-cdk-vpcv2-alpha.assets.json | 4 +- .../aws-cdk-vpcv2-alpha.template.json | 64 +++++++++---------- .../manifest.json | 42 ++++++------ .../integ.vpc-v2-alpha.js.snapshot/tree.json | 30 ++++----- .../test/integ.vpc-v2-alpha.ts | 10 +-- .../aws-vpcv2-alpha/test/ipam.test.ts | 4 +- .../aws-vpcv2-alpha/test/route.test.ts | 3 +- .../aws-vpcv2-alpha/test/subnet-v2.test.ts | 16 ++--- .../aws-vpcv2-alpha/test/vpc-v2.test.ts | 15 +++-- packages/aws-cdk-lib/aws-ec2/lib/vpc.ts | 5 -- 38 files changed, 253 insertions(+), 246 deletions(-) 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..4e5ab458ee208 100644 --- a/packages/@aws-cdk/aws-vpcv2-alpha/lib/vpc-v2.ts +++ b/packages/@aws-cdk/aws-vpcv2-alpha/lib/vpc-v2.ts @@ -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,13 @@ 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'); + } + const hash = pathHash(secondaryVpcOptions.cidrBlockName); if (secondaryVpcOptions.amazonProvided || secondaryVpcOptions.ipv6IpamPool) { this.useIpv6 = true; @@ -353,8 +360,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 +369,7 @@ class ipv4CidrAllocation implements IIpAddresses { allocateVpcCidr(): VpcCidrOptions { return { ipv4CidrBlock: this.cidrBlock, + cidrBlockName: this.cidrBlockName, }; } } @@ -379,11 +386,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 +403,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 +411,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 +422,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, }; } } @@ -475,13 +485,3 @@ 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; -// } 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..5453b880dc773 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": { + "99a8c77fd5e0367f0b6315c3f7edc7cf301c023e224a917eb8085bb2cf394f25": { "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": "99a8c77fd5e0367f0b6315c3f7edc7cf301c023e224a917eb8085bb2cf394f25.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..ea40ab9b61ff4 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": { + "defaultSecondaryIp4EEF1E2A80B8": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -57,7 +57,7 @@ } }, "DependsOn": [ - "defaultSecondaryIp47C3A8F96659" + "defaultSecondaryIp4EEF1E2A80B8" ] }, "defaultSubnetRouteTableAssociationF1D85D29": { @@ -74,7 +74,7 @@ } }, "DependsOn": [ - "defaultSecondaryIp47C3A8F96659" + "defaultSecondaryIp4EEF1E2A80B8" ] } }, 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..f4cd3c454cb80 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": { + "e4a2db0874a34bce2c58714a0287cdd3631d4905344a97b9ec6b85504f2b2d8d": { "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": "e4a2db0874a34bce2c58714a0287cdd3631d4905344a97b9ec6b85504f2b2d8d.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..e8689a143881c 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": { + "dynamodbSecondaryIp4EEF58BFBEFB": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -57,7 +57,7 @@ } }, "DependsOn": [ - "dynamodbSecondaryIp47C3D307DC85" + "dynamodbSecondaryIp4EEF58BFBEFB" ] }, "dynamodbSubnetRouteTableAssociationC38B30F3": { @@ -74,7 +74,7 @@ } }, "DependsOn": [ - "dynamodbSecondaryIp47C3D307DC85" + "dynamodbSecondaryIp4EEF58BFBEFB" ] }, "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..9855339ed9414 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": { + "2079919be75aebd2b258469227057f2ed92dcdbcb0f67d9bfc86363f9b2a86f6": { "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": "2079919be75aebd2b258469227057f2ed92dcdbcb0f67d9bfc86363f9b2a86f6.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..f504f751ed0b1 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": { + "eigwSecondaryIp4EEFA473D0E8": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -46,7 +46,7 @@ } }, "DependsOn": [ - "eigwSecondaryIp47C35F6F8767" + "eigwSecondaryIp4EEFA473D0E8" ] }, "eigwSubnetRouteTableAssociation887F4A97": { @@ -63,7 +63,7 @@ } }, "DependsOn": [ - "eigwSecondaryIp47C35F6F8767" + "eigwSecondaryIp4EEFA473D0E8" ] }, "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..35f02d01b40ec 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": { + "048e3bc089f2481a4ab0042fc182140c6c9e86035535165c7a66276e0884a15f": { "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": "048e3bc089f2481a4ab0042fc182140c6c9e86035535165c7a66276e0884a15f.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..8b1002cf818aa 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": { + "igwSecondaryIp4EEF3CD924BF": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -57,7 +57,7 @@ } }, "DependsOn": [ - "igwSecondaryIp47C345C8DF7D" + "igwSecondaryIp4EEF3CD924BF" ] }, "igwSubnetRouteTableAssociationA48C27F3": { @@ -74,7 +74,7 @@ } }, "DependsOn": [ - "igwSecondaryIp47C345C8DF7D" + "igwSecondaryIp4EEF3CD924BF" ] }, "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..913a35ca86c80 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": { + "679fcb089ea34f5957ed540c19f9920d7d66e58ed63eac0ddc71eab293911ede": { "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": "679fcb089ea34f5957ed540c19f9920d7d66e58ed63eac0ddc71eab293911ede.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..b34989e687ce7 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": { + "nifSecondaryIp4EEFDDCE8C35": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -57,7 +57,7 @@ } }, "DependsOn": [ - "nifSecondaryIp47C3A7BC99CF" + "nifSecondaryIp4EEFDDCE8C35" ] }, "nifSubnetRouteTableAssociationE4036B9F": { @@ -74,7 +74,7 @@ } }, "DependsOn": [ - "nifSecondaryIp47C3A7BC99CF" + "nifSecondaryIp4EEFDDCE8C35" ] } }, 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..1abea28484b01 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": { + "6b2265ceb4c2a4c7e6a6f6d14b544aa5cc8a12c1057789e5753d9503c3f20cae": { "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": "6b2265ceb4c2a4c7e6a6f6d14b544aa5cc8a12c1057789e5753d9503c3f20cae.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..73a457f28a734 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": { + "natgwprivSecondaryIp4EEFAAB56AE7": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -57,7 +57,7 @@ } }, "DependsOn": [ - "natgwprivSecondaryIp47C30543A584" + "natgwprivSecondaryIp4EEFAAB56AE7" ] }, "natgwprivSubnetRouteTableAssociation9E115869": { @@ -74,7 +74,7 @@ } }, "DependsOn": [ - "natgwprivSecondaryIp47C30543A584" + "natgwprivSecondaryIp4EEFAAB56AE7" ] }, "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..5b39a749a1e3a 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": { + "4abd97ca76d86c84d6ba2526b2cbaea4e100d308b3417ff09b933966a9247f45": { "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": "4abd97ca76d86c84d6ba2526b2cbaea4e100d308b3417ff09b933966a9247f45.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..9a741995b5586 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": { + "natgwpubSecondaryIp4EEF7D468AE6": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -57,7 +57,7 @@ } }, "DependsOn": [ - "natgwpubSecondaryIp47C3D6600620" + "natgwpubSecondaryIp4EEF7D468AE6" ] }, "natgwpubSubnetRouteTableAssociation019CE26A": { @@ -74,7 +74,7 @@ } }, "DependsOn": [ - "natgwpubSecondaryIp47C3D6600620" + "natgwpubSecondaryIp4EEF7D468AE6" ] }, "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..3668f0bedf410 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": { + "f432b2acd7721df416079f6e1cf0a901e49f99a2854164443cb77362b4f28ec0": { "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": "f432b2acd7721df416079f6e1cf0a901e49f99a2854164443cb77362b4f28ec0.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..a51c4da408f93 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": { + "vpgwSecondaryIp4EEF5CB9E71E": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -57,7 +57,7 @@ } }, "DependsOn": [ - "vpgwSecondaryIp47C3513204E5" + "vpgwSecondaryIp4EEF5CB9E71E" ] }, "vpgwSubnetRouteTableAssociation49921F90": { @@ -74,7 +74,7 @@ } }, "DependsOn": [ - "vpgwSecondaryIp47C3513204E5" + "vpgwSecondaryIp4EEF5CB9E71E" ] }, "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..e988bd9a8d73a 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": { + "aff61d62ad45a7444b7ae1e70e87d9435e55b95f795c3d4872fe0bd3481b118c": { "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": "aff61d62ad45a7444b7ae1e70e87d9435e55b95f795c3d4872fe0bd3481b118c.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..0267b0098b89d 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": { + "vpcpcSecondaryIp4EEFD9F8423A": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -57,7 +57,7 @@ } }, "DependsOn": [ - "vpcpcSecondaryIp47C3DD1C0245" + "vpcpcSecondaryIp4EEFD9F8423A" ] }, "vpcpcSubnetRouteTableAssociation8531BF5C": { @@ -74,7 +74,7 @@ } }, "DependsOn": [ - "vpcpcSecondaryIp47C3DD1C0245" + "vpcpcSecondaryIp4EEFD9F8423A" ] } }, 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..37eb550ede83e 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}/99a8c77fd5e0367f0b6315c3f7edc7cf301c023e224a917eb8085bb2cf394f25.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/SecondaryIp4EEF": [ { "type": "aws:cdk:logicalId", - "data": "defaultSecondaryIp47C3A8F96659" + "data": "defaultSecondaryIp4EEF1E2A80B8" } ], "/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}/2079919be75aebd2b258469227057f2ed92dcdbcb0f67d9bfc86363f9b2a86f6.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/SecondaryIp4EEF": [ { "type": "aws:cdk:logicalId", - "data": "eigwSecondaryIp47C35F6F8767" + "data": "eigwSecondaryIp4EEFA473D0E8" } ], "/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}/048e3bc089f2481a4ab0042fc182140c6c9e86035535165c7a66276e0884a15f.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/SecondaryIp4EEF": [ { "type": "aws:cdk:logicalId", - "data": "igwSecondaryIp47C345C8DF7D" + "data": "igwSecondaryIp4EEF3CD924BF" } ], "/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}/f432b2acd7721df416079f6e1cf0a901e49f99a2854164443cb77362b4f28ec0.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/SecondaryIp4EEF": [ { "type": "aws:cdk:logicalId", - "data": "vpgwSecondaryIp47C3513204E5" + "data": "vpgwSecondaryIp4EEF5CB9E71E" } ], "/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}/4abd97ca76d86c84d6ba2526b2cbaea4e100d308b3417ff09b933966a9247f45.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/SecondaryIp4EEF": [ { "type": "aws:cdk:logicalId", - "data": "natgwpubSecondaryIp47C3D6600620" + "data": "natgwpubSecondaryIp4EEF7D468AE6" } ], "/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}/6b2265ceb4c2a4c7e6a6f6d14b544aa5cc8a12c1057789e5753d9503c3f20cae.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/SecondaryIp4EEF": [ { "type": "aws:cdk:logicalId", - "data": "natgwprivSecondaryIp47C30543A584" + "data": "natgwprivSecondaryIp4EEFAAB56AE7" } ], "/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}/679fcb089ea34f5957ed540c19f9920d7d66e58ed63eac0ddc71eab293911ede.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/SecondaryIp4EEF": [ { "type": "aws:cdk:logicalId", - "data": "nifSecondaryIp47C3A7BC99CF" + "data": "nifSecondaryIp4EEFDDCE8C35" } ], "/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}/aff61d62ad45a7444b7ae1e70e87d9435e55b95f795c3d4872fe0bd3481b118c.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/SecondaryIp4EEF": [ { "type": "aws:cdk:logicalId", - "data": "vpcpcSecondaryIp47C3DD1C0245" + "data": "vpcpcSecondaryIp4EEFD9F8423A" } ], "/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}/e4a2db0874a34bce2c58714a0287cdd3631d4905344a97b9ec6b85504f2b2d8d.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/SecondaryIp4EEF": [ { "type": "aws:cdk:logicalId", - "data": "dynamodbSecondaryIp47C3D307DC85" + "data": "dynamodbSecondaryIp4EEF58BFBEFB" } ], "/aws-cdk-routev2-dynamodbendpoint-alpha/TestRoottable/RouteTable": [ @@ -811,10 +811,10 @@ "data": "CheckBootstrapVersion" } ], - "dynamodbSecondaryIp1747F9BD8": [ + "dynamodbSecondaryIp47C3D307DC85": [ { "type": "aws:cdk:logicalId", - "data": "dynamodbSecondaryIp1747F9BD8", + "data": "dynamodbSecondaryIp47C3D307DC85", "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..45614e7aa0f06 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", + "SecondaryIp4EEF": { + "id": "SecondaryIp4EEF", + "path": "aws-cdk-routev2-alpha/default/SecondaryIp4EEF", "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", + "SecondaryIp4EEF": { + "id": "SecondaryIp4EEF", + "path": "aws-cdk-routev2-egressonlyigw-alpha/eigw/SecondaryIp4EEF", "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", + "SecondaryIp4EEF": { + "id": "SecondaryIp4EEF", + "path": "aws-cdk-routev2-igw-alpha/igw/SecondaryIp4EEF", "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", + "SecondaryIp4EEF": { + "id": "SecondaryIp4EEF", + "path": "aws-cdk-routev2-virtualprivategw-alpha/vpgw/SecondaryIp4EEF", "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", + "SecondaryIp4EEF": { + "id": "SecondaryIp4EEF", + "path": "aws-cdk-routev2-publicnatgw-alpha/natgw_pub/SecondaryIp4EEF", "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", + "SecondaryIp4EEF": { + "id": "SecondaryIp4EEF", + "path": "aws-cdk-routev2-privatenatgw-alpha/natgw_priv/SecondaryIp4EEF", "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", + "SecondaryIp4EEF": { + "id": "SecondaryIp4EEF", + "path": "aws-cdk-routev2-networkif-alpha/nif/SecondaryIp4EEF", "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", + "SecondaryIp4EEF": { + "id": "SecondaryIp4EEF", + "path": "aws-cdk-routev2-vpcpeerconnection-alpha/vpcpc/SecondaryIp4EEF", "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", + "SecondaryIp4EEF": { + "id": "SecondaryIp4EEF", + "path": "aws-cdk-routev2-dynamodbendpoint-alpha/dynamodb/SecondaryIp4EEF", "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..ca1873c2f77d6 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": { + "3036821471050cdf4b6ed8b6b8cc10c67fa2ac09f58f908d4e5ffb2991305069": { "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": "3036821471050cdf4b6ed8b6b8cc10c67fa2ac09f58f908d4e5ffb2991305069.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..d5385aced3ded 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": { + "VPCTestSecondaryIp48408C993194": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "Ipv6IpamPoolId": { @@ -112,7 +112,7 @@ } }, "DependsOn": [ - "VPCTestSecondaryIp47C3DC5611C4" + "VPCTestSecondaryIp48408C993194" ] }, "testsbubnetRouteTableF40F025B": { @@ -126,7 +126,7 @@ } }, "DependsOn": [ - "VPCTestSecondaryIp47C3DC5611C4" + "VPCTestSecondaryIp48408C993194" ] }, "testsbubnetRouteTableAssociationD6D083FA": { @@ -140,7 +140,7 @@ } }, "DependsOn": [ - "VPCTestSecondaryIp47C3DC5611C4" + "VPCTestSecondaryIp48408C993194" ] }, "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..4647c82f6caaa 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}/3036821471050cdf4b6ed8b6b8cc10c67fa2ac09f58f908d4e5ffb2991305069.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/SecondaryIp4840": [ { "type": "aws:cdk:logicalId", - "data": "VPCTestSecondaryIp47C3DC5611C4" + "data": "VPCTestSecondaryIp48408C993194" } ], "/aws-cdk-vpcv2-alpha-new/VPCTest/VpnGateway/Default": [ @@ -142,10 +142,10 @@ "data": "CheckBootstrapVersion" } ], - "VPCTestSecondaryIp1BB4FC62E": [ + "VPCTestSecondaryIp47C3DC5611C4": [ { "type": "aws:cdk:logicalId", - "data": "VPCTestSecondaryIp1BB4FC62E", + "data": "VPCTestSecondaryIp47C3DC5611C4", "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..4ce3dc84dd4c5 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", + "SecondaryIp4840": { + "id": "SecondaryIp4840", + "path": "aws-cdk-vpcv2-alpha-new/VPCTest/SecondaryIp4840", "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..10042528b200e 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": { + "0ea2011908a54c2fe1c96b5d9feca82463f34dd95a29c5c8ee80b254697256b3": { "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": "0ea2011908a54c2fe1c96b5d9feca82463f34dd95a29c5c8ee80b254697256b3.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..2c6b29c16615b 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": { + "VPCintegtest1SecondaryIp684795D0A306": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "Ipv4IpamPoolId": { @@ -72,7 +72,7 @@ } } }, - "VPCintegtest1SecondaryIp3C84D6CF0FF1": { + "VPCintegtest1SecondaryIp757851A2E166": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "AmazonProvidedIpv6CidrBlock": true, @@ -93,7 +93,7 @@ "InstanceTenancy": "default" } }, - "Vpcintegtest2SecondaryIp47C3B19EFDA1": { + "Vpcintegtest2SecondaryIp4840275314DC": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "Ipv6IpamPoolId": { @@ -114,7 +114,7 @@ "IpamTestPublicPool0PublicPool0CidrC57CE00C" ] }, - "Vpcintegtest2SecondaryIp3C84B5D8E500": { + "Vpcintegtest2SecondaryIp58F23280A479": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "CidrBlock": "10.2.0.0/16", @@ -126,7 +126,7 @@ } } }, - "Vpcintegtest2SecondaryIpA930968EA798": { + "Vpcintegtest2SecondaryIpD363CCF2FF57": { "Type": "AWS::EC2::VPCCidrBlock", "Properties": { "CidrBlock": "10.3.0.0/16", @@ -152,9 +152,9 @@ } }, "DependsOn": [ - "Vpcintegtest2SecondaryIp3C84B5D8E500", - "Vpcintegtest2SecondaryIp47C3B19EFDA1", - "Vpcintegtest2SecondaryIpA930968EA798" + "Vpcintegtest2SecondaryIp4840275314DC", + "Vpcintegtest2SecondaryIp58F23280A479", + "Vpcintegtest2SecondaryIpD363CCF2FF57" ] }, "testsbubnetRouteTableF40F025B": { @@ -168,9 +168,9 @@ } }, "DependsOn": [ - "Vpcintegtest2SecondaryIp3C84B5D8E500", - "Vpcintegtest2SecondaryIp47C3B19EFDA1", - "Vpcintegtest2SecondaryIpA930968EA798" + "Vpcintegtest2SecondaryIp4840275314DC", + "Vpcintegtest2SecondaryIp58F23280A479", + "Vpcintegtest2SecondaryIpD363CCF2FF57" ] }, "testsbubnetRouteTableAssociationD6D083FA": { @@ -184,9 +184,9 @@ } }, "DependsOn": [ - "Vpcintegtest2SecondaryIp3C84B5D8E500", - "Vpcintegtest2SecondaryIp47C3B19EFDA1", - "Vpcintegtest2SecondaryIpA930968EA798" + "Vpcintegtest2SecondaryIp4840275314DC", + "Vpcintegtest2SecondaryIp58F23280A479", + "Vpcintegtest2SecondaryIpD363CCF2FF57" ] }, "testsubnetSubnetDD417829": { @@ -203,9 +203,9 @@ } }, "DependsOn": [ - "Vpcintegtest2SecondaryIp3C84B5D8E500", - "Vpcintegtest2SecondaryIp47C3B19EFDA1", - "Vpcintegtest2SecondaryIpA930968EA798" + "Vpcintegtest2SecondaryIp4840275314DC", + "Vpcintegtest2SecondaryIp58F23280A479", + "Vpcintegtest2SecondaryIpD363CCF2FF57" ] }, "testsubnetRouteTable55223C61": { @@ -219,9 +219,9 @@ } }, "DependsOn": [ - "Vpcintegtest2SecondaryIp3C84B5D8E500", - "Vpcintegtest2SecondaryIp47C3B19EFDA1", - "Vpcintegtest2SecondaryIpA930968EA798" + "Vpcintegtest2SecondaryIp4840275314DC", + "Vpcintegtest2SecondaryIp58F23280A479", + "Vpcintegtest2SecondaryIpD363CCF2FF57" ] }, "testsubnetRouteTableAssociationC106676D": { @@ -235,9 +235,9 @@ } }, "DependsOn": [ - "Vpcintegtest2SecondaryIp3C84B5D8E500", - "Vpcintegtest2SecondaryIp47C3B19EFDA1", - "Vpcintegtest2SecondaryIpA930968EA798" + "Vpcintegtest2SecondaryIp4840275314DC", + "Vpcintegtest2SecondaryIp58F23280A479", + "Vpcintegtest2SecondaryIpD363CCF2FF57" ] }, "validateIpv6Subnet07BD40AE": { @@ -254,9 +254,9 @@ } }, "DependsOn": [ - "Vpcintegtest2SecondaryIp3C84B5D8E500", - "Vpcintegtest2SecondaryIp47C3B19EFDA1", - "Vpcintegtest2SecondaryIpA930968EA798" + "Vpcintegtest2SecondaryIp4840275314DC", + "Vpcintegtest2SecondaryIp58F23280A479", + "Vpcintegtest2SecondaryIpD363CCF2FF57" ] }, "validateIpv6RouteTable10861B00": { @@ -270,9 +270,9 @@ } }, "DependsOn": [ - "Vpcintegtest2SecondaryIp3C84B5D8E500", - "Vpcintegtest2SecondaryIp47C3B19EFDA1", - "Vpcintegtest2SecondaryIpA930968EA798" + "Vpcintegtest2SecondaryIp4840275314DC", + "Vpcintegtest2SecondaryIp58F23280A479", + "Vpcintegtest2SecondaryIpD363CCF2FF57" ] }, "validateIpv6RouteTableAssociationD6330457": { @@ -286,9 +286,9 @@ } }, "DependsOn": [ - "Vpcintegtest2SecondaryIp3C84B5D8E500", - "Vpcintegtest2SecondaryIp47C3B19EFDA1", - "Vpcintegtest2SecondaryIpA930968EA798" + "Vpcintegtest2SecondaryIp4840275314DC", + "Vpcintegtest2SecondaryIp58F23280A479", + "Vpcintegtest2SecondaryIpD363CCF2FF57" ] } }, 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..1e2c7a54ad1e7 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}/0ea2011908a54c2fe1c96b5d9feca82463f34dd95a29c5c8ee80b254697256b3.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/SecondaryIp6847": [ { "type": "aws:cdk:logicalId", - "data": "VPCintegtest1SecondaryIp47C313EA741A" + "data": "VPCintegtest1SecondaryIp684795D0A306" } ], - "/aws-cdk-vpcv2-alpha/VPC-integ-test-1/SecondaryIp3C84": [ + "/aws-cdk-vpcv2-alpha/VPC-integ-test-1/SecondaryIp7578": [ { "type": "aws:cdk:logicalId", - "data": "VPCintegtest1SecondaryIp3C84D6CF0FF1" + "data": "VPCintegtest1SecondaryIp757851A2E166" } ], "/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/SecondaryIp4840": [ { "type": "aws:cdk:logicalId", - "data": "Vpcintegtest2SecondaryIp47C3B19EFDA1" + "data": "Vpcintegtest2SecondaryIp4840275314DC" } ], - "/aws-cdk-vpcv2-alpha/Vpc-integ-test-2/SecondaryIp3C84": [ + "/aws-cdk-vpcv2-alpha/Vpc-integ-test-2/SecondaryIp58F2": [ { "type": "aws:cdk:logicalId", - "data": "Vpcintegtest2SecondaryIp3C84B5D8E500" + "data": "Vpcintegtest2SecondaryIp58F23280A479" } ], - "/aws-cdk-vpcv2-alpha/Vpc-integ-test-2/SecondaryIpA930": [ + "/aws-cdk-vpcv2-alpha/Vpc-integ-test-2/SecondaryIpD363": [ { "type": "aws:cdk:logicalId", - "data": "Vpcintegtest2SecondaryIpA930968EA798" + "data": "Vpcintegtest2SecondaryIpD363CCF2FF57" } ], "/aws-cdk-vpcv2-alpha/testsbubnet/Subnet": [ @@ -166,46 +166,46 @@ "data": "CheckBootstrapVersion" } ], - "VPCintegtest1SecondaryIp435AC9D39D16": [ + "VPCintegtest1SecondaryIp47C313EA741A": [ { "type": "aws:cdk:logicalId", - "data": "VPCintegtest1SecondaryIp435AC9D39D16", + "data": "VPCintegtest1SecondaryIp47C313EA741A", "trace": [ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" ] } ], - "VPCintegtest1SecondaryIp297056C06FB9": [ + "VPCintegtest1SecondaryIp3C84D6CF0FF1": [ { "type": "aws:cdk:logicalId", - "data": "VPCintegtest1SecondaryIp297056C06FB9", + "data": "VPCintegtest1SecondaryIp3C84D6CF0FF1", "trace": [ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" ] } ], - "Vpcintegtest2SecondaryIp82662C67DA2B": [ + "Vpcintegtest2SecondaryIp47C3B19EFDA1": [ { "type": "aws:cdk:logicalId", - "data": "Vpcintegtest2SecondaryIp82662C67DA2B", + "data": "Vpcintegtest2SecondaryIp47C3B19EFDA1", "trace": [ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" ] } ], - "Vpcintegtest2SecondaryIp9CD8FBE8BBA9": [ + "Vpcintegtest2SecondaryIp3C84B5D8E500": [ { "type": "aws:cdk:logicalId", - "data": "Vpcintegtest2SecondaryIp9CD8FBE8BBA9", + "data": "Vpcintegtest2SecondaryIp3C84B5D8E500", "trace": [ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" ] } ], - "Vpcintegtest2SecondaryIpD49B95386374": [ + "Vpcintegtest2SecondaryIpA930968EA798": [ { "type": "aws:cdk:logicalId", - "data": "Vpcintegtest2SecondaryIpD49B95386374", + "data": "Vpcintegtest2SecondaryIpA930968EA798", "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..d324bb058a5ad 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", + "SecondaryIp6847": { + "id": "SecondaryIp6847", + "path": "aws-cdk-vpcv2-alpha/VPC-integ-test-1/SecondaryIp6847", "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", + "SecondaryIp7578": { + "id": "SecondaryIp7578", + "path": "aws-cdk-vpcv2-alpha/VPC-integ-test-1/SecondaryIp7578", "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", + "SecondaryIp4840": { + "id": "SecondaryIp4840", + "path": "aws-cdk-vpcv2-alpha/Vpc-integ-test-2/SecondaryIp4840", "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", + "SecondaryIp58F2": { + "id": "SecondaryIp58F2", + "path": "aws-cdk-vpcv2-alpha/Vpc-integ-test-2/SecondaryIp58F2", "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", + "SecondaryIpD363": { + "id": "SecondaryIpD363", + "path": "aws-cdk-vpcv2-alpha/Vpc-integ-test-2/SecondaryIpD363", "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..ff6c45894d5b0 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' }, + TestVPCSecondaryIp73A6DF7277A2: { 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..b842f99e56405 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: { + TestVpcSecondaryIpA01DB54E8720: { 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: { + TestVpcSecondaryIp75788B403645: { 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: { + TestVpcSecondaryIp65DF7F2311B7: { 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 *