[skip ci] Update current instance types (fixes amazon-archives#280)

Author: Alexander Patrikalakis

Diff for: dynamodb-janusgraph-storage-backend-cfn.yaml

@@ -84,13 +84,29 @@ Mappings:
       Arch: HVM64
     m4.16xlarge:
       Arch: HVM64
-    m3.medium:
+    m5.large:
       Arch: HVM64
-    m3.large:
+    m5.xlarge:
       Arch: HVM64
-    m3.xlarge:
+    m5.2xlarge:
       Arch: HVM64
-    m3.2xlarge:
+    m5.4xlarge:
+      Arch: HVM64
+    m5.12xlarge:
+      Arch: HVM64
+    m5.24xlarge:
+      Arch: HVM64
+    m5d.large:
+      Arch: HVM64
+    m5d.xlarge:
+      Arch: HVM64
+    m5d.2xlarge:
+      Arch: HVM64
+    m5d.4xlarge:
+      Arch: HVM64
+    m5d.12xlarge:
+      Arch: HVM64
+    m5d.24xlarge:
       Arch: HVM64
     c4.large:
       Arch: HVM64
@@ -102,25 +118,27 @@ Mappings:
       Arch: HVM64
     c4.8xlarge:
       Arch: HVM64
-    c3.large:
+    c5.large:
+      Arch: HVM64
+    c5.xlarge:
       Arch: HVM64
-    c3.xlarge:
+    c5.2xlarge:
       Arch: HVM64
-    c3.2xlarge:
+    c5.4xlarge:
       Arch: HVM64
-    c3.4xlarge:
+    c5.9xlarge:
       Arch: HVM64
-    c3.8xlarge:
+    c5.18xlarge:
       Arch: HVM64
-    r3.large:
+    c5d.xlarge:
       Arch: HVM64
-    r3.xlarge:
+    c5d.2xlarge:
       Arch: HVM64
-    r3.2xlarge:
+    c5d.4xlarge:
       Arch: HVM64
-    r3.4xlarge:
+    c5d.9xlarge:
       Arch: HVM64
-    r3.8xlarge:
+    c5d.18xlarge:
       Arch: HVM64
     r4.large:
       Arch: HVM64
@@ -138,6 +156,18 @@ Mappings:
       Arch: HVM64
     x1.32xlarge:
       Arch: HVM64
+    x1e.xlarge:
+      Arch: HVM64
+    x1e.2xlarge:
+      Arch: HVM64
+    x1e.4xlarge:
+      Arch: HVM64
+    x1e.8xlarge:
+      Arch: HVM64
+    x1e.16xlarge:
+      Arch: HVM64
+    x1e.32xlarge:
+      Arch: HVM64
     d2.xlarge:
       Arch: HVM64
     d2.2xlarge:
@@ -146,13 +176,13 @@ Mappings:
       Arch: HVM64
     d2.8xlarge:
       Arch: HVM64
-    i2.xlarge:
+    h1.2xlarge:
       Arch: HVM64
-    i2.2xlarge:
+    h1.4xlarge:
       Arch: HVM64
-    i2.4xlarge:
+    h1.8xlarge:
       Arch: HVM64
-    i2.8xlarge:
+    h1.16xlarge:
       Arch: HVM64
     i3.large:
       Arch: HVM64
@@ -166,20 +196,30 @@ Mappings:
       Arch: HVM64
     i3.16xlarge:
       Arch: HVM64
+    i3.metal:
+      Arch: HVM64
     f1.2xlarge:
       Arch: HVM64
     f1.16xlarge:
       Arch: HVM64
+    g3.4xlarge:
+      Arch: HVM64
+    g3.8xlarge:
+      Arch: HVM64
+    g3.16xlarge:
+      Arch: HVM64
     p2.xlarge:
       Arch: HVM64
     p2.8xlarge:
       Arch: HVM64
     p2.16xlarge:
       Arch: HVM64
-    g2.2xlarge:
-      Arch: HVMG2
-    g2.8xlarge:
-      Arch: HVMG2
+    p3.2xlarge:
+      Arch: HVM64
+    p3.8xlarge:
+      Arch: HVM64
+    p3.16xlarge:
+      Arch: HVM64
 Parameters:
   InstanceType:
     Description: EC2 instance type
@@ -199,25 +239,34 @@ Parameters:
     - m4.4xlarge
     - m4.10xlarge
     - m4.16xlarge
-    - m3.medium
-    - m3.large
-    - m3.xlarge
-    - m3.2xlarge
+    - m5.large
+    - m5.xlarge
+    - m5.2xlarge
+    - m5.4xlarge
+    - m5.12xlarge
+    - m5.24xlarge
+    - m5d.large
+    - m5d.xlarge
+    - m5d.2xlarge
+    - m5d.4xlarge
+    - m5d.12xlarge
+    - m5d.24xlarge
     - c4.large
     - c4.xlarge
     - c4.2xlarge
     - c4.4xlarge
     - c4.8xlarge
-    - c3.large
-    - c3.xlarge
-    - c3.2xlarge
-    - c3.4xlarge
-    - c3.8xlarge
-    - r3.large
-    - r3.xlarge
-    - r3.2xlarge
-    - r3.4xlarge
-    - r3.8xlarge
+    - c5.large
+    - c5.xlarge
+    - c5.2xlarge
+    - c5.4xlarge
+    - c5.9xlarge
+    - c5.18xlarge
+    - c5d.xlarge
+    - c5d.2xlarge
+    - c5d.4xlarge
+    - c5d.9xlarge
+    - c5d.18xlarge
     - r4.large
     - r4.xlarge
     - r4.2xlarge
@@ -226,27 +275,38 @@ Parameters:
     - r4.16xlarge
     - x1.16xlarge
     - x1.32xlarge
+    - x1e.xlarge
+    - x1e.2xlarge
+    - x1e.4xlarge
+    - x1e.8xlarge
+    - x1e.16xlarge
+    - x1e.32xlarge
     - d2.xlarge
     - d2.2xlarge
     - d2.4xlarge
     - d2.8xlarge
-    - i2.xlarge
-    - i2.2xlarge
-    - i2.4xlarge
-    - i2.8xlarge
+    - h1.2xlarge
+    - h1.4xlarge
+    - h1.8xlarge
+    - h1.16xlarge
     - i3.large
     - i3.xlarge
     - i3.2xlarge
     - i3.4xlarge
     - i3.8xlarge
     - i3.16xlarge
+    - i3.metal
     - f1.2xlarge
     - f1.16xlarge
+    - g3.4xlarge
+    - g3.8xlarge
+    - g3.16xlarge
     - p2.xlarge
     - p2.8xlarge
     - p2.16xlarge
-    - g2.2xlarge
-    - g2.8xlarge
+    - p3.2xlarge
+    - p3.8xlarge
+    - p3.16xlarge
     ConstraintDescription: Must be a valid EC2 instance type.
   KeyName:
     Description: Name of existing EC2 SSH key

Diff for: src/test/resources/current-gen-instance-types

@@ -11,25 +11,34 @@ m4.2xlarge
 m4.4xlarge
 m4.10xlarge
 m4.16xlarge
-m3.medium
-m3.large
-m3.xlarge
-m3.2xlarge
+m5.large
+m5.xlarge
+m5.2xlarge
+m5.4xlarge
+m5.12xlarge
+m5.24xlarge
+m5d.large
+m5d.xlarge
+m5d.2xlarge
+m5d.4xlarge
+m5d.12xlarge
+m5d.24xlarge
 c4.large
 c4.xlarge
 c4.2xlarge
 c4.4xlarge
 c4.8xlarge
-c3.large
-c3.xlarge
-c3.2xlarge
-c3.4xlarge
-c3.8xlarge
-r3.large
-r3.xlarge
-r3.2xlarge
-r3.4xlarge
-r3.8xlarge
+c5.large
+c5.xlarge
+c5.2xlarge
+c5.4xlarge
+c5.9xlarge
+c5.18xlarge
+c5d.xlarge
+c5d.2xlarge
+c5d.4xlarge
+c5d.9xlarge
+c5d.18xlarge
 r4.large
 r4.xlarge
 r4.2xlarge
@@ -38,24 +47,35 @@ r4.8xlarge
 r4.16xlarge
 x1.16xlarge
 x1.32xlarge
+x1e.xlarge
+x1e.2xlarge
+x1e.4xlarge
+x1e.8xlarge
+x1e.16xlarge
+x1e.32xlarge
 d2.xlarge
 d2.2xlarge
 d2.4xlarge
 d2.8xlarge
-i2.xlarge
-i2.2xlarge
-i2.4xlarge
-i2.8xlarge
+h1.2xlarge
+h1.4xlarge
+h1.8xlarge
+h1.16xlarge
 i3.large
 i3.xlarge
 i3.2xlarge
 i3.4xlarge
 i3.8xlarge
 i3.16xlarge
+i3.metal
 f1.2xlarge
 f1.16xlarge
+g3.4xlarge
+g3.8xlarge
+g3.16xlarge
 p2.xlarge
 p2.8xlarge
 p2.16xlarge
-g2.2xlarge
-g2.8xlarge
+p3.2xlarge
+p3.8xlarge
+p3.16xlarge