From 884be3dfa14063a8e8d6abb1400c23d26bafe96a Mon Sep 17 00:00:00 2001 From: Niro Amerasinghe Date: Thu, 26 Oct 2023 23:23:25 +0000 Subject: [PATCH 1/3] Add support for P5 instances --- packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts | 12 ++++++++++++ packages/aws-cdk-lib/aws-ec2/test/instance.test.ts | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts index 4da2094aa8f63..2e34ab56d9666 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts @@ -860,6 +860,16 @@ export enum InstanceClass { */ P4D = 'p4d', + /** + * Parallel-processing optimized instances, 4th generation + */ + PARALLEL5 = 'parallel5', + + /** + * Parallel-processing optimized instances, 4th generation + */ + P5 = 'p5', + /** * Arm processor based instances, 1st generation */ @@ -1347,6 +1357,8 @@ export class InstanceType { [InstanceClass.P4DE]: 'p4de', [InstanceClass.PARALLEL4]: 'p4d', [InstanceClass.P4D]: 'p4d', + [InstanceClass.PARALLEL5]: 'p5', + [InstanceClass.P5]: 'p5', [InstanceClass.ARM1]: 'a1', [InstanceClass.A1]: 'a1', [InstanceClass.STANDARD6_GRAVITON]: 'm6g', diff --git a/packages/aws-cdk-lib/aws-ec2/test/instance.test.ts b/packages/aws-cdk-lib/aws-ec2/test/instance.test.ts index 3dcde47e3b5a8..4c0516c655fb9 100644 --- a/packages/aws-cdk-lib/aws-ec2/test/instance.test.ts +++ b/packages/aws-cdk-lib/aws-ec2/test/instance.test.ts @@ -119,7 +119,7 @@ describe('instance', () => { }); test('instance architecture is correctly discerned for x86-64 instance', () => { // GIVEN - const sampleInstanceClasses = ['c5', 'm5ad', 'r5n', 'm6', 't3a', 'r6i', 'r6a', 'p4de']; // A sample of x86-64 instance classes + const sampleInstanceClasses = ['c5', 'm5ad', 'r5n', 'm6', 't3a', 'r6i', 'r6a', 'p4de', 'p5']; // A sample of x86-64 instance classes for (const instanceClass of sampleInstanceClasses) { // WHEN From 4d634b27c5b30e3d3ae99be0bbcabb4cf529340c Mon Sep 17 00:00:00 2001 From: niroam Date: Sun, 29 Oct 2023 15:19:26 +1300 Subject: [PATCH 2/3] Fix comments to match Co-authored-by: Parker Scanlon <69879391+scanlonp@users.noreply.github.com> --- packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts index 2e34ab56d9666..23183a882fb64 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts @@ -861,7 +861,7 @@ export enum InstanceClass { P4D = 'p4d', /** - * Parallel-processing optimized instances, 4th generation + * Parallel-processing optimized instances, 5th generation */ PARALLEL5 = 'parallel5', From d3b537b3947b75e624675ff19174b0800f69b1d1 Mon Sep 17 00:00:00 2001 From: Parker Scanlon <69879391+scanlonp@users.noreply.github.com> Date: Wed, 1 Nov 2023 16:45:00 -0700 Subject: [PATCH 3/3] Update packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts --- packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts index 23183a882fb64..c7eaa00dc03db 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts @@ -866,7 +866,7 @@ export enum InstanceClass { PARALLEL5 = 'parallel5', /** - * Parallel-processing optimized instances, 4th generation + * Parallel-processing optimized instances, 5th generation */ P5 = 'p5',