Merge branch 'master' into bump-cfnspec/v49.0.0

mergify[bot] · web-flow · commit f4e58a5e909b · 2021-11-26T09:46:48.000Z
diff --git a/packages/@aws-cdk/aws-ec2/lib/instance-types.ts b/packages/@aws-cdk/aws-ec2/lib/instance-types.ts
@@ -574,7 +574,17 @@ export enum InstanceClass {
   /**
    * Inferentia Chips based instances for machine learning inference applications, 1st generation
    */
-  INF1 = 'inf1'
+  INF1 = 'inf1',
+
+  /**
+   * Macintosh instances built on Apple Mac mini computers, 1st generation with Intel procesors
+   */
+  MACINTOSH1_INTEL = 'mac1',
+
+  /**
+   * Macintosh instances built on Apple Mac mini computers, 1st generation with Intel procesors
+   */
+  MAC1 = 'mac1',
 }
 
 /**
@@ -695,7 +705,6 @@ export enum InstanceSize {
    * Instance size METAL (metal)
    */
   METAL = 'metal',
-
 }
 
 /**
diff --git a/packages/@aws-cdk/aws-ec2/test/instance.test.ts b/packages/@aws-cdk/aws-ec2/test/instance.test.ts
@@ -483,4 +483,4 @@ test('cause replacement from s3 asset in userdata', () => {
       [`InstanceTwoDC29A7A7${hash}`]: expect.objectContaining({ Type: 'AWS::EC2::Instance', Properties: expect.anything() }),
     }),
   }));
-});
+});

-Original file line number
+Diff line change
       [`InstanceTwoDC29A7A7${hash}`]: expect.objectContaining({ Type: 'AWS::EC2::Instance', Properties: expect.anything() }),
     }),
   }));
 -});
 +});