fix(eks): Could not use ec2 instance type and size that their names c…

…ontains dashes
aws · Jan 18, 2024 · 340cc73 · 340cc73
1 parent 30a0d33
commit 340cc73
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 50 deletions.
diff --git a/...f1176f70b3769f77295e9bd20f543edf/index.js → ...de4f78254d605dda7068fd1de5dd704f/index.js b/...f1176f70b3769f77295e9bd20f543edf/index.js → ...de4f78254d605dda7068fd1de5dd704f/index.js
diff --git a/...ork-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster.assets.json b/...ork-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster.assets.json
diff --git a/...k-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster.template.json b/...k-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster.template.json
@@ -3485,7 +3485,7 @@
     "InstanceTypes": [
      "c5.large",
      "c5a.large",
-     "c5d.large"
+     "m7i-flex.large"
     ],
     "NodeRole": {
      "Fn::GetAtt": [
@@ -4184,7 +4184,7 @@
        {
         "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1"
        },
-       "/c8a7b417e8c7a99a49ab10844fbaf839d1238901e86bc4cb16cf5259e5899308.json"
+       "/b5cbe4d6c447664cb7945e7e3d2b0d01aeb8c348dacc25cb86a5dd3673800a2f.json"
       ]
      ]
     }

diff --git a/...snapshot/awscdkeksclusterawscdkawseksClusterResourceProvider0DD9B7A4.nested.template.json b/...snapshot/awscdkeksclusterawscdkawseksClusterResourceProvider0DD9B7A4.nested.template.json
@@ -50,7 +50,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1"
      },
-     "S3Key": "1b5aaa158e02216aa983cbf998d740faf1176f70b3769f77295e9bd20f543edf.zip"
+     "S3Key": "61942cf3327d6ed09088c3ef6dc3323ede4f78254d605dda7068fd1de5dd704f.zip"
     },
     "Description": "onEvent handler for EKS cluster resource provider",
     "Environment": {
@@ -115,7 +115,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1"
      },
-     "S3Key": "1b5aaa158e02216aa983cbf998d740faf1176f70b3769f77295e9bd20f543edf.zip"
+     "S3Key": "61942cf3327d6ed09088c3ef6dc3323ede4f78254d605dda7068fd1de5dd704f.zip"
     },
     "Description": "isComplete handler for EKS cluster resource provider",
     "Environment": {

diff --git a/...cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/manifest.json b/...cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/manifest.json
diff --git a/...aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/tree.json b/...aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/tree.json
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.ts
@@ -223,7 +223,7 @@ class EksClusterStack extends Stack {
       instanceTypes: [
         new ec2.InstanceType('c5.large'),
         new ec2.InstanceType('c5a.large'),
-        new ec2.InstanceType('c5d.large'),
+        new ec2.InstanceType('m7i-flex.large'),
       ],
       minSize: 3,
       // reusing the default capacity nodegroup instance role when available

diff --git a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts
@@ -1522,7 +1522,7 @@ export class InstanceType {
    */
   public get architecture(): InstanceArchitecture {
     // capture the family, generation, capabilities, and size portions of the instance type id
-    const instanceTypeComponents = this.instanceTypeIdentifier.match(/^([a-z]+)(\d{1,2})([a-z]*)\.([a-z0-9]+)$/);
+    const instanceTypeComponents = this.instanceTypeIdentifier.match(/^([a-z]+)(\d{1,2})([a-z\-]*)\.([a-z0-9\-]+)$/);
     if (instanceTypeComponents == null) {
       throw new Error('Malformed instance type identifier');
     }
@@ -1540,7 +1540,7 @@ export class InstanceType {
   }
 
   public sameInstanceClassAs(other: InstanceType): boolean {
-    const instanceClass: RegExp = /^([a-z]+\d{1,2}[a-z]*)\.([a-z0-9]+)$/;
+    const instanceClass: RegExp = /^([a-z]+\d{1,2}[a-z\-]*)\.([a-z0-9\-]+)$/;
     const instanceClassId = this.instanceTypeIdentifier.match(instanceClass);
     const otherInstanceClassId = other.instanceTypeIdentifier.match(instanceClass);
     if (instanceClassId == null || otherInstanceClassId == null) {

diff --git a/packages/aws-cdk-lib/aws-ec2/test/instance.test.ts b/packages/aws-cdk-lib/aws-ec2/test/instance.test.ts
@@ -123,7 +123,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']; // A sample of x86-64 instance classes
+    const sampleInstanceClasses = ['c5', 'm5ad', 'r5n', 'm6', 't3a', 'r6i', 'r6a', 'p4de', 'p5', 'm7i-flex']; // A sample of x86-64 instance classes
 
     for (const instanceClass of sampleInstanceClasses) {
       // WHEN
@@ -135,6 +135,24 @@ describe('instance', () => {
 
   });
 
+  test('sameInstanceClassAs compares InstanceTypes contains dashes', () => {
+    // GIVEN
+    const comparitor = InstanceType.of(InstanceClass.M7I_FLEX, InstanceSize.LARGE);
+    //WHEN
+    const largerInstanceType = InstanceType.of(InstanceClass.M7I_FLEX, InstanceSize.XLARGE);
+    //THEN
+    expect(largerInstanceType.sameInstanceClassAs(comparitor)).toBeTruthy();
+  });
+
+  test('sameInstanceClassAs compares InstanceSize contains dashes', () => {
+    // GIVEN
+    const comparitor = new InstanceType('c7a.metal-48xl');
+    //WHEN
+    const largerInstanceType = new InstanceType('c7a.xlarge');
+    //THEN
+    expect(largerInstanceType.sameInstanceClassAs(comparitor)).toBeTruthy();
+  });
+
   test('instances with local NVME drive are correctly named', () => {
     // GIVEN
     const sampleInstanceClassKeys = [{