Merge branch 'main' into synthetics-node-puppeteer8

aws · Jul 18, 2024 · 0f4cac7 · 0f4cac7
2 parents 31db06a + 90a41d5
commit 0f4cac7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 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
@@ -890,6 +890,16 @@ 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
    */
@@ -1568,6 +1578,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
@@ -126,7 +126,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