feat(vpcV2): support custom route and subnet #30538

shikha372 · 2024-06-12T23:50:21Z

Issue # (if applicable)

Issue#5927

Tracking Ticket #30762

Reason for this change

This PR implements below RFC for Full Control VPC configuration
Implementing RFC Full Control VPC

Description of changes

A new Experimental API for VPC called VPCv2
Lifecycle Doc: https://github.com/cdklabs/team-internal/blob/main/docs/construct-library-lifecycle.md

Introduced a new alpha module for VPCV2
Both new class VPCV2 and SubnetV2 implement IVPC and ISubnet for compatibility with other constructs
Introduced a new IPAM class to support IP address alllocation through IPAM pool.
Validations of IP ranges assigned to subnet.
L2 class(Route) to define custom routes under the subnet
L2s for gateways like Egress only IGW and NATGW.

Next Steps:

Iterate on the API with the feedback from community and team to make it ergonomic.
Close on the features listed in tracking ticket

Will follow the exit criteria for this experimental API as outlined in below doc:
https://github.com/cdklabs/team-internal/blob/main/docs/construct-library-lifecycle.md

Description of how you validated changes

Added unit tests with current coverage ~70%

Added integration tests for subnet, vpc and routing features.

Checklist

My code adheres to the CONTRIBUTING GUIDE and DESIGN GUIDELINES

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

… into vpc_full_control

moelasmar · 2024-08-02T07:00:02Z

packages/@aws-cdk/aws-vpcv2-alpha/lib/ipam.ts

+  /**
+   * The operating Regions for an IPAM.
+   * Operating Regions are AWS Regions where the IPAM is allowed to manage IP address CIDRs
+   * For more information about operating Regions, see [Create an IPAM](https://docs.aws.amazon.com//vpc/latest/ipam/create-ipam.html) in the *Amazon VPC IPAM User Guide* .


we need to check how this will look like in Docs

packages/@aws-cdk/aws-vpcv2-alpha/lib/ipam.ts

moelasmar · 2024-08-02T07:18:31Z

packages/@aws-cdk/aws-vpcv2-alpha/lib/ipam.ts

+  public provisionCidr(id: string, options: IpamPoolCidrProvisioningOptions): CfnIPAMPoolCidr {
+    const cidr = new CfnIPAMPoolCidr(this, id, {
+      ...options,
+      ipamPoolId: this.ipamPoolId,
+    });
+    this.ipamCidrs.push(cidr);
+    return cidr;
+  }


[non blocking] should we add validation to the input CIDR ?

This can be used for both ipv4 and ipv6 but mainly used to provision CIDRs with netmasklength as mentioned in the documentation
Can be used for provisioning Amazon-provided IPv6 CIDRs to top-level pools and for provisioning CIDRs to pools with source pools. Cannot be used to provision BYOIP CIDRs to top-level pools. "NetmaskLength" or "Cidr" is required.

So I believe the validation should be around netmask length, added a point to think about all the validations in IPAM class.

packages/@aws-cdk/aws-vpcv2-alpha/lib/ipam.ts

moelasmar · 2024-08-02T07:25:19Z

packages/@aws-cdk/aws-vpcv2-alpha/lib/ipam.ts

+   */
+  public readonly operatingRegions: string[];
+
+  constructor(scope: Construct, id: string, props?: IpamProps) {


i believe the node.defaultChild of this construct is the CfnIpam resource.

moelasmar · 2024-08-02T07:28:17Z

packages/@aws-cdk/aws-vpcv2-alpha/lib/ipam.ts

+   */
+  public readonly operatingRegions: string[];
+
+  constructor(scope: Construct, id: string, props?: IpamProps) {


[to think about] shall we add a validation that number of Ipam created per stack is only one ?

packages/@aws-cdk/aws-vpcv2-alpha/lib/subnet-v2.ts

moelasmar · 2024-08-02T11:45:50Z

packages/@aws-cdk/aws-vpcv2-alpha/lib/route.ts

+   * gateway and cannot be specified with a private NAT gateway.
+   * @default none
+   */
+  readonly allocationId?: string;


so I think we should add a constructor for it.

moelasmar · 2024-08-02T11:49:18Z

packages/@aws-cdk/aws-vpcv2-alpha/lib/route.ts

+    if (this.targetRouterType == RouterType.GATEWAY) {
+      if (this.target.gateway instanceof InternetGateway) {
+        new CfnVPCGatewayAttachment(this, 'GWAttachment', {
+          vpcId: this.target.gateway.vpcId,
+          internetGatewayId: this.target.gateway.routerTargetId,
+        });
+      } else if (this.target.gateway instanceof VPNGateway) {
+        new CfnVPCGatewayAttachment(this, 'GWAttachment', {
+          vpcId: this.target.gateway.vpcId,
+          vpnGatewayId: this.target.gateway.routerTargetId,
+        });
+      }


I know this will be done in next phases, but I want to keep track of the comments that will be done later to facilitate my review next time :)

The attachment should be moved to the place where we create the Gateways.

Thanks @moelasmar , that's why i'm keeping this comment as unresolved so we could revisit this in next implementation along with adding in feature plan

packages/@aws-cdk/aws-vpcv2-alpha/lib/ipam.ts

packages/@aws-cdk/aws-vpcv2-alpha/lib/vpc-v2.ts

moelasmar · 2024-08-07T04:09:16Z

packages/@aws-cdk/aws-ec2-alpha/lib/vpc-v2.ts

+ */
+class IpamIpv4 implements IIpAddresses {
+
+  constructor(private readonly props: IpamOptions, private readonly ipProps?: SecondaryAddressProps) {


why do you make a new object for the name property ?

… into vpc_full_control

aws-cdk-automation · 2024-08-07T06:07:53Z

AWS CodeBuild CI Report

CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
Commit ID: b717d17
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

mergify · 2024-08-07T15:20:55Z

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

github-actions · 2024-08-07T15:21:18Z

Comments on closed issues and PRs are hard for our team to see.
If you need help, please open a new issue that references this one.

shikha372 and others added 22 commits May 15, 2024 17:45

initial lib for VPC V2 alpha construct

f13a0c2

implementation of ipam

5554383

adding support for secondary IP address

095c867

add IPAM private scope

739ad59

Add Route-related constructs

b0717be

adding subnet, test and example stack

c9a25bf

Merge branch 'vpc_full_control' of https://github.com/shikha372/aws-cdk…

720a624

… into vpc_full_control

fixing vpc integ tests with successful deployment

3684c21

Tweak Route and RouteTable

b239806

Merge changes

3d83e82

Fix export

2f4ca11

barebone implementation of subnetV2

bdcf3c5

Merge branch 'vpc_full_control' of https://github.com/shikha372/aws-cdk…

3ea72ae

… into vpc_full_control

re-introduce reverted merge changes

6b0b6d5

implementing isolated subnet by default

e688a9a

Move route things to their own file

6d94634

fixing ipam default scope implementation

3dfe18f

resolving merge conflicts

401de75

resolving merge conflicts

adb7aa8

Update target type

6a0c297

fixing ipam public and private

0335f34

copying vpcbase class to plugin IVPC

e7cd0e9

github-actions bot added the p2 label Jun 12, 2024

aws-cdk-automation requested a review from a team June 12, 2024 23:50

mergify bot added the contribution/core This is a PR that came from AWS. label Jun 12, 2024

This comment was marked as resolved.

Sign in to view

add validation for ipv6 in subnet

1d0e247

shikha372 force-pushed the vpc_full_control branch from 8f4dd9b to 1d0e247 Compare June 13, 2024 03:56

shikha372 changed the title ~~Vpc full control~~ (vpc:) support custom route and subnet Jun 13, 2024

shikha372 changed the title ~~(vpc:) support custom route and subnet~~ feat(vpc): support custom route and subnet Jun 13, 2024

shikha372 force-pushed the vpc_full_control branch from aaccea2 to c9e0251 Compare August 1, 2024 23:31

moelasmar reviewed Aug 2, 2024

View reviewed changes

shikha372 added 3 commits August 2, 2024 13:39

refactor according to previous comments

7bcacc4

refactor according to previous comments

255b94c

refactor according to previous comments

24d2c15

shikha372 force-pushed the vpc_full_control branch from 9ff92f8 to 24d2c15 Compare August 2, 2024 21:49

moelasmar reviewed Aug 6, 2024

View reviewed changes

packages/@aws-cdk/aws-vpcv2-alpha/lib/ipam.ts Outdated Show resolved Hide resolved

moelasmar reviewed Aug 6, 2024

View reviewed changes

packages/@aws-cdk/aws-vpcv2-alpha/lib/vpc-v2.ts Outdated Show resolved Hide resolved

making ipam props private

0b7a56f

shikha372 force-pushed the vpc_full_control branch from a3d77e6 to 0b7a56f Compare August 6, 2024 18:27

adding name property for secondary ip address

daa15c7

shikha372 force-pushed the vpc_full_control branch from 6bcf8b7 to daa15c7 Compare August 7, 2024 00:09

shikha372 added 3 commits August 6, 2024 17:17

renaming module from vpc v2 to ec2

e2ddd32

refactoring vpc for secondary address

b789ee8

refactoring vpc for secondary address

3d7346b

moelasmar reviewed Aug 7, 2024

View reviewed changes

shikha372 added 2 commits August 6, 2024 21:56

refactoring route class

7849e02

Merge branch 'main' into vpc_full_control

ace34be

moelasmar approved these changes Aug 7, 2024

View reviewed changes

shikha372 added the pr/do-not-merge This PR should not be merged at this time. label Aug 7, 2024

shikha372 added 2 commits August 6, 2024 22:28

fix: README

94f2293

Merge branch 'vpc_full_control' of https://github.com/shikha372/aws-cdk…

b717d17

… into vpc_full_control

shikha372 removed the pr/do-not-merge This PR should not be merged at this time. label Aug 7, 2024

mergify bot merged commit e17fdd7 into aws:main Aug 7, 2024
12 checks passed

github-actions bot locked as resolved and limited conversation to collaborators Aug 7, 2024

shikha372 changed the title ~~feat(vpc): support custom route and subnet~~ feat(vpcV2): support custom route and subnet Aug 23, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(vpcV2): support custom route and subnet #30538

feat(vpcV2): support custom route and subnet #30538

shikha372 commented Jun 12, 2024 •

edited

Loading

This comment was marked as resolved.

moelasmar Aug 2, 2024

moelasmar Aug 2, 2024

shikha372 Aug 2, 2024

moelasmar Aug 2, 2024

moelasmar Aug 2, 2024

moelasmar Aug 2, 2024

moelasmar Aug 2, 2024

shikha372 Aug 2, 2024 •

edited

Loading

moelasmar Aug 7, 2024

aws-cdk-automation commented Aug 7, 2024

mergify bot commented Aug 7, 2024

github-actions bot commented Aug 7, 2024

feat(vpcV2): support custom route and subnet #30538

feat(vpcV2): support custom route and subnet #30538

Conversation

shikha372 commented Jun 12, 2024 • edited Loading

Issue # (if applicable)

Reason for this change

Description of changes

Next Steps:

Description of how you validated changes

Checklist

This comment was marked as resolved.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shikha372 Aug 2, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aws-cdk-automation commented Aug 7, 2024

AWS CodeBuild CI Report

mergify bot commented Aug 7, 2024

github-actions bot commented Aug 7, 2024

shikha372 commented Jun 12, 2024 •

edited

Loading

shikha372 Aug 2, 2024 •

edited

Loading