From 1e8806921f0d17749ebd8a929fb4c1487b81789a Mon Sep 17 00:00:00 2001 From: Jimmy Gaussen Date: Sun, 10 Mar 2024 21:50:42 +0100 Subject: [PATCH 1/9] chore(ec2): add missing instance classes --- .../aws-cdk-lib/aws-ec2/lib/instance-types.ts | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) 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 bcf63f59a0260..2355622f18736 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts @@ -1110,6 +1110,36 @@ export enum InstanceClass { */ MAC1 = 'mac1', + /** + * Macintosh instances built on Apple Mac mini 2020 computers, 2nd generation with Apple silicon M1 processors + */ + MACINTOSH2_M1 = 'macintosh2-m1', + + /** + * Macintosh instances built on Apple Mac mini 2020 computers, 2nd generation with Apple silicon M1 processors + */ + MAC2 = 'mac2', + + /** + * Macintosh instances built on Apple Mac mini 2023 computers, 2nd generation with Apple silicon M2 processors + */ + MACINTOSH2_M2 = 'macintosh2-m2', + + /** + * Macintosh instances built on Apple Mac mini 2023 computers, 2nd generation with Apple silicon M2 processors + */ + MAC2_M2 = 'mac2-m2', + + /** + * Macintosh instances built on Apple Mac mini 2023 computers, 2nd generation with Apple silicon M2 Pro processors + */ + MACINTOSH2_M2_PRO = 'macintosh2-m2-pro', + + /** + * Macintosh instances built on 2023 Apple Mac mini hardware, Apple silicon M2 Pro processors + */ + MAC2_M2PRO = 'mac2-m2pro', + /** * Multi-stream video transcoding instances for resolutions up to 4K UHD, 1st generation */ @@ -1130,6 +1160,16 @@ export enum InstanceClass { */ HPC6A = 'hpc6a', + /** + * High performance computing based on Graviton, 7th generation + */ + HIGH_PERFORMANCE_COMPUTING7_GRAVITON = 'high-performance-computing7-graviton', + + /** + * High performance computing based on Graviton, 7th generation + */ + HPC7G = 'hpc7g', + /** * Deep learning instances powered by Gaudi accelerators from Habana Labs (an Intel company), 1st generation */ @@ -1495,6 +1535,13 @@ export class InstanceType { [InstanceClass.INF2]: 'inf2', [InstanceClass.MACINTOSH1_INTEL]: 'mac1', [InstanceClass.MAC1]: 'mac1', + [InstanceClass.MACINTOSH2_M1]: 'mac2', + [InstanceClass.MAC2]: 'mac2', + [InstanceClass.MACINTOSH2_M2]: 'mac2-m2', + [InstanceClass.MAC2_M2]: 'mac2-m2', + [InstanceClass.MACINTOSH2_M2_PRO]: 'mac2-m2pro', + [InstanceClass.MAC2_M2PRO]: 'mac2-m2pro', + [InstanceClass.VIDEO_TRANSCODING1]: 'vt1', [InstanceClass.VT1]: 'vt1', [InstanceClass.HIGH_PERFORMANCE_COMPUTING6_AMD]: 'hpc6a', @@ -1507,6 +1554,8 @@ export class InstanceType { [InstanceClass.MEMORY_INTENSIVE_2_INTEL]: 'x2idn', [InstanceClass.X2IEZN]: 'x2iezn', [InstanceClass.MEMORY_INTENSIVE_2_XTZ_INTEL]: 'x2iezn', + [InstanceClass.HIGH_PERFORMANCE_COMPUTING7_GRAVITON]: 'hpc7g', + [InstanceClass.HPC7G]: 'hpc7g', [InstanceClass.DEEP_LEARNING1]: 'dl1', [InstanceClass.DL1]: 'dl1', }; From 5421e2ba81c120f53858afb61f1ddbcbe9e199c4 Mon Sep 17 00:00:00 2001 From: Jimmy Gaussen Date: Sun, 10 Mar 2024 22:01:48 +0100 Subject: [PATCH 2/9] chore(ec2): add missing instance sizes --- .../aws-cdk-lib/aws-ec2/lib/instance-types.ts | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) 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 2355622f18736..67519b2a55073 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts @@ -1309,6 +1309,26 @@ export enum InstanceSize { * Instance size METAL (metal) */ METAL = 'metal', + + /** + * Instance size XLARGE16METAL (metal-16xl) + */ + XLARGE16METAL = 'metal-16xl', + + /** + * Instance size XLARGE24METAL (metal-24xl) + */ + XLARGE24METAL = 'metal-24xl', + + /** + * Instance size XLARGE32METAL (metal-32xl) + */ + XLARGE32METAL = 'metal-32xl', + + /** + * Instance size XLARGE48METAL (metal-48xl) + */ + XLARGE48METAL = 'metal-48xl', } /** From f5afbf0bc41756225381393cf3d2c3c5863aabdf Mon Sep 17 00:00:00 2001 From: Jimmy Gaussen Date: Sun, 10 Mar 2024 22:08:25 +0100 Subject: [PATCH 3/9] chore(ec2): add us-east-2 missing instance sizes --- packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts | 5 +++++ 1 file changed, 5 insertions(+) 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 67519b2a55073..80010d491418b 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts @@ -1300,6 +1300,11 @@ export enum InstanceSize { */ XLARGE56 = '56xlarge', + /** + * Instance size XLARGE56 (96xlarge) + */ + XLARGE96 = '96xlarge', + /** * Instance size XLARGE56 (112xlarge) */ From 29ac4c800a4f5ef8f42049879752ea4f67ad3ccf Mon Sep 17 00:00:00 2001 From: Jimmy Gaussen Date: Sun, 10 Mar 2024 22:14:31 +0100 Subject: [PATCH 4/9] chore(ec2): add us-east-2 missing instance classes --- .../aws-cdk-lib/aws-ec2/lib/instance-types.ts | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) 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 80010d491418b..45dbe98790b81 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts @@ -1160,6 +1160,26 @@ export enum InstanceClass { */ HPC6A = 'hpc6a', + /** + * High performance computing with local NVME drive based on 6th generation with Intel Xeon Scalable processors (3rd generation processors code named Ice Lake), 6th generation + */ + HIGH_PERFORMANCE_COMPUTING6_INTEL_NVME_DRIVE = 'high-performance-computing6-intel-nvme-drive', + + /** + * High performance computing with local NVME drive based on 6th generation with Intel Xeon Scalable processors (3rd generation processors code named Ice Lake), 6th generation + */ + HPC6ID = 'hpc6id', + + /** + * High performance computing based on Graviton, 7th generation + */ + HIGH_PERFORMANCE_COMPUTING7_AMD = 'high-performance-computing7-amd', + + /** + * High performance computing based on Graviton, 7th generation + */ + HPC7A = 'hpc7a', + /** * High performance computing based on Graviton, 7th generation */ @@ -1571,6 +1591,8 @@ export class InstanceType { [InstanceClass.VT1]: 'vt1', [InstanceClass.HIGH_PERFORMANCE_COMPUTING6_AMD]: 'hpc6a', [InstanceClass.HPC6A]: 'hpc6a', + [InstanceClass.HIGH_PERFORMANCE_COMPUTING6_INTEL_NVME_DRIVE]: 'hpc6id', + [InstanceClass.HPC6ID]: 'hpc6id', [InstanceClass.I4I]: 'i4i', [InstanceClass.IO4_INTEL]: 'i4i', [InstanceClass.X2IEDN]: 'x2iedn', @@ -1579,6 +1601,8 @@ export class InstanceType { [InstanceClass.MEMORY_INTENSIVE_2_INTEL]: 'x2idn', [InstanceClass.X2IEZN]: 'x2iezn', [InstanceClass.MEMORY_INTENSIVE_2_XTZ_INTEL]: 'x2iezn', + [InstanceClass.HIGH_PERFORMANCE_COMPUTING7_AMD]: 'hpc7a', + [InstanceClass.HPC7A]: 'hpc7a', [InstanceClass.HIGH_PERFORMANCE_COMPUTING7_GRAVITON]: 'hpc7g', [InstanceClass.HPC7G]: 'hpc7g', [InstanceClass.DEEP_LEARNING1]: 'dl1', From 8e19fa099fef820df3441a52c06a5e7f3f465a15 Mon Sep 17 00:00:00 2001 From: Jimmy Gaussen Date: Mon, 11 Mar 2024 07:25:45 +0100 Subject: [PATCH 5/9] chore: fix comment --- 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 45dbe98790b81..2782e5d0da414 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts @@ -1136,7 +1136,7 @@ export enum InstanceClass { MACINTOSH2_M2_PRO = 'macintosh2-m2-pro', /** - * Macintosh instances built on 2023 Apple Mac mini hardware, Apple silicon M2 Pro processors + * Macintosh instances built on Apple Mac mini 2023 computers, 2nd generation with Apple silicon M2 Pro processors */ MAC2_M2PRO = 'mac2-m2pro', From 04069da22d305fc09c6284d3fa125959f907c241 Mon Sep 17 00:00:00 2001 From: Jimmy Gaussen Date: Mon, 11 Mar 2024 18:30:56 +0100 Subject: [PATCH 6/9] chore: docs, formatting --- packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts | 1 - 1 file changed, 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 2782e5d0da414..c9dc59498a988 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts @@ -1586,7 +1586,6 @@ export class InstanceType { [InstanceClass.MAC2_M2]: 'mac2-m2', [InstanceClass.MACINTOSH2_M2_PRO]: 'mac2-m2pro', [InstanceClass.MAC2_M2PRO]: 'mac2-m2pro', - [InstanceClass.VIDEO_TRANSCODING1]: 'vt1', [InstanceClass.VT1]: 'vt1', [InstanceClass.HIGH_PERFORMANCE_COMPUTING6_AMD]: 'hpc6a', From ef93fc79fc8427f0e3db0eee193e5ccb09587d10 Mon Sep 17 00:00:00 2001 From: Jimmy Gaussen Date: Mon, 11 Mar 2024 18:39:32 +0100 Subject: [PATCH 7/9] chore: docs, formatting --- packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 c9dc59498a988..80fc2a2b2ff90 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts @@ -1321,12 +1321,12 @@ export enum InstanceSize { XLARGE56 = '56xlarge', /** - * Instance size XLARGE56 (96xlarge) + * Instance size XLARGE96 (96xlarge) */ XLARGE96 = '96xlarge', /** - * Instance size XLARGE56 (112xlarge) + * Instance size XLARGE112 (112xlarge) */ XLARGE112 = '112xlarge', From 3d654e14c3422e86f0fa66b5c7af901674645edd Mon Sep 17 00:00:00 2001 From: Jimmy Gaussen Date: Mon, 11 Mar 2024 18:47:55 +0100 Subject: [PATCH 8/9] chore: docs --- packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 80fc2a2b2ff90..9afab07a32e43 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts @@ -1171,12 +1171,12 @@ export enum InstanceClass { HPC6ID = 'hpc6id', /** - * High performance computing based on Graviton, 7th generation + * High performance computing based on AMD EPYC, 7th generation */ HIGH_PERFORMANCE_COMPUTING7_AMD = 'high-performance-computing7-amd', /** - * High performance computing based on Graviton, 7th generation + * High performance computing based on AMD EPYC, 7th generation */ HPC7A = 'hpc7a', From 35d8f0bf9e2287b10e1e236344708fb3f9d84257 Mon Sep 17 00:00:00 2001 From: Jimmy Gaussen Date: Mon, 11 Mar 2024 18:49:08 +0100 Subject: [PATCH 9/9] chore: property order --- packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 9afab07a32e43..890363932a68f 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts @@ -1592,6 +1592,10 @@ export class InstanceType { [InstanceClass.HPC6A]: 'hpc6a', [InstanceClass.HIGH_PERFORMANCE_COMPUTING6_INTEL_NVME_DRIVE]: 'hpc6id', [InstanceClass.HPC6ID]: 'hpc6id', + [InstanceClass.HIGH_PERFORMANCE_COMPUTING7_AMD]: 'hpc7a', + [InstanceClass.HPC7A]: 'hpc7a', + [InstanceClass.HIGH_PERFORMANCE_COMPUTING7_GRAVITON]: 'hpc7g', + [InstanceClass.HPC7G]: 'hpc7g', [InstanceClass.I4I]: 'i4i', [InstanceClass.IO4_INTEL]: 'i4i', [InstanceClass.X2IEDN]: 'x2iedn', @@ -1600,10 +1604,6 @@ export class InstanceType { [InstanceClass.MEMORY_INTENSIVE_2_INTEL]: 'x2idn', [InstanceClass.X2IEZN]: 'x2iezn', [InstanceClass.MEMORY_INTENSIVE_2_XTZ_INTEL]: 'x2iezn', - [InstanceClass.HIGH_PERFORMANCE_COMPUTING7_AMD]: 'hpc7a', - [InstanceClass.HPC7A]: 'hpc7a', - [InstanceClass.HIGH_PERFORMANCE_COMPUTING7_GRAVITON]: 'hpc7g', - [InstanceClass.HPC7G]: 'hpc7g', [InstanceClass.DEEP_LEARNING1]: 'dl1', [InstanceClass.DL1]: 'dl1', };