From 3a0f17f977788ce4a0f60b46422e1c28fb01d06b Mon Sep 17 00:00:00 2001 From: Melle Date: Thu, 27 Jun 2024 15:40:51 +0200 Subject: [PATCH 1/2] (fix): add ec2 g6 instance --- packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts | 13 +++++++++++++ packages/aws-cdk-lib/aws-ec2/test/instance.test.ts | 2 +- 2 files changed, 14 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 d4ee8c47e1d44..4cf9df8028e34 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts @@ -880,6 +880,17 @@ export enum InstanceClass { */ G5G = 'g5g', + /** + * Graphics-optimized instances, 6th generation + */ + + GRAPHICS6 = 'graphics6', + + /** + * Graphics-optimized instances, 6th generation + */ + G6 = 'g6', + /** * Parallel-processing optimized instances, 2nd generation */ @@ -1556,6 +1567,8 @@ export class InstanceType { [InstanceClass.G5]: 'g5', [InstanceClass.GRAPHICS5_GRAVITON2]: 'g5g', [InstanceClass.G5G]: 'g5g', + [InstanceClass.GRAPHICS6]: 'g6', + [InstanceClass.G6]: 'g6', [InstanceClass.PARALLEL2]: 'p2', [InstanceClass.P2]: 'p2', [InstanceClass.PARALLEL3]: 'p3', 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 6db4d2256bd8b..d25a94d4b8369 100644 --- a/packages/aws-cdk-lib/aws-ec2/test/instance.test.ts +++ b/packages/aws-cdk-lib/aws-ec2/test/instance.test.ts @@ -124,7 +124,7 @@ describe('instance', () => { }); test('instance architecture is correctly discerned for x86-64 instance', () => { // GIVEN - const sampleInstanceClasses = ['c5', 'm5ad', 'r5n', 'm6', 't3a', 'r6i', 'r6a', 'p4de', 'p5', 'm7i-flex']; // A sample of x86-64 instance classes + const sampleInstanceClasses = ['c5', 'm5ad', 'r5n', 'm6', 't3a', 'r6i', 'r6a', 'g6', 'p4de', 'p5', 'm7i-flex']; // A sample of x86-64 instance classes for (const instanceClass of sampleInstanceClasses) { // WHEN From 8b98e21dfca2ec98314e0eaccd38e76e9c2ce4e5 Mon Sep 17 00:00:00 2001 From: Melle Date: Thu, 27 Jun 2024 15:49:17 +0200 Subject: [PATCH 2/2] (fix): add ec2 g6 instance --- 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 4cf9df8028e34..0d5aff7fa61a6 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts @@ -883,7 +883,6 @@ export enum InstanceClass { /** * Graphics-optimized instances, 6th generation */ - GRAPHICS6 = 'graphics6', /**